Provide vhost and abbreviated request strings on ExtendedStatus displays.

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

diff --git a/CHANGES b/CHANGES
index 05fd7941b8c1b15fed9b94e88927471a92b721d0..425c7341a8ba62184f6d02ba0cc66c7a02ea6d60 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 Changes with Apache 2.0.21-dev
+ 
+  *) Provide vhost and request strings when ExtendedStatus is on.
+     [Greg Ames]
 
   *) Fix some issues with the pod and prefork: check the pod *after*
      processing a connection so that a server processing a time-

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 302d3239380ed132cb3b75c8bce6f0ac8ed17cb7..83e11748871023356b84c721c5083e0b490c4c52 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -282,7 +282,7 @@ static int ap_process_http_connection(conn_rec *c)
  
         /* process the request if it was read without error */
  
-        ap_update_child_status(AP_CHILD_THREAD_FROM_ID(c->id), SERVER_BUSY_WRITE, NULL);
+        ap_update_child_status(AP_CHILD_THREAD_FROM_ID(c->id), SERVER_BUSY_WRITE, r);
         if (r->status == HTTP_OK)
             ap_process_request(r);
  
@@ -292,7 +292,7 @@ static int ap_process_http_connection(conn_rec *c)
         if (!c->keepalive || c->aborted)
             break;
  
-        ap_update_child_status(AP_CHILD_THREAD_FROM_ID(c->id), SERVER_BUSY_KEEPALIVE, NULL);
+        ap_update_child_status(AP_CHILD_THREAD_FROM_ID(c->id), SERVER_BUSY_KEEPALIVE, r);
         apr_pool_destroy(r->pool);
  
         if (ap_graceful_stop_signalled())