From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 13 May 2016 16:52:33 +0000 (+0000)
Subject: Avoid truncating the_request line when there is no request to 'W'rite.
X-Git-Tag: 2.5.0-alpha~1625
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00e295490d190be5abb3e2450ee75b3b4d3e27e4;p=thirdparty%2Fapache%2Fhttpd.git

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




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1743699 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 90ae92b6f2e..6fdb82c229a 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