cvs: php4 /sapi/aolserver README aolserver.c

sas Tue Aug 22 00:33:27 2000 EDT Modified files: /php4/sapi/aolserver aolserver.c README Log: Disable php_value and add note about reliability Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.45 php4/sapi/aolserver/aolserver.c:1.46 --- php4/sapi/aolserver/aolserver.c:1.45 Mon Aug 21 22:43:30 2000 +++ php4/sapi/aolserver/aolserver.c Tue Aug 22 00:33:27 2000 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.45 2000/08/22 05:43:30 sas Exp $ */ +/* $Id: aolserver.c,v 1.46 2000/08/22 07:33:27 sas Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -207,7 +207,7 @@ NSLS_FETCH(); php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.45 2000/08/22 05:43:30 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.46 2000/08/22 07:33:27 sas Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -557,6 +557,14 @@ 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 @@ strlen(val) + 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); efree(new_key); +#endif } } Index: php4/sapi/aolserver/README diff -u php4/sapi/aolserver/README:1.3 php4/sapi/aolserver/README:1.4 --- php4/sapi/aolserver/README:1.3 Mon Aug 21 23:11:01 2000 +++ php4/sapi/aolserver/README Tue Aug 22 00:33:27 2000 @@ -1,9 +1,17 @@ -AOLserver README ($Id: README,v 1.3 2000/08/22 06:11:01 sas Exp $) +AOLserver README ($Id: README,v 1.4 2000/08/22 07:33:27 sas Exp $) 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