Author: rjung
Date: Sat Dec 20 11:37:54 2014
New Revision: 1646956
URL: http://svn.apache.org/r1646956
Log:
Apache: Copy log notes instead of using references
to prevent access to memory from closed pool.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1646956&r1=1646955&r2=1646956&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sat Dec 20 11:37:54 2014
@@ -518,7 +518,7 @@ static void JK_METHOD ws_add_log_items(j
for (h = 0; h < num_of_log_items; h++) {
if (log_names[h] && log_values[h]) {
- ap_table_setn(r->notes, log_names[h], log_values[h]);
+ ap_table_set(r->notes, log_names[h], log_values[h]);
}
}
}
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1646956&r1=1646955&r2=1646956&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Sat Dec 20 11:37:54 2014
@@ -583,7 +583,7 @@ static void JK_METHOD ws_add_log_items(j
for (h = 0; h < num_of_log_items; h++) {
if (log_names[h] && log_values[h]) {
- apr_table_setn(r->notes, log_names[h], log_values[h]);
+ apr_table_set(r->notes, log_names[h], log_values[h]);
}
}
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1646956&r1=1646955&r2=1646956&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sat Dec 20 11:37:54 2014
@@ -71,8 +71,12 @@
network stacks. (mturk)
</fix>
<fix>
- Reduce log level for "OPTIONS *" requests from warning to debug.
- (rjung)
+ <bug>50511</bug>: Reduce log level for "OPTIONS *" requests
+ from warning to debug. (rjung)
+ </fix>
+ <fix>
+ Apache: Copy log notes instead of using references to prevent access
+ to memory from closed pool. (rjung)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
