Disable php_value and add note about reliability

2 files changed, 19 insertions, 2 deletions

diff --git a/sapi/aolserver/README b/sapi/aolserver/README
index b63f74ba5c..0d03e4b6e2 100644
--- a/sapi/aolserver/README
+++ b/sapi/aolserver/README
@@ -2,8 +2,16 @@ AOLserver README ($Id$)
 
 To compile PHP 4.0 as a module for AOLserver, you need:
 
-- AOLserver 3.0 source distribution
-- installed AOLserver 3.0 
+- AOLserver 3.0 source distribution (not required for AOLserver >= 3.1)
+- installed AOLserver 3.0 or later
+
+
+NOTE: You should not use this module in production. PHP is not 100% stable
+      yet in threaded mode. To increase reliability enable the Global Lock
+      by removing #define NO_GLOBAL_LOCK in main/main.c. Also don't use
+      php_value as it will lead to races in a sub-system (use an ini file
+      instead).
+
 
 1.) Configuring AOLserver
 
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index dc172e0069..90a2719ac4 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -557,6 +557,14 @@ php_ns_config(php_ns_context *ctx, char global)
 			Ns_RegisterRequest(ctx->ns_server, "GET", value, php_ns_request_handler, NULL, ctx, 0);
 			Ns_RegisterRequest(ctx->ns_server, "POST", value, php_ns_request_handler, NULL, ctx, 0);
 			Ns_RegisterRequest(ctx->ns_server, "HEAD", value, php_ns_request_handler, NULL, ctx, 0);
+
+	/* 
+	 * Deactivated for now. The ini system will cause random crashes when 
+	 * accessed from here (since there are no locks to protect the global 
+	 * known_directives) 
+	 */
+
+#if 0
 		} else if (!global && !strcasecmp(key, "php_value")) {
 			char *val;
 
@@ -575,6 +583,7 @@ php_ns_config(php_ns_context *ctx, char global)
 						strlen(val) + 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
 				
 				efree(new_key);
+#endif
 			}
 		}