From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 18 Dec 2008 01:46:00 +0000 (+0000)
Subject: Merge r727452 from trunk:
X-Git-Tag: 2.2.12~313
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8825d114f6243a2a7333eac90ec437208df74d00;p=thirdparty%2Fapache%2Fhttpd.git

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


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

diff --git a/CHANGES b/CHANGES
index 0c2a0f81bec..d5b2c27fe19 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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>]
diff --git a/STATUS b/STATUS
index 060b1c6c060..2ba3cdd1ffc 100644
--- a/STATUS
+++ b/STATUS
@@ -86,14 +86,6 @@ RELEASE SHOWSTOPPERS:
 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 ]
 
diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
index 44bed43b69b..2d4a54c2e81 100644
--- a/modules/mappers/mod_so.c
+++ b/modules/mappers/mod_so.c
@@ -363,7 +363,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 d7a0a07e6d4..5b79fea598b 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -677,7 +677,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);
     }
 }