nginx-0.3.22-RELEASE importrelease-0.3.22

    *) Feature: the ngx_http_perl_module supports the $r->args and
       $r->unescape methods.

    *) Feature: the method $r->query_string of ngx_http_perl_module was
       canceled.

    *) Bugfix: segmentation fault was occurred if the "none" or "blocked"
       values was specified in the "valid_referers" directive; the bug had
       appeared in 0.3.18.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 0192a3068..d76a0f555 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -144,13 +144,15 @@ size_t ngx_utf_length(ngx_str_t *utf);
 u_char * ngx_utf_cpystrn(u_char *dst, u_char *src, size_t n);
 
 
-#define NGX_ESCAPE_URI   0
-#define NGX_ESCAPE_ARGS  1
-#define NGX_ESCAPE_HTML  2
+#define NGX_ESCAPE_URI     0
+#define NGX_ESCAPE_ARGS    1
+#define NGX_ESCAPE_HTML    2
+
+#define NGX_UNESCAPE_URI   1
 
 uintptr_t ngx_escape_uri(u_char *dst, u_char *src, size_t size,
     ngx_uint_t type);
-void ngx_unescape_uri(u_char **dst, u_char **src, size_t size);
+void ngx_unescape_uri(u_char **dst, u_char **src, size_t size, ngx_uint_t type);
 
 
 #define  ngx_qsort                qsort