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

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

diff --git a/CHANGES b/CHANGES
index 1564ad51babf0a070c6d3aabdb041e75d1b9db31..66572b5787a51de9eed54f4e3a4445021edf6cb9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]

diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
index 37c76a7578013fcd3b51f3480a0bd6e802c2e8a6..d7bd2e71a4bd029686ece2d21cf8ac529d355746 100644 (file)
--- a/modules/mappers/mod_so.c
+++ b/modules/mappers/mod_so.c
@@ -362,7 +362,7 @@ static void dump_loaded_modules(apr_pool_t *p, server_rec *s)
         return;
     }
 
-    apr_file_open_stderr(&out, p);
+    apr_file_open_stdout(&out, p);
 
     apr_file_printf(out, "Loaded Modules:\n");
 

diff --git a/server/vhost.c b/server/vhost.c
index 8aebcfd023ec04096cf8d113b409226eb422b50a..6ed6cfea835eda1472e827395141bf7a0bb6eb1a 100644 (file)
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -676,7 +676,7 @@ AP_DECLARE(void) ap_fini_vhost_config(apr_pool_t *p, server_rec *main_s)
 #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);
     }
 }