Author: rjung
Date: Sun Mar 11 08:17:44 2007
New Revision: 516922
URL: http://svn.apache.org/viewvc?view=rev&rev=516922
Log:
- Delete unused check for empty init_map during startup.
- Bugzilla 41770: Fix startup error if no JkWorkersFile is used.
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?view=diff&rev=516922&r1=516921&r2=516922
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Mar 11 08:17:44
2007
@@ -2534,15 +2534,11 @@
}
*/
- if (!jk_map_read_properties(init_map, conf->worker_file, NULL, 1,
conf->log)) {
-
- if (jk_map_size(init_map) == 0) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, s,
- "No worker file and no worker options in httpd.conf "
- "use JkWorkerFile to set workers");
- }
- jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p, "Error in
reading worker properties");
-
+ if ((conf->worker_file != NULL) &&
+ !jk_map_read_properties(init_map, conf->worker_file, NULL, 1,
conf->log)) {
+ jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
+ "Error in reading worker properties from '%s'",
+ conf->worker_file);
}
if (jk_map_resolve_references(init_map, "worker.", 1, 1, conf->log) ==
JK_FALSE) {
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?view=diff&rev=516922&r1=516921&r2=516922
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Mar 11 08:17:44
2007
@@ -2648,15 +2648,11 @@
"Setting default connection pool max size to %d", mpm_threads);
jk_set_worker_def_cache_size(mpm_threads);
- /* if(map_alloc(&init_map)) { */
- if (!jk_map_read_properties(init_map, conf->worker_file, NULL, 1,
conf->log)) {
- if (jk_map_size(init_map) == 0) {
- ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_CRIT, 0, s,
- "No worker file and no worker options in httpd.conf"
- "use JkWorkerFile to set workers");
- }
+ if ((conf->worker_file != NULL) &&
+ !jk_map_read_properties(init_map, conf->worker_file, NULL, 1,
conf->log)) {
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
- "Error in reading worker properties");
+ "Error in reading worker properties from '%s'",
+ conf->worker_file);
return JK_FALSE;
}
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=516922&r1=516921&r2=516922
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Mar 11
08:17:44 2007
@@ -27,6 +27,19 @@
<subsection name="Native">
<changelog>
<update>
+ Delete unused check for empty init_map during startup. (rjung)
+ </update>
+ <fix>
+ <bug>41770</bug>: Fix startup error if no JkWorkersFile is used.
(rjung)
+ </fix>
+ <update>
+ Use JK_TRUE/JK_FALSE instead of OK/!OK as return values in init_jk().
(rjung)
+ </update>
+ <update>
+ Minor adjustments to apache startup log messages (when to use STDERR,
remove
+ deprecated NOERRNO flag, shm warning and warnings for usage of default
files). (rjung)
+ </update>
+ <update>
Replace APR precompiler directive by httpd mpm_query to detect MPM
threading.
Add an info log message about auto-detected pool size. (rjung)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
