You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by gl...@apache.org on 2003/05/16 02:12:40 UTC
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c jk_map.c jk_util.c
glenn 2003/05/15 17:12:40
Modified: jk/native/common Tag: JK_1_2_3 jk_ajp12_worker.c jk_map.c
jk_util.c
Log:
For Apache 2 and the worker MPM we must be threadsafe, make sure reentrant version of strtok is used
Revision Changes Path
No revision
No revision
1.9.4.1 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -r1.9 -r1.9.4.1
--- jk_ajp12_worker.c 20 Sep 2002 11:28:16 -0000 1.9
+++ jk_ajp12_worker.c 16 May 2003 00:12:39 -0000 1.9.4.1
@@ -551,7 +551,7 @@
char *line = NULL;
char *name = NULL;
char *value = NULL;
-#ifdef AS400
+#if defined(AS400) || defined(_REENTRANT)
char *lasts;
#endif
@@ -593,7 +593,7 @@
jk_log(l, JK_LOG_DEBUG, "ajpv12_handle_response, read %s=%s\n", name, value);
if(0 == strcmp("Status", name)) {
-#ifdef AS400
+#if defined(AS400) || defined(_REENTRANT)
char *numeric = strtok_r(value, " \t", &lasts);
#else
char *numeric = strtok(value, " \t");
@@ -604,7 +604,7 @@
jk_log(l, JK_LOG_ERROR, "ajpv12_handle_response, invalid status code\n");
return JK_FALSE;
}
-#ifdef AS400
+#if defined(AS400) || defined(_REENTRANT)
reason = jk_pool_strdup(s->pool, strtok_r(NULL, " \t", &lasts));
#else
reason = jk_pool_strdup(s->pool, strtok(NULL, " \t"));
1.10.4.1 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_map.c
Index: jk_map.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -r1.10 -r1.10.4.1
--- jk_map.c 4 Sep 2002 11:31:33 -0000 1.10
+++ jk_map.c 16 May 2003 00:12:40 -0000 1.10.4.1
@@ -214,7 +214,7 @@
{
char *l = map_get_string(m, name, def);
char **ar = NULL;
-#ifdef AS400
+#if defined(AS400) || defined(_REENTRANT)
char *lasts;
#endif
@@ -233,7 +233,7 @@
* GS, in addition to VG's patch, we now need to
* strtok also by a "*"
*/
-#ifdef AS400
+#if defined(AS400) || defined(_REENTRANT)
for(l = strtok_r(v, " \t,*", &lasts) ;
l ;
l = strtok_r(NULL, " \t,*",&lasts))
1.21.2.2 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- jk_util.c 12 May 2003 14:32:20 -0000 1.21.2.1
+++ jk_util.c 16 May 2003 00:12:40 -0000 1.21.2.2
@@ -824,7 +824,7 @@
const char *sysprops)
{
char **rc = NULL;
-#ifdef AS400
+#if defined(AS400) || defined(_REENTRANT)
char *lasts;
#endif
@@ -842,7 +842,7 @@
rc = jk_pool_alloc(p, (num_of_prps + 1) * sizeof(char *));
if(rc) {
unsigned i = 0;
-#ifdef AS400
+#if defined(AS400) || defined(_REENTRANT)
char *tmp = strtok_r(prps, "*", &lasts);
#else
char *tmp = strtok(prps, "*");
@@ -850,7 +850,7 @@
while(tmp && i < num_of_prps) {
rc[i] = tmp;
-#ifdef AS400
+#if defined(AS400) || defined(_REENTRANT)
tmp = strtok_r(NULL, "*", &lasts);
#else
tmp = strtok(NULL, "*");
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org