summaryrefslogtreecommitdiff
path: root/src/core/ngx_string.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2007-10-22 11:17:22 +0000
committerJonathan Kolb <jon@b0g.us>2007-10-22 11:17:22 +0000
commit388fd29a9824babe892771b2ca42db491b90bfde (patch)
tree48da2a3018050fa6ac4ba84fc8438aac387201f1 /src/core/ngx_string.h
parent7a5fafa72cef419ba594e9357cfbcb47e9663311 (diff)
downloadnginx-388fd29a9824babe892771b2ca42db491b90bfde.tar.gz
Changes with nginx 0.6.15 22 Oct 2007v0.6.15
*) Feature: cygwin compatibility. Thanks to Vladimir Kutakov. *) Feature: the "merge_slashes" directive. *) Feature: the "gzip_vary" directive. *) Feature: the "server_tokens" directive. *) Bugfix: nginx did not unescape URI in the "include" SSI command. *) Bugfix: the segmentation fault was occurred on start or while reconfiguration if variable was used in the "charset" or "source_charset" directives. *) Bugfix: nginx returned the 400 response on requests like "GET http://www.domain.com HTTP/1.0". Thanks to James Oakley. *) Bugfix: if request with request body was redirected using the "error_page" directive, then nginx tried to read the request body again; bug appeared in 0.6.7. *) Bugfix: a segmentation fault occurred in worker process if no server_name was explicitly defined for server processing request; bug appeared in 0.6.7.
Diffstat (limited to 'src/core/ngx_string.h')
-rw-r--r--src/core/ngx_string.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index f96795134..275c8db5e 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -155,14 +155,15 @@ size_t ngx_utf_length(u_char *p, size_t n);
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_REFRESH 3
-#define NGX_ESCAPE_MEMCACHED 4
-#define NGX_ESCAPE_MAIL_AUTH 5
-
-#define NGX_UNESCAPE_URI 1
+#define NGX_ESCAPE_URI 0
+#define NGX_ESCAPE_ARGS 1
+#define NGX_ESCAPE_HTML 2
+#define NGX_ESCAPE_REFRESH 3
+#define NGX_ESCAPE_MEMCACHED 4
+#define NGX_ESCAPE_MAIL_AUTH 5
+
+#define NGX_UNESCAPE_URI 1
+#define NGX_UNESCAPE_REDIRECT 2
uintptr_t ngx_escape_uri(u_char *dst, u_char *src, size_t size,
ngx_uint_t type);