tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r462662 - in /tomcat/connectors/trunk/jk/native: iis/jk_isapi_plugin.c netscape/jk_nsapi_plugin.c
Date Wed, 11 Oct 2006 02:05:16 GMT
Author: rjung
Date: Tue Oct 10 19:05:15 2006
New Revision: 462662

URL: http://svn.apache.org/viewvc?view=rev&rev=462662
Log:
Adding "reference" feature to iis and netscape.
I forgot to do that after integrating it in apache.

Modified:
    tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
    tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?view=diff&rev=462662&r1=462661&r2=462662
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Tue Oct 10 19:05:15 2006
@@ -1242,6 +1242,10 @@
             if (jk_map_read_properties(workers_map, worker_file, NULL, logger)) {
                 /* we add the URI->WORKER MAP since workers using AJP14 will feed it */
 
+                if (jk_map_resolve_references(workers_map, "worker.", 1, 1, logger) == JK_FALSE)
{
+                    jk_log(logger, JK_LOG_ERROR, "Error in resolving configuration references");
+                }
+
                 worker_env.uri_to_worker = uw_map;
                 worker_env.server_name = serverName;
 

Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?view=diff&rev=462662&r1=462661&r2=462662
==============================================================================
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Tue Oct 10 19:05:15 2006
@@ -248,6 +248,10 @@
             int sleep_cnt;
             SYS_THREAD s;
 
+            if (jk_map_resolve_references(init_map, "worker.", 1, 1, logger) == JK_FALSE)
{
+                jk_log(logger, JK_LOG_ERROR, "Error in resolving configuration references");
+            }
+
             s = systhread_start(SYSTHREAD_DEFAULT_PRIORITY,
                                 0, init_workers_on_other_threads, init_map);
             for (sleep_cnt = 0; sleep_cnt < 60; sleep_cnt++) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message