httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1742822 - /httpd/httpd/trunk/modules/http/http_core.c
Date Sun, 08 May 2016 13:53:38 GMT
Author: rjung
Date: Sun May  8 13:53:37 2016
New Revision: 1742822

URL: http://svn.apache.org/viewvc?rev=1742822&view=rev
Log:
Fix yet another case where we clobber the
server-status request info when a timeout happens.

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=1742822&r1=1742821&r2=1742822&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_core.c (original)
+++ httpd/httpd/trunk/modules/http/http_core.c Sun May  8 13:53:37 2016
@@ -148,7 +148,8 @@ 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);
+            ap_update_child_status(c->sbh, SERVER_BUSY_WRITE,
+                                   r->the_request ? r : NULL);
             if (r->status == HTTP_OK) {
                 cs->state = CONN_STATE_HANDLER;
                 ap_process_async_request(r);
@@ -203,7 +204,8 @@ 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);
+        ap_update_child_status(c->sbh, SERVER_BUSY_WRITE,
+                               r->the_request ? r : NULL);
         if (r->status == HTTP_OK) {
             if (cs)
                 cs->state = CONN_STATE_HANDLER;



Mime
View raw message