Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-11-15 17:49:57 +0300
committerIgor Sysoev <igor@sysoev.ru>2005-11-15 17:49:57 +0300
commitb141f2b631f4812188806f534472490af45a6747 (patch)
tree085e379ebed88537d635836dd097090ab6c896ff /src/http/modules
parent61b1e40939655dbab40ab5b29ca275ec51a81251 (diff)
nginx-0.3.11-RELEASE importrelease-0.3.11
*) Bugfix: nginx did not pass the client request headers and body while proxying; the bug had appeared in 0.3.10.
Diffstat (limited to 'src/http/modules')
-rw-r--r--src/http/modules/ngx_http_proxy_module.c6
1 files changed, 3 insertions, 3 deletions
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));