diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-11-15 14:37:34 +0000 |
---|---|---|
committer | Jonathan Kolb <jon@b0g.us> | 2005-11-15 14:37:34 +0000 |
commit | 7ec93b2c76ba708f52db71d98450897602b065b3 (patch) | |
tree | d9f8ba655de81497966b472790e3aed6e96edb4f | |
parent | fb0f94f09b096175f30ac00f514114ce3cb9b47b (diff) | |
download | nginx-7ec93b2c76ba708f52db71d98450897602b065b3.tar.gz |
Changes with nginx 0.3.11 15 Nov 2005v0.3.11
*) Bugfix: nginx did not pass while proxying the client request headers
and body; bug appeared in 0.3.10.
-rw-r--r-- | CHANGES | 8 | ||||
-rw-r--r-- | CHANGES.ru | 6 | ||||
-rw-r--r-- | src/core/nginx.h | 2 | ||||
-rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 6 |
4 files changed, 17 insertions, 5 deletions
@@ -1,8 +1,14 @@ +Changes with nginx 0.3.11 15 Nov 2005 + + *) Bugfix: nginx did not pass while proxying the client request headers + and body; bug appeared in 0.3.10. + + Changes with nginx 0.3.10 15 Nov 2005 *) Change: the "valid_referers" directive and the "$invalid_referer" - variable was moved to the new ngx_http_referer_module from the + variable were moved to the new ngx_http_referer_module from the ngx_http_rewrite_module. *) Change: the "$apache_bytes_sent" variable name was changed to diff --git a/CHANGES.ru b/CHANGES.ru index f04f6541f..48c1634b6 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 0.3.11 15.11.2005 + + *) Исправление: nginx не передавал при проксировании тело запроса и + строки заголовка клиента; ошибка появилась в 0.3.10. + + Изменения в nginx 0.3.10 15.11.2005 *) Изменение: директива valid_referers и переменная $invalid_referer diff --git a/src/core/nginx.h b/src/core/nginx.h index fc5d926e3..95d93ccb2 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.3.10" +#define NGINX_VER "nginx/0.3.11" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin" diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index 5712ea04b..f1581e9e7 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -673,9 +673,9 @@ ngx_http_proxy_create_request(ngx_http_request_t *r) code = *(ngx_http_script_code_pt *) e.ip; code((ngx_http_script_engine_t *) &e); } - } - b->last = e.pos; + b->last = e.pos; + } #if (NGX_DEBUG) { @@ -1621,7 +1621,7 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) conf->body_set = prev->body_set; } - if (conf->body_set_len == 0) { + if (conf->body_source.data && conf->body_set_len == NULL) { ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); |