svn commit: r727452 - in /httpd/httpd/trunk: CHANGES modules/mappers/mod_so.c server/vhost.c

[re...@apache.org]

Author: rederpj
Date: Wed Dec 17 10:03:09 2008
New Revision: 727452

URL: http://svn.apache.org/viewvc?rev=727452&view=rev
Log:
Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/mappers/mod_so.c
    httpd/httpd/trunk/server/vhost.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=727452&r1=727451&r2=727452&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Dec 17 10:03:09 2008
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.1
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) 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_ldap: Avoid a segfault when result->rc is checked in uldap_connection_init
      when result is NULL. This could happen if LDAP initialization failed.
      PR 45994.  [Dan Poirier <poirier pobox.com>]

Modified: httpd/httpd/trunk/modules/mappers/mod_so.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_so.c?rev=727452&r1=727451&r2=727452&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_so.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_so.c Wed Dec 17 10:03:09 2008
@@ -362,7 +362,7 @@
         return;
     }
 
-    apr_file_open_stderr(&out, p);
+    apr_file_open_stdout(&out, p);
 
     apr_file_printf(out, "Loaded Modules:\n");
 

Modified: httpd/httpd/trunk/server/vhost.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/vhost.c?rev=727452&r1=727451&r2=727452&view=diff
==============================================================================
--- httpd/httpd/trunk/server/vhost.c (original)
+++ httpd/httpd/trunk/server/vhost.c Wed Dec 17 10:03:09 2008
@@ -676,7 +676,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);
     }
 }