httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1743511 - /httpd/httpd/trunk/modules/http/http_core.c
Date Thu, 12 May 2016 14:50:09 GMT
Author: wrowe
Date: Thu May 12 14:50:09 2016
New Revision: 1743511

URL: http://svn.apache.org/viewvc?rev=1743511&view=rev
Log:
Revert 1742822, incorrect assumptions here

Modified:
    httpd/httpd/trunk/modules/http/http_core.c

Modified: httpd/httpd/trunk/modules/http/http_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_core.c?rev=1743511&r1=1743510&r2=1743511&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_core.c (original)
+++ httpd/httpd/trunk/modules/http/http_core.c Thu May 12 14:50:09 2016
@@ -148,8 +148,7 @@ static int ap_process_http_async_connect
             c->keepalive = AP_CONN_UNKNOWN;
             /* process the request if it was read without error */
 
-            ap_update_child_status(c->sbh, SERVER_BUSY_WRITE,
-                                   r->the_request ? r : NULL);
+            ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
             if (r->status == HTTP_OK) {
                 cs->state = CONN_STATE_HANDLER;
                 ap_process_async_request(r);
@@ -204,8 +203,7 @@ static int ap_process_http_sync_connecti
         c->keepalive = AP_CONN_UNKNOWN;
         /* process the request if it was read without error */
 
-        ap_update_child_status(c->sbh, SERVER_BUSY_WRITE,
-                               r->the_request ? r : NULL);
+        ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
         if (r->status == HTTP_OK) {
             if (cs)
                 cs->state = CONN_STATE_HANDLER;



Mime
View raw message