bugfix: ngx.escape_uri() did not escape "|", ",", "$", "@", and "`".

Author: agentzh

src/ngx_http_lua_string.c

@@ -125,12 +125,13 @@ ngx_http_lua_ngx_escape_uri(lua_State *L)
         return 1;
     }
 
-    escape = 2 * ngx_http_lua_escape_uri(NULL, src, len, NGX_ESCAPE_URI);
+    escape = 2 * ngx_http_lua_escape_uri(NULL, src, len,
+                                         NGX_ESCAPE_URI_COMPONENT);
 
     if (escape) {
         dlen = escape + len;
         dst = lua_newuserdata(L, dlen);
-        ngx_http_lua_escape_uri(dst, src, len, NGX_ESCAPE_URI);
+        ngx_http_lua_escape_uri(dst, src, len, NGX_ESCAPE_URI_COMPONENT);
         lua_pushlstring(L, (char *) dst, dlen);
     }
 
@@ -751,14 +752,14 @@ size_t
 ngx_http_lua_ffi_uri_escaped_length(const u_char *src, size_t len)
 {
     return len + 2 * ngx_http_lua_escape_uri(NULL, (u_char *) src, len,
-                                             NGX_ESCAPE_URI);
+                                             NGX_ESCAPE_URI_COMPONENT);
 }
 
 
 void
 ngx_http_lua_ffi_escape_uri(const u_char *src, size_t len, u_char *dst)
 {
-    ngx_http_lua_escape_uri(dst, (u_char *) src, len, NGX_ESCAPE_URI);
+    ngx_http_lua_escape_uri(dst, (u_char *) src, len, NGX_ESCAPE_URI_COMPONENT);
 }
 
 #endif

t/006-escape.t

@@ -3,9 +3,8 @@
 use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
-#repeat_each(1);
 
-plan tests => repeat_each() * (blocks() * 2 + 1);
+plan tests => repeat_each() * (blocks() * 2 + 2);
 
 no_long_string();
 
@@ -180,3 +179,21 @@ GET /t
 GET /t
 --- response_body
 [32]
+
+
+
+=== TEST 14: reserved chars
+--- config
+    location /lua {
+        content_by_lua_block {
+            ngx.say(ngx.escape_uri("-_.!~*'()"))
+            ngx.say(ngx.escape_uri(",$@|`"))
+        }
+    }
+--- request
+GET /lua
+--- response_body
+-_.!~*'()
+%2C%24%40%7C%60
+--- no_error_log
+[error]