Author: rjung
Date: Thu Dec 18 02:56:24 2008
New Revision: 727693
URL: http://svn.apache.org/viewvc?rev=727693&view=rev
Log:
Fix BZ 46352: Apache crash when using SetHandler jakarta-servlet
in VHost without any JkMount. Crash due to incorrect initialization
of mount extensions.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=727693&r1=727692&r2=727693&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Thu Dec 18 02:56:24
2008
@@ -2767,9 +2767,7 @@
*/
static int jk_translate(request_rec * r)
{
- rule_extension_t **ext = ap_palloc(r->pool, sizeof(rule_extension_t *));
- *ext = NULL;
- ap_set_module_config(r->request_config, &jk_module, ext);
+ ap_set_module_config(r->request_config, &jk_module, NULL);
if (!r->proxyreq) {
jk_server_conf_t *conf =
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=727693&r1=727692&r2=727693&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Thu Dec 18 02:56:24
2008
@@ -3173,9 +3173,7 @@
*/
static int jk_translate(request_rec * r)
{
- rule_extension_t **ext = apr_palloc(r->pool, sizeof(rule_extension_t *));
- *ext = NULL;
- ap_set_module_config(r->request_config, &jk_module, ext);
+ ap_set_module_config(r->request_config, &jk_module, NULL);
if (!r->proxyreq) {
jk_server_conf_t *conf =
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=727693&r1=727692&r2=727693&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Thu Dec 18
02:56:24 2008
@@ -44,6 +44,11 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>46352</bug>: Fix Apache crash when using SetHandler
jakarta-servlet
+ in VHost without any JkMount. Crash due to incorrect initialization
+ of mount extensions. (rjung)
+ </fix>
+ <fix>
<bug>46169</bug>: Backport use_server_errors mount extension
to httpd 1.3. (rjung)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
