diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 6 |
2 files changed, 4 insertions, 4 deletions
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)); |