Author: rjung Date: Wed Jan 9 13:12:29 2008 New Revision: 610566 URL: http://svn.apache.org/viewvc?rev=610566&view=rev Log: Include original configuration map in worker_env to make it available for workers, e.g. the status worker.
Modified: tomcat/connectors/trunk/jk/native/common/jk_service.h tomcat/connectors/trunk/jk/native/common/jk_worker.c tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Modified: tomcat/connectors/trunk/jk/native/common/jk_service.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_service.h?rev=610566&r1=610565&r2=610566&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_service.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_service.h Wed Jan 9 13:12:29 2008 @@ -51,6 +51,9 @@ struct jk_worker_env { + /* The original configuration map */ + jk_map_t *init_data; + /* The URI to WORKER map, will be feeded by AJP14 autoconf feature */ jk_uri_worker_map_t *uri_to_worker; Modified: tomcat/connectors/trunk/jk/native/common/jk_worker.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_worker.c?rev=610566&r1=610565&r2=610566&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_worker.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_worker.c Wed Jan 9 13:12:29 2008 @@ -63,6 +63,7 @@ } jk_map_dump(init_data, l); + we->init_data = init_data; if (!jk_get_worker_list(init_data, &(we->worker_list), &we->num_of_workers)) { JK_TRACE_EXIT(l); Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=610566&r1=610565&r2=610566&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Jan 9 13:12:29 2008 @@ -44,6 +44,10 @@ <subsection name="Native"> <changelog> <update> + Common: Include original configuration map in worker_env + to make it available for workers, e.g. the status worker. (rjung) + </update> + <update> LB: Refactor "route" return for httpd note. Don't use a member of the worker_record, because that's not thread safe. (rjung) </update> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]