diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-11-26 09:35:08 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2004-11-26 09:35:08 +0000 |
| commit | eba6694024d8cc8af64f8eab1b0cda90a7492468 (patch) | |
| tree | eddb2f7de0adb20e797f78aadbbaf3f5f8be917d | |
| parent | a9c1bbe8dc08d8ee76959d8c80adcfda8adeab26 (diff) | |
| download | nginx-eba6694024d8cc8af64f8eab1b0cda90a7492468.tar.gz | |
Changes with nginx 0.1.10 26 Nov 2004v0.1.10
*) Bugfix: if the request without arguments contains "//", "/./", "/../"
or "%XX" then the lost character in the request line was lost; bug
appeared in 0.1.9.
*) Bugfix: the fix in 0.1.9 for the files bigger than 2G on Linux did not
work.
| -rw-r--r-- | CHANGES | 10 | ||||
| -rw-r--r-- | CHANGES.ru | 10 | ||||
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_config.h | 14 | ||||
| -rw-r--r-- | src/http/ngx_http_parse.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_linux_config.h | 2 |
6 files changed, 30 insertions, 10 deletions
@@ -1,4 +1,14 @@ +Changes with nginx 0.1.10 26 Nov 2004 + + *) Bugfix: if the request without arguments contains "//", "/./", "/../" + or "%XX" then the lost character in the request line was lost; bug + appeared in 0.1.9. + + *) Bugfix: the fix in 0.1.9 for the files bigger than 2G on Linux did not + work. + + Changes with nginx 0.1.9 25 Nov 2004 *) Bugfix: the proxied request was sent without arguments if the request diff --git a/CHANGES.ru b/CHANGES.ru index f9498f487..baaa04989 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,14 @@ +Изменения в nginx 0.1.10 26.11.2004 + + *) Исправление: если в запросе без аргументов есть "//", "/./", "/../" + или "%XX", то терялся последний символ в строке запроса; ошибка + появилась в 0.1.9. + + *) Исправление: исправление в версии 0.1.9 для файлов больше 2G на Linux + не работало. + + Изменения в nginx 0.1.9 25.11.2004 *) Исправление: если в запросе есть "//", "/./", "/../" или "%XX", то diff --git a/src/core/nginx.h b/src/core/nginx.h index d737d6b63..9b61fc959 100644 --- 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 index 916b1b514..7d4463b09 100644 --- 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 index a4e7d8045..96ed49c74 100644 --- 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 index 620b59d8c..84eaf5c6a 100644 --- 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 |