From: Stefan Eissing <icing@apache.org>
Date: Tue, 17 May 2016 10:23:27 +0000 (+0000)
Subject: merge of r1743699 fromn trunk:
X-Git-Tag: 2.4.21~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f683b82e56255caffe5f502f76e6ed43922be81e;p=apache

merge of r1743699 fromn trunk:

http_core: Avoid truncating the_request line when there is no request to 'W'rite.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1744245 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 345de8109a..57404e66ec 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -148,9 +148,9 @@ static int ap_process_http_async_connection(conn_rec *c)
             c->keepalive = AP_CONN_UNKNOWN;
             /* process the request if it was read without error */
 
-            ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
             if (r->status == HTTP_OK) {
                 cs->state = CONN_STATE_HANDLER;
+                ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
                 ap_process_async_request(r);
                 /* After the call to ap_process_request, the
                  * request pool may have been deleted.  We set
@@ -203,10 +203,10 @@ static int ap_process_http_sync_connection(conn_rec *c)
         c->keepalive = AP_CONN_UNKNOWN;
         /* process the request if it was read without error */
 
-        ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
         if (r->status == HTTP_OK) {
             if (cs)
                 cs->state = CONN_STATE_HANDLER;
+            ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
             ap_process_request(r);
             /* After the call to ap_process_request, the
              * request pool will have been deleted.  We set