From: Jim Jagielski <jim@apache.org>
Date: Wed, 27 Feb 2013 22:18:10 +0000 (+0000)
Subject: this is broken... veto and pull out
X-Git-Tag: 2.4.5~526
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dac2e4db490d335aced181d99a5849953c2d02f;p=apache

this is broken... veto and pull out


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

diff --git a/CHANGES b/CHANGES
index 2c1c5d345d..66fdb989c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,9 +29,6 @@ Changes with Apache 2.4.4
      balancer-manager between graceful/normal restarts and power
      cycles. [Jim Jagielski]
 
-  *) mod_status: Print out list of times since a Vhost was last used.
-     [Jim Jagielski]
-
   *) mod_proxy: Fix startup crash with mis-defined balancers.
      PR 52402. [Jim Jagielski]
 
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 0237f1d7f8..54404e90bb 100644
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -619,7 +619,6 @@ static int status_handler(request_rec *r)
     }
 
     if (ap_extended_status && !short_report) {
-        apr_table_t *vhosts = apr_table_make(r->pool, 10);
         if (no_table_report)
             ap_rputs("<hr /><h2>Server Details</h2>\n\n", r);
         else
@@ -636,10 +635,6 @@ static int status_handler(request_rec *r)
 
         for (i = 0; i < server_limit; ++i) {
             for (j = 0; j < thread_limit; ++j) {
-                char *escvhost;
-                long last_used;
-                const char *vlast;
-
                 ws_record = ap_get_scoreboard_worker_from_indexes(i, j);
 
                 if (ws_record->access_count == 0 &&
@@ -659,22 +654,6 @@ static int status_handler(request_rec *r)
                 if (req_time < 0L)
                     req_time = 0L;
 
-                escvhost = ap_escape_html(r->pool, ws_record->vhost);
-                last_used = (long)apr_time_sec(nowtime - ws_record->last_used);
-                if (escvhost && *escvhost) {
-                    if ((vlast = apr_table_get(vhosts, escvhost)) != NULL) {
-                        long temp = atol(vlast);
-                        if (last_used < temp) {
-                            apr_table_setn(vhosts, apr_pstrdup(r->pool, escvhost),
-                                           apr_psprintf(r->pool, "%ld", last_used));
-                        }
-                    }
-                    else {
-                        apr_table_setn(vhosts, apr_pstrdup(r->pool, escvhost),
-                                           apr_psprintf(r->pool, "%ld", last_used));
-                    }
-                }
-
                 lres = ws_record->access_count;
                 my_lres = ws_record->my_access_count;
                 conn_lres = ws_record->conn_count;
@@ -754,7 +733,8 @@ static int status_handler(request_rec *r)
                                ws_record->times.tms_cutime / tick,
                                ws_record->times.tms_cstime / tick,
 #endif
-                               last_used,
+                               (long)apr_time_sec(nowtime -
+                                                  ws_record->last_used),
                                (long) req_time);
 
                     format_byte_out(r, conn_bytes);
@@ -770,7 +750,8 @@ static int status_handler(request_rec *r)
                                ap_escape_html(r->pool,
                                               ap_escape_logitem(r->pool,
                                                                 ws_record->request)),
-                               escvhost);
+                               ap_escape_html(r->pool,
+                                              ws_record->vhost));
                 }
                 else { /* !no_table_report */
                     if (ws_record->status == SERVER_DEAD)
@@ -839,7 +820,8 @@ static int status_handler(request_rec *r)
                                 ws_record->times.tms_cutime +
                                 ws_record->times.tms_cstime) / tick,
 #endif
-                               last_used,
+                               (long)apr_time_sec(nowtime -
+                                                  ws_record->last_used),
                                (long)req_time);
 
                     ap_rprintf(r, "</td><td>%-1.1f</td><td>%-2.2f</td><td>%-2.2f\n",
@@ -850,7 +832,8 @@ static int status_handler(request_rec *r)
                                   "<td nowrap>%s</td></tr>\n\n",
                                ap_escape_html(r->pool,
                                               ws_record->client),
-                               escvhost,
+                               ap_escape_html(r->pool,
+                                              ws_record->vhost),
                                ap_escape_html(r->pool,
                                               ap_escape_logitem(r->pool,
                                                       ws_record->request)));
@@ -859,10 +842,6 @@ static int status_handler(request_rec *r)
         } /* for (i...) */
 
         if (!no_table_report) {
-            int i;
-            const apr_array_header_t *arr = apr_table_elts(vhosts);
-            const apr_table_entry_t *elts = (const apr_table_entry_t *)arr->elts;
-
             ap_rputs("</table>\n \
 <hr /> \
 <table>\n \
@@ -881,13 +860,6 @@ static int status_handler(request_rec *r)
 <tr><th>Child</th><td>Megabytes transferred this child</td></tr>\n \
 <tr><th>Slot</th><td>Total megabytes transferred this slot</td></tr>\n \
 </table>\n", r);
-            ap_rputs("<hr />\n<table>\n\
-<tr><th>Vhost</th><th>Seconds since last used</th></tr>\n", r);
-            for (i = 0; i < arr->nelts; i++) {
-                ap_rprintf(r, "<tr><td><pre>%s</pre></td><td><pre>%27s</pre></td></tr>\n",
-                           elts[i].key, elts[i].val);
-            }
-            ap_rputs("</table>\n", r);
         }
     } /* if (ap_extended_status && !short_report) */
     else {