Close PR 50861 where enabling and disabling of buffered

jimjag · jimjag · commit d479dbbd05a2 · 2011-03-17T15:04:08.000Z
logs can cause a segfault. Patch by: Torsten Förtsch <torsten.foertsch@gmx.net> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082518 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.12
 
+  *) mod_log_config: Prevent segfault. PR 50861. [Torsten Förtsch
+     <torsten.foertsch gmx.net>]
+
   *) core: AllowEncodedSlashes new option NoDecode to allow encoded slashes
      in request URL path info but not decode them. Change behavior of option
      "On" to decode the encoded slashes as 2.0 and 2.2 do.  PR 35256,
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
@@ -1295,6 +1295,10 @@ static const char *set_buffered_logs_on(cmd_parms *parms, void *dummy, int flag)
         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[] =
@@ -1668,6 +1672,11 @@ static int log_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp)
         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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1295,6 +1295,10 @@ static const char set_buffered_logs_on(cmd_parms parms, void *dummy, int flag)`
`1295`	`1295`	`ap_log_set_writer_init(ap_buffered_log_writer_init);`
`1296`	`1296`	`ap_log_set_writer(ap_buffered_log_writer);`
`1297`	`1297`	`}`
	`1298`	`+ else {`
	`1299`	`+ ap_log_set_writer_init(ap_default_log_writer_init);`
	`1300`	`+ ap_log_set_writer(ap_default_log_writer);`
	`1301`	`+ }`
`1298`	`1302`	`return NULL;`
`1299`	`1303`	`}`
`1300`	`1304`	`static const command_rec config_log_cmds[] =`
`@@ -1668,6 +1672,11 @@ static int log_pre_config(apr_pool_t p, apr_pool_t plog, apr_pool_t *ptemp)`
`1668`	`1672`	`log_pfn_register(p, "R", log_handler, 1);`
`1669`	`1673`	`}`
`1670`	`1674`
	`1675`	`+ /* reset to default conditions */`
	`1676`	`+ ap_log_set_writer_init(ap_default_log_writer_init);`
	`1677`	`+ ap_log_set_writer(ap_default_log_writer);`
	`1678`	`+ buffered_logs = 0;`
	`1679`	`+`
`1671`	`1680`	`return OK;`
`1672`	`1681`	`}`
`1673`	`1682`