From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 13 May 2016 16:55:17 +0000 (+0000)
Subject: Replace one backport proposal with another
X-Git-Tag: 2.4.21~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db64072ab18ee62c52a5d24fd76008f6a6a2d615;p=apache

Replace one backport proposal with another

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

diff --git a/STATUS b/STATUS
index 6ca83741a9..e1c327f339 100644
--- a/STATUS
+++ b/STATUS
@@ -165,15 +165,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
-   * Fix yet another case where we clobber the server-status request info
-     when a timeout happens.
-     trunk patch: http://svn.apache.org/r1742822
+  *) Avoid truncating the_request line when there is no request to 'W'rite.
+     trunk patch: http://svn.apache.org/r1743699
      2.4.x patch: trunk works
-     +1: rjung, ylavic
-     -1: What are we "W"riteing if we have no request?!?
-         Semantically invalid on event mpm when resuming a connection, while
-         this new thread has performed no work on prior request.  That status
-         update should only occur on a successful read.
+     +1: wrowe
+    
 
 PATCHES/ISSUES THAT ARE BEING WORKED
 
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