nginx-0.1.5-RELEASE import
*) Bugfix: on Solaris and Linux there may be too many "recvmsg()
returned not enough data" alerts.
*) Bugfix: there were the "writev() failed (22: Invalid argument)"
errors on Solaris in proxy mode without sendfile. On other platforms
that do not support sendfile at all the process got caught in an
endless loop.
*) Bugfix: segmentation fault on Solaris in proxy mode and using
sendfile.
*) Bugfix: segmentation fault on Solaris.
*) Bugfix: on-line upgrade did not work on Linux.
*) Bugfix: the ngx_http_autoindex_module module did not escape the
spaces, the quotes, and the percent signs in the directory listing.
*) Change: the decrease of the copy operations.
*) Feature: the userid_p3p directive.
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index e70a6ea..bfe5efb 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -199,7 +199,7 @@
}
break;
- /* check "/.", "//", and "%" in URI */
+ /* check "/.", "//", "%", and "\" (Win32) in URI */
case sw_after_slash_in_uri:
switch (ch) {
case CR:
@@ -224,6 +224,11 @@
r->quoted_uri = 1;
state = sw_uri;
break;
+#if (NGX_WIN32)
+ case '\\':
+ r->complex_uri = 1;
+ break;
+#endif
case '/':
r->complex_uri = 1;
break;
@@ -237,7 +242,7 @@
}
break;
- /* check "/" and "%" in URI */
+ /* check "/", "%" and "\" (Win32) in URI */
case sw_check_uri:
switch (ch) {
case CR:
@@ -257,6 +262,12 @@
case '.':
r->uri_ext = p;
break;
+#if (NGX_WIN32)
+ case '\\':
+ r->complex_uri = 1;
+ state = sw_after_slash_in_uri;
+ break;
+#endif
case '/':
r->uri_ext = NULL;
state = sw_after_slash_in_uri;
@@ -657,7 +668,7 @@
sw_slash,
sw_dot,
sw_dot_dot,
-#if (WIN32)
+#if (NGX_WIN32)
sw_dot_dot_dot,
#endif
sw_quoted,
@@ -671,17 +682,42 @@
p = r->uri_start;
u = r->uri.data;
r->uri_ext = NULL;
+ r->args_start = NULL;
ch = *p++;
- while (p < r->uri_start + r->uri.len + 1) {
+ while (p < r->uri_start + r->uri.len + 1 && r->args_start == NULL) {
+
+ /*
+ * we use "ch = *p++" inside the cycle but this operation is safe
+ * because after the URI there is always at least one charcter:
+ * the line feed
+ */
ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "s:%d in:'%x:%c', out:'%c'", state, ch, ch, *u);
+ "s:%d in:'%Xd:%c', out:'%c'", state, ch, ch, *u);
switch (state) {
case sw_usual:
switch(ch) {
+#if (NGX_WIN32)
+ case '\\':
+ r->uri_ext = NULL;
+
+ if (p == r->uri_start + r->uri.len) {
+
+ /*
+ * we omit the last "\" to cause redirect because
+ * the browsers do not treat "\" as "/" in relative URL path
+ */
+
+ break;
+ }
+
+ state = sw_slash;
+ *u++ = '/';
+ break;
+#endif
case '/':
r->uri_ext = NULL;
state = sw_slash;
@@ -691,6 +727,9 @@
quoted_state = state;
state = sw_quoted;
break;
+ case '?':
+ r->args_start = p;
+ break;
case '.':
r->uri_ext = u + 1;
default:
@@ -702,6 +741,10 @@
case sw_slash:
switch(ch) {
+#if (NGX_WIN32)
+ case '\\':
+ break;
+#endif
case '/':
break;
case '.':
@@ -722,6 +765,10 @@
case sw_dot:
switch(ch) {
+#if (NGX_WIN32)
+ case '\\':
+ /* fall through */
+#endif
case '/':
state = sw_slash;
u--;
@@ -744,6 +791,10 @@
case sw_dot_dot:
switch(ch) {
+#if (NGX_WIN32)
+ case '\\':
+ /* fall through */
+#endif
case '/':
state = sw_slash;
u -= 4;
@@ -758,7 +809,7 @@
quoted_state = state;
state = sw_quoted;
break;
-#if (WIN32)
+#if (NGX_WIN32)
case '.':
state = sw_dot_dot_dot;
*u++ = ch;
@@ -772,9 +823,10 @@
ch = *p++;
break;
-#if (WIN32)
+#if (NGX_WIN32)
case sw_dot_dot_dot:
switch(ch) {
+ case '\\':
case '/':
state = sw_slash;
u -= 5;
@@ -857,12 +909,7 @@
if (r->uri_ext) {
r->exten.len = u - r->uri_ext;
-
- if (!(r->exten.data = ngx_palloc(r->pool, r->exten.len + 1))) {
- return NGX_HTTP_INTERNAL_SERVER_ERROR;
- }
-
- ngx_cpystrn(r->exten.data, r->uri_ext, r->exten.len + 1);
+ r->exten.data = r->uri_ext;
}
r->uri_ext = NULL;
