httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1372369 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/generators/mod_status.c
Date Mon, 13 Aug 2012 11:26:45 GMT
Author: rjung
Date: Mon Aug 13 11:26:45 2012
New Revision: 1372369

URL: http://svn.apache.org/viewvc?rev=1372369&view=rev
Log:
Axe unnecessary trailing comma from server-status user output.

Backport of r1369904 from trunk.

Submitted by: trawick
Reviewed by: rjung, humbedooh
Backported by: rjung

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/generators/mod_status.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1369904

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1372369&r1=1372368&r2=1372369&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Aug 13 11:26:45 2012
@@ -88,11 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-* Axe unnecessary trailing comma from server-status user output.
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1369904
-     2.4.x patch: trunk patch works
-     +1: rjung, trawick, humbedooh
-
    * mpm_winnt: Tweak a message added in r750567 so that the accept thread
      logs the physical address it listens on instead of hostname|*.
      trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1364138

Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_status.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_status.c?rev=1372369&r1=1372368&r2=1372369&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_status.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_status.c Mon Aug 13 11:26:45 2012
@@ -582,7 +582,7 @@ static int status_handler(request_rec *r
                  "\"<b><code>L</code></b>\" Logging, \n"
                  "\"<b><code>G</code></b>\" Gracefully finishing,<br
/> \n"
                  "\"<b><code>I</code></b>\" Idle cleanup of worker,
\n"
-                 "\"<b><code>.</code></b>\" Open slot with no current
process,<br />\n"
+                 "\"<b><code>.</code></b>\" Open slot with no current
process<br />\n"
                  "<p />\n", r);
         if (!ap_extended_status) {
             int j;



Mime
View raw message