nginx-0.1.10-RELEASE import

*) Bugfix: if the request without arguments contains "//", "/./", "/../" or "%XX" then the lost character in the request line was lost; the bug had appeared in 0.1.9. *) Bugfix: the fix in 0.1.9 for the files bigger than 2G on Linux did not work.
lihui7115 · Nov 26, 2004 · 069899b · 069899b
1 parent 6b8c4ae
commit 069899b
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 10 deletions.
diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
@@ -6,6 +6,34 @@
             title="nginx">
 
 
+<changes ver="0.1.10" date="26.11.2004">
+
+<change type="bugfix">
+<para lang="ru">
+ÅÓÌÉ × ÚÁÐÒÏÓÅ ÂÅÚ ÁÒÇÕÍÅÎÔÏ× ÅÓÔØ "//", "/./", "/../" ÉÌÉ "%XX",
+ÔÏ ÔÅÒÑÌÓÑ ÐÏÓÌÅÄÎÉÊ ÓÉÍ×ÏÌ × ÓÔÒÏËÅ ÚÁÐÒÏÓÁ;
+ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.1.9.
+</para>
+<para lang="en">
+if the request without arguments contains "//", "/./", "/../" or "%XX"
+then the lost character in the request line was lost;
+bug appeared in 0.1.9.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+ÉÓÐÒÁ×ÌÅÎÉÅ × ×ÅÒÓÉÉ 0.1.9 ÄÌÑ ÆÁÊÌÏ× ÂÏÌØÛÅ ÎÁ Linux ÎÅ ÒÁÂÏÔÁÌÏ.
+</para>
+<para lang="en">
+the fix in 0.1.9 for the files bigger than 2G on Linux
+did not work.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="0.1.9" date="25.11.2004">
 
 <change type="bugfix">

diff --git a/src/core/nginx.h b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.1.9"
+#define NGINX_VER          "nginx/0.1.10"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_NEWPID_EXT     ".newbin"

diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h
@@ -11,13 +11,6 @@
 #include <ngx_auto_headers.h>
 
 
-#if ((__GNU__ == 2) && (__GNUC_MINOR__ < 8))
-#define NGX_MAX_UINT32_VALUE  0xffffffffLL
-#else
-#define NGX_MAX_UINT32_VALUE  0xffffffff
-#endif
-
-
 #if defined __DragonFly__ && !defined __FreeBSD__
 #define __FreeBSD__        4
 #define __FreeBSD_version  480101
@@ -135,4 +128,11 @@ typedef long               ngx_flag_t;
 */
 
 
+#if ((__GNU__ == 2) && (__GNUC_MINOR__ < 8))
+#define NGX_MAX_UINT32_VALUE  0xffffffffLL
+#else
+#define NGX_MAX_UINT32_VALUE  0xffffffff
+#endif
+
+
 #endif /* _NGX_CONFIG_H_INCLUDED_ */
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
@@ -686,7 +686,7 @@ ngx_int_t ngx_http_parse_complex_uri(ngx_http_request_t *r)
 
     ch = *p++;
 
-    while (p < r->uri_end && r->args_start == NULL) {
+    while (p <= r->uri_end && r->args_start == NULL) {
 
         /*
          * we use "ch = *p++" inside the cycle but this operation is safe

diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
@@ -61,7 +61,7 @@
 #include <sys/sendfile.h>
 #else
 extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size);
-#define NGX_SENDFILE_LIMIT  (NGX_MAX_UINT32_VALUE + 1)
+#define NGX_SENDFILE_LIMIT  0x80000000
 #endif