openresty/patches/nginx-1.2.5-allow_request_body_updating.patch

diff -ur nginx-1.2.5/src/http/ngx_http_core_module.c nginx-1.2.5-patched/src/http/ngx_http_core_module.c
--- nginx-1.2.5/src/http/ngx_http_core_module.c	2012-08-06 10:31:32.000000000 -0700
+++ nginx-1.2.5-patched/src/http/ngx_http_core_module.c	2012-08-30 11:37:42.388213974 -0700
@@ -2420,6 +2420,8 @@
 
     sr->request_body = r->request_body;
 
+    sr->content_length_n = -1;
+
     sr->method = NGX_HTTP_GET;
     sr->http_version = r->http_version;
 
diff -ur nginx-1.2.5/src/http/ngx_http_request_body.c nginx-1.2.5-patched/src/http/ngx_http_request_body.c
--- nginx-1.2.5/src/http/ngx_http_request_body.c	2012-04-12 12:35:41.000000000 -0700
+++ nginx-1.2.5-patched/src/http/ngx_http_request_body.c	2012-08-30 11:37:42.388213974 -0700
@@ -39,7 +39,7 @@
 
     r->main->count++;
 
-    if (r->request_body || r->discard_body) {
+    if (r->request_body || r->discard_body || r->content_length_n == 0) {
         post_handler(r);
         return NGX_OK;
     }
@@ -441,7 +441,7 @@
     ssize_t       size;
     ngx_event_t  *rev;
 
-    if (r != r->main || r->discard_body) {
+    if (r != r->main || r->discard_body || r->content_length_n == 0) {
         return NGX_OK;
     }
 
@@ -457,20 +457,22 @@
         ngx_del_timer(rev);
     }
 
-    if (r->headers_in.content_length_n <= 0 || r->request_body) {
+    r->content_length_n = r->headers_in.content_length_n;
+
+    if (r->content_length_n <= 0 || r->request_body) {
         return NGX_OK;
     }
 
     size = r->header_in->last - r->header_in->pos;
 
     if (size) {
-        if (r->headers_in.content_length_n > size) {
+        if (r->content_length_n > size) {
             r->header_in->pos += size;
-            r->headers_in.content_length_n -= size;
+            r->content_length_n -= size;
 
         } else {
-            r->header_in->pos += (size_t) r->headers_in.content_length_n;
-            r->headers_in.content_length_n = 0;
+            r->header_in->pos += (size_t) r->content_length_n;
+            r->content_length_n = 0;
             return NGX_OK;
         }
     }
@@ -569,7 +571,7 @@
                    "http read discarded body");
 
     for ( ;; ) {
-        if (r->headers_in.content_length_n == 0) {
+        if (r->content_length_n == 0) {
             r->read_event_handler = ngx_http_block_reading;
             return NGX_OK;
         }
@@ -578,9 +580,9 @@
             return NGX_AGAIN;
         }
 
-        size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
+        size = (r->content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
                    NGX_HTTP_DISCARD_BUFFER_SIZE:
-                   (size_t) r->headers_in.content_length_n;
+                   (size_t) r->content_length_n;
 
         n = r->connection->recv(r->connection, buffer, size);
 
@@ -597,7 +599,7 @@
             return NGX_OK;
         }
 
-        r->headers_in.content_length_n -= n;
+        r->content_length_n -= n;
     }
 }
 
diff -ur nginx-1.2.5/src/http/ngx_http_request.c nginx-1.2.5-patched/src/http/ngx_http_request.c
--- nginx-1.2.5/src/http/ngx_http_request.c	2012-08-06 10:36:30.000000000 -0700
+++ nginx-1.2.5-patched/src/http/ngx_http_request.c	2012-08-30 11:37:42.395213999 -0700
@@ -287,6 +287,8 @@
 
         r->pipeline = hc->pipeline;
 
+        r->content_length_n = -1;
+
         if (hc->nbusy) {
             r->header_in = hc->busy[0];
         }
@@ -298,6 +300,8 @@
             return;
         }
 
+        r->content_length_n = -1;
+
         hc->request = r;
     }
 
diff -ur nginx-1.2.5/src/http/ngx_http_request.h nginx-1.2.5-patched/src/http/ngx_http_request.h
--- nginx-1.2.5/src/http/ngx_http_request.h	2012-07-02 10:41:52.000000000 -0700
+++ nginx-1.2.5-patched/src/http/ngx_http_request.h	2012-08-30 11:39:37.085644830 -0700
@@ -9,6 +9,9 @@
 #define _NGX_HTTP_REQUEST_H_INCLUDED_
 
 
+#define HAVE_ALLOW_REQUEST_BODY_UPDATING_PATCH
+
+
 #define NGX_HTTP_MAX_URI_CHANGES           10
 #define NGX_HTTP_MAX_SUBREQUESTS           200
 
@@ -375,6 +378,9 @@
     ngx_pool_t                       *pool;
     ngx_buf_t                        *header_in;
 
+    off_t                             content_length_n;
+                                          /* for discarding request body */
+
     ngx_http_headers_in_t             headers_in;
     ngx_http_headers_out_t            headers_out;
 
Only in nginx-1.2.5-patched/src/http: ngx_http_request.h.orig