--- basic_functions.c.old	2006-11-10 13:31:16.000000000 +0000
+++ basic_functions.c	2006-11-24 16:51:22.609375000 +0000
@@ -4399,6 +4399,9 @@
 			if (BG(sm_allowed_env_vars) && *BG(sm_allowed_env_vars)) {
 				char *allowed_env_vars = estrdup(BG(sm_allowed_env_vars));
 				char *allowed_prefix = strtok(allowed_env_vars, ", ");
+				char *strtok_buf = NULL;
+				char *allowed_prefix = php_strtok_r(allowed_env_vars, ", ", &strtok_buf);
+
 				zend_bool allowed = 0;
 
 				while (allowed_prefix) {
@@ -4406,7 +4409,7 @@
 						allowed = 1;
 						break;
 					}
-					allowed_prefix = strtok(NULL, ", ");
+					allowed_prefix = php_strtok_r(NULL, ", ", &strtok_buf);
 				}
 				efree(allowed_env_vars);
 				if (!allowed) {