From b141f2b631f4812188806f534472490af45a6747 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 15 Nov 2005 14:49:57 +0000
Subject: nginx-0.3.11-RELEASE import

    *) Bugfix: nginx did not pass the client request headers and body while
       proxying; the bug had appeared in 0.3.10.
---
 docs/xml/nginx/changes.xml               | 18 +++++++++++++++++-
 src/core/nginx.h                         |  2 +-
 src/http/modules/ngx_http_proxy_module.c |  6 +++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index 0a999126d..001633aa3 100644
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -9,6 +9,22 @@
 <title lang="en">nginx changelog</title>
 
 
+<changes ver="0.3.11" date="15.11.2005">
+
+<change type="bugfix">
+<para lang="ru">
+nginx не передавал при проксировании тело запроса и строки заголовка клиента;
+ошибка появилась в 0.3.10.
+</para>
+<para lang="en">
+nginx did not pass while proxying the client request headers and body;
+bug appeared in 0.3.10.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="0.3.10" date="15.11.2005">
 
 <change type="change">
@@ -18,7 +34,7 @@
 </para>
 <para lang="en">
 the "valid_referers" directive and the "$invalid_referer" variable
-was moved to the new ngx_http_referer_module from the ngx_http_rewrite_module.
+were moved to the new ngx_http_referer_module from the ngx_http_rewrite_module.
 </para>
 </change>
 
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));
 
-- 
cgit v1.2.3