cvs: php4 /main SAPI.h /sapi/apache mod_php4.c

zeev Wed Jan 3 03:56:01 2001 EDT Modified files: /php4/main SAPI.h /php4/sapi/apache mod_php4.c Log: Fix Apache module and remove excess elements from the SAPI structure Index: php4/main/SAPI.h diff -u php4/main/SAPI.h:1.65 php4/main/SAPI.h:1.66 --- php4/main/SAPI.h:1.65 Tue Jan 2 14:49:26 2001 +++ php4/main/SAPI.h Wed Jan 3 03:56:00 2001 @@ -224,7 +224,7 @@ SAPI_POST_READER_FUNC(sapi_read_standard_form_data); SAPI_POST_READER_FUNC(php_default_post_reader); -#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL +#define STANDARD_SAPI_MODULE_PROPERTIES NULL #endif /* SAPI_H */ Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.82 php4/sapi/apache/mod_php4.c:1.83 --- php4/sapi/apache/mod_php4.c:1.82 Wed Jan 3 03:39:09 2001 +++ php4/sapi/apache/mod_php4.c Wed Jan 3 03:56:00 2001 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.82 2001/01/03 11:39:09 sniper Exp $ */ +/* $Id: mod_php4.c,v 1.83 2001/01/03 11:56:00 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -346,6 +346,8 @@ sapi_apache_register_server_variables, /* register server variables */ php_apache_log_message, /* Log message */ + + NULL, /* php.ini path override */ #ifdef PHP_WIN32 NULL,