Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1195004 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
 modules/loggers/mod_log_config.c
Date: Sat, 29 Oct 2011 19:54:52 -0000
To: cvs@httpd.apache.org
From: fuankg@apache.org
Message-Id: <20111029195452.DC1F0238889B@eris.apache.org>

Author: fuankg
Date: Sat Oct 29 19:54:52 2011
New Revision: 1195004

URL: http://svn.apache.org/viewvc?rev=1195004&view=rev
Log:
Applied backport.

Close PR 50861 where enabling and disabling of buffered
logs can cause a segfault.
Patch by: Torsten Förtsch <torsten.foertsch@gmx.net>
Reviewed by: sf, trawick, rjung

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1195004&r1=1195003&r2=1195004&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sat Oct 29 19:54:52 2011
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.22
 
+  *) mod_log_config: Prevent segfault. PR 50861. [Torsten F�rtsch
+     <torsten.foertsch gmx.net>]
+
   *) mod_win32: Invert logic for env var UTF-8 fixing.
      Now we exclude a list of vars which we know for sure they dont hold UTF-8
      chars; all other vars will be fixed. This has the benefit that now also

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1195004&r1=1195003&r2=1195004&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Oct 29 19:54:52 2011
@@ -92,11 +92,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_log_config: Fix segfault for 'BufferedLogs Off'. PR 50861.
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1082518
-    2.2.x patch: Trunk patch works
-    +1: sf, trawick, rjung
-
 
 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/loggers/mod_log_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c?rev=1195004&r1=1195003&r2=1195004&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c (original)
+++ httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c Sat Oct 29 19:54:52 2011
@@ -1171,6 +1171,10 @@ static const char *set_buffered_logs_on(
         ap_log_set_writer_init(ap_buffered_log_writer_init);
         ap_log_set_writer(ap_buffered_log_writer);
     }
+    else {
+        ap_log_set_writer_init(ap_default_log_writer_init);
+        ap_log_set_writer(ap_default_log_writer);
+    }
     return NULL;
 }
 static const command_rec config_log_cmds[] =
@@ -1543,6 +1547,11 @@ static int log_pre_config(apr_pool_t *p,
         log_pfn_register(p, "R", log_handler, 1);
     }
 
+    /* reset to default conditions */
+    ap_log_set_writer_init(ap_default_log_writer_init);
+    ap_log_set_writer(ap_default_log_writer);
+    buffered_logs = 0;
+
     return OK;
 }