Merge r1527008 from trunk:

Fix the null device name on Windows so that stderr can be sent
to the bit bucket.  (This logic is always hit when using an error
log provider.)

Submitted by: trawick
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index 9ecc00872b337a839f7be7af22cc3c55360e9457..074f2aaba8b5ed89a6a30e3f9d340bff0e12def2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -109,12 +109,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x: trunk works modulo CHANGES
     +1: rjung, covener, jim
 
-  * Error log on Windows: Fix the name of the null device to fix failure
-    to discard stderr.
-    trunk patch: https://svn.apache.org/r1527008
-    2.4.x: trunk patch works
-    +1: trawick, covener, jim
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/server/log.c b/server/log.c
index 7bbd708b612704a3432a5e01a984609ad776cd88..bcfdcdb6ebfef9c190455824a2bdb943c2ad5568 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -509,9 +509,16 @@ int ap_open_logs(apr_pool_t *pconf, apr_pool_t *p /* plog */,
      * XXX: This is BS - /dev/null is non-portable
      *      errno-as-apr_status_t is also non-portable
      */
-    if (replace_stderr && freopen("/dev/null", "w", stderr) == NULL) {
+
+#ifdef WIN32
+#define NULL_DEVICE "nul"
+#else
+#define NULL_DEVICE "/dev/null"
+#endif
+
+    if (replace_stderr && freopen(NULL_DEVICE, "w", stderr) == NULL) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, errno, s_main, APLOGNO(00093)
-                     "unable to replace stderr with /dev/null");
+                     "unable to replace stderr with %s", NULL_DEVICE);
     }
 
     for (virt = s_main->next; virt; virt = virt->next) {