httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r727616 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/mappers/mod_so.c server/vhost.c
Date Thu, 18 Dec 2008 01:46:00 GMT
Author: rpluem
Date: Wed Dec 17 17:46:00 2008
New Revision: 727616

URL: http://svn.apache.org/viewvc?rev=727616&view=rev
Log:
Merge r727452 from trunk:

Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.

Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rederpj, covener, rpluem

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c
    httpd/httpd/branches/2.2.x/server/vhost.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=727616&r1=727615&r2=727616&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Dec 17 17:46:00 2008
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.12
 
+  *) Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.
+     PR 42571 and PR 44266 (dup).  [Dan Poirier <poirier pobox.com>]
+
   *) mod_cache: When an explicit Expires or Cache-Control header is set, cache
      normally non-cacheable response statuses. PR 46346.
      [Alex Polvi <alex polvi.net>]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=727616&r1=727615&r2=727616&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Dec 17 17:46:00 2008
@@ -86,14 +86,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.
-   PR 42571 and PR 44266 (dup).  [Dan Poirier <poirier pobox.com>]
-   Trunk version of patch:
-      http://svn.apache.org/viewvc?view=rev&revision=727452
-   Backport version for 2.2.x of patch (trunk patch applies with offsets):
-      http://people.apache.org/~rederpj/backport_PR42571_moduleVhostToStdout.diff
-   +1: rederpj, covener, rpluem
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c?rev=727616&r1=727615&r2=727616&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c Wed Dec 17 17:46:00 2008
@@ -363,7 +363,7 @@
         return;
     }
 
-    apr_file_open_stderr(&out, p);
+    apr_file_open_stdout(&out, p);
 
     apr_file_printf(out, "Loaded Modules:\n");
 

Modified: httpd/httpd/branches/2.2.x/server/vhost.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/vhost.c?rev=727616&r1=727615&r2=727616&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/vhost.c (original)
+++ httpd/httpd/branches/2.2.x/server/vhost.c Wed Dec 17 17:46:00 2008
@@ -677,7 +677,7 @@
 #endif
     if (ap_exists_config_define("DUMP_VHOSTS")) {
         apr_file_t *thefile = NULL;
-        apr_file_open_stderr(&thefile, p);
+        apr_file_open_stdout(&thefile, p);
         dump_vhost_config(thefile);
     }
 }



Mime
View raw message