Author: rjung
Date: Tue Jul 17 05:57:23 2007
New Revision: 556916
URL: http://svn.apache.org/viewvc?view=rev&rev=556916
Log:
BZ42849 (Apache httpd 1.3): Abort startup of Apache httpd 1.3 in case
mod_jk initialization failed. We already do the same
for Apache httpd 2.x.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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?view=diff&rev=556916&r1=556915&r2=556916
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Tue Jul 17 05:57:23
2007
@@ -2651,9 +2651,9 @@
return;
}
else {
- ap_log_error(APLOG_MARK, APLOG_ERR, s,
- "Error in creating the workers."
- " Please consult your mod_jk log file '%s'.",
conf->log_file);
+ jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
+ "Error in creating the workers."
+ " Please consult your mod_jk log file '%s'.",
conf->log_file);
}
}
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=556916&r1=556915&r2=556916
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Tue Jul 17
05:57:23 2007
@@ -28,10 +28,15 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>42849</bug>: Abort startup of Apache httpd 1.3 in case
+ mod_jk initialization failed. We already do the same
+ for Apache httpd 2.x. (rjung)
+ </fix>
+ <fix>
<bug>42849</bug>: Refuse to operate with IIS in case the
initialization failed. Instead requesting isapi_redirect.dll
500 will be returned to the user. This is as closest as it
- can get to Apache Httpd wher we refuse to start the server
+ can get to Apache Httpd where we refuse to start the server
in case of fatal initialization errors. (mturk)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
