costin 02/01/11 21:15:35
Modified: jk/native2/common jk_workerEnv.c
Log:
Add the things we know at compile time into the properties.
( when we build the library for windows or unix it's likely we'll figure the
path separator instead of asking the user to type it ).
( should probably use apr equivalent )
Revision Changes Path
1.13 +15 -2 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_workerEnv.c 31 Dec 2001 19:18:48 -0000 1.12
+++ jk_workerEnv.c 12 Jan 2002 05:15:35 -0000 1.13
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.12 $ *
+ * Version: $Revision: 1.13 $ *
***************************************************************************/
#include "jk_workerEnv.h"
@@ -196,7 +196,7 @@
tmp = jk_map_getString(env, init_data, "worker.list",
DEFAULT_WORKER );
worker_list=jk_map_split( env, init_data, init_data->pool,
- tmp, &_this->num_of_workers );
+ tmp, NULL, &_this->num_of_workers );
if(worker_list==NULL || _this->num_of_workers<= 0 ) {
/* assert() - we pass default worker, we should get something back */
@@ -570,6 +570,19 @@
_this->init_data = NULL;
jk_map_default_create(env, & _this->init_data, pool);
+ /* Add 'compile time' settings. Those are defined in jk_global,
+ with the other platform-specific settings. No need to ask
+ the user what we can find ourself
+ */
+ _this->init_data->put( env, _this->init_data, "fs",
+ FILE_SEPARATOR_STR, NULL );
+ _this->init_data->put( env, _this->init_data, "ps",
+ PATH_SEPARATOR_STR, NULL );
+ _this->init_data->put( env, _this->init_data, "so",
+ SO_EXTENSION, NULL );
+ _this->init_data->put( env, _this->init_data, "arch",
+ ARCH, NULL );
+
_this->worker_file = NULL;
_this->log_file = NULL;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
