cvs: /php4/sapi/aolserver aolserver.c

sas Fri Oct 8 09:06:59 1999 EDT Modified files: /php4/sapi/aolserver aolserver.c Log: (php_info_aolserver): Show information about the SAPI module (php_ns_module_main): Return early, if request startup failed Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.7 php4/sapi/aolserver/aolserver.c:1.8 --- php4/sapi/aolserver/aolserver.c:1.7 Thu Oct 7 17:47:39 1999 +++ php4/sapi/aolserver/aolserver.c Fri Oct 8 09:06:28 1999 @@ -21,7 +21,7 @@ * - write documentation */ -/* $Id: aolserver.c,v 1.7 1999/10/07 21:47:39 sas Exp $ */ +/* $Id: aolserver.c,v 1.8 1999/10/08 13:06:28 sas Exp $ */ /* conflict between PHP and AOLserver */ #define Debug php_Debug @@ -185,12 +185,39 @@ return http_cookie; } +static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS) +{ + PUTS("AOLserver SAPI module ($Id: aolserver.c,v 1.8 1999/10/08 13:06:28 sas Exp $)<br>"); +} + +static zend_module_entry php_aolserver_module = { + "AOLserver", + NULL, + NULL, + NULL, + NULL, + NULL, + php_info_aolserver, + STANDARD_MODULE_PROPERTIES +}; + +static int +php_ns_startup(sapi_module_struct *sapi_module) +{ + if(php_module_startup(sapi_module) == FAILURE + || zend_register_module(&php_aolserver_module) == FAILURE) { + return FAILURE; + } else { + return SUCCESS; + } +} + /* this structure is static (as in "it does not change") */ static sapi_module_struct sapi_module = { "PHP Language", - php_module_startup, /* startup */ + php_ns_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ php_ns_sapi_ub_write, /* unbuffered write */ @@ -261,9 +288,12 @@ file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; - php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); + if(php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { + return NS_ERROR; + } php_ns_hash_environment(NSLS_C CLS_CC ELS_CC PLS_CC SLS_CC); php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_request_shutdown(NULL); return NS_OK; }