Fix Apache module and remove excess elements from the SAPI structure

diff --git a/main/SAPI.h b/main/SAPI.h
index 4e9ada027845fbadc16071b86c5746caa6ac7c42..89e426cd43809562d178e1db47de4f9749bd61e7 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -224,7 +224,7 @@ struct _sapi_post_entry {
 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 */
 

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 224eeb5b9984171b26dc5346568114af18f44841..7d9fc511a77c0763a7e658ce52ecd6a26807b3ab 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -347,6 +347,8 @@ static sapi_module_struct apache_sapi_module = {
        sapi_apache_register_server_variables,          /* register server variables */
        php_apache_log_message,                 /* Log message */
 
+       NULL,                                   /* php.ini path override */
+
 #ifdef PHP_WIN32
        NULL,
        NULL,