# HG changeset patch
# User Igor Sysoev <http://sysoev.ru>
# Date 1132002000 -10800
# Node ID f1ad9023c312374ae972e9e5acc0f4fa0db12efd
# Parent  60c2de028f0d0dc01344fb46189f747129af4f38
nginx 0.3.11

    *) Bugfix: nginx did not pass the client request headers and body while
       proxying; bug appeared in 0.3.10.

diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -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
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,3 +1,9 @@
+
+Изменения в nginx 0.3.11                                          15.11.2005
+
+    *) Исправление: nginx не передавал при проксировании тело запроса и 
+       строки заголовка клиента; ошибка появилась в 0.3.10.
+
 
 Изменения в nginx 0.3.10                                          15.11.2005
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
--- 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
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -673,10 +673,10 @@ ngx_http_proxy_create_request(ngx_http_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)
     {
     ngx_str_t  s;
@@ -1621,7 +1621,7 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t
         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));