# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1188664819 0
# Node ID 7f2adaebb81f344849947d099d5dd0d9a2864bac
# Parent  f497ed7682a79a4d737ca9f49cee3462d877e2b0
fix socket leak introduced in r1374 when request header and body was
in one packet and connection went to keep-alive state

diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -446,8 +446,6 @@ ngx_http_discard_request_body(ngx_http_r
         return NGX_OK;
     }
 
-    r->discard_body = 1;
-
     size = r->header_in->last - r->header_in->pos;
 
     if (size) {
@@ -461,6 +459,8 @@ ngx_http_discard_request_body(ngx_http_r
         }
     }
 
+    r->discard_body = 1;
+
     r->read_event_handler = ngx_http_read_discarded_request_body_handler;
 
     if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {