diff --git a/src/core/nginx.h b/src/core/nginx.h
index fc5d926..95d93cc 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 5712ea0..f1581e9 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -673,9 +673,9 @@
             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 @@
         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));