Author: rjung Date: Sun Mar 11 08:06:24 2007 New Revision: 516917 URL: http://svn.apache.org/viewvc?view=rev&rev=516917 Log: Use jk return values for init_jk(), because it's not part of httpd API.
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c 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=516917&r1=516916&r2=516917 ============================================================================== --- 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:06:24 2007 @@ -2657,13 +2657,13 @@ } ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, "Error in reading worker properties"); - return !OK; + return JK_FALSE; } if (jk_map_resolve_references(init_map, "worker.", 1, 1, conf->log) == JK_FALSE) { ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, "Error in resolving configuration references"); - return !OK; + return JK_FALSE; } /* we add the URI->WORKER MAP since workers using AJP14 @@ -2683,9 +2683,9 @@ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, "Error in creating the workers." " Please consult your mod_jk log file '%s'.", conf->log_file); - return !OK; + return JK_FALSE; } - return OK; + return JK_TRUE; } static int jk_post_config(apr_pool_t * pconf, @@ -2778,7 +2778,7 @@ } } } - if (init_jk(pconf, conf, s)) + if (init_jk(pconf, conf, s) == JK_FALSE) return HTTP_INTERNAL_SERVER_ERROR; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]