- Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is.

diff --git a/main/SAPI.h b/main/SAPI.h
index d0238516b5f6fe48122e229afb6c2af6b3f4abb1..75f68b18fdf593cab797ed5cae0b8e3b1cc92cd3 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -215,12 +215,12 @@ struct _sapi_module_struct {
        void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
        void (*log_message)(char *message);
 
+
        char *php_ini_path_override;
 
        void (*block_interruptions)(void);
        void (*unblock_interruptions)(void);
        
-
        void (*default_post_reader)(TSRMLS_D);
        void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC);
        char *executable_location;
@@ -262,7 +262,7 @@ SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
 SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader);
 SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data);
 
-#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, 0
+#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL
 
 #endif /* SAPI_H */
 

diff --git a/sapi/activescript/php4activescript.c b/sapi/activescript/php4activescript.c
index a85cd625b9861dc7eecd1db6c3928bedef97c626..937388caa9cbb4921409e48c3c80cf96746a0b28 100644 (file)
--- a/sapi/activescript/php4activescript.c
+++ b/sapi/activescript/php4activescript.c
@@ -118,9 +118,6 @@ sapi_module_struct activescript_sapi_module = {
        sapi_activescript_register_server_variables,    /* register server variables */
        NULL,                                                                   /* Log message */
 
-       NULL,                                                                   /* Block interruptions */
-       NULL,                                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 1136d1dc1b39c49a74d24dcb22fc4e09ef477e0d..15ba8df653cb70de94034053511665f80f32ac32 100644 (file)
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -388,11 +388,6 @@ static sapi_module_struct aolserver_sapi_module = {
        php_ns_sapi_register_variables,
        NULL,                                                                   /* Log message */
 
-       NULL,                                                                   /* php.ini path override */
-
-       NULL,                                                                   /* Block interruptions */
-       NULL,                                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index da8c160d7b08fb0a0eb382c9272c785144c21a1b..1108a52cf334e2492e42f0ea17cf66aa738b000d 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -299,11 +299,6 @@ static sapi_module_struct apache2_sapi_module = {
        php_apache_sapi_register_variables,
        php_apache_sapi_log_message,                    /* Log message */
 
-    NULL,                                                                      /* php_ini_path_override */
-
-       NULL,                                                                   /* Block interruptions */
-       NULL,                                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/apache_hooks/mod_php4.c b/sapi/apache_hooks/mod_php4.c
index 0883837367fe39443ee01cd68b1c3444e11a7dc8..aea466374c8fdc8de0125203f40940216ea8b1b4 100644 (file)
--- a/sapi/apache_hooks/mod_php4.c
+++ b/sapi/apache_hooks/mod_php4.c
@@ -540,7 +540,12 @@ static sapi_module_struct apache_sapi_module = {
        unblock_alarms,                                 /* Unblock interruptions */
 #endif
 
-       STANDARD_SAPI_MODULE_PROPERTIES
+       NULL,                           /* default post reader */
+       NULL,                           /* treat data */
+       NULL,                           /* exe location */
+       0,                              /* ini ignore */
+       NULL
+       
 };
 /* }}} */
 

diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index 319670f039faed01f53ecf742b3d7349b3ec2829..8814b61f5de2cb241852b31718f29e38b88490c9 100644 (file)
--- a/sapi/caudium/caudium.c
+++ b/sapi/caudium/caudium.c
@@ -550,8 +550,6 @@ static sapi_module_struct caudium_sapi_module = {
   php_caudium_sapi_read_cookies,       /* read cookies */
   sapi_caudium_register_variables,     /* register server variables */
   NULL,                                        /* Log message */
-  NULL,                                        /* Block interruptions */
-  NULL,                                        /* Unblock interruptions */
 
   STANDARD_SAPI_MODULE_PROPERTIES
 };

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index a84c4857cac261d4ca3c4f1db7c01ee4dcdcbd87..76ef7bb31a8e0c1c1f4a39a9a596467d12cf95e9 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -445,9 +445,6 @@ static sapi_module_struct cgi_sapi_module = {
        sapi_cgi_register_variables,    /* register server variables */
        sapi_cgi_log_message,                   /* Log message */
 
-       NULL,                                                   /* Block interruptions */
-       NULL,                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 177a532365bce247cf449172f74b80a3a4fbda8e..3232931858b52f7262ae28f28850046dde5fd343 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -277,9 +277,6 @@ static sapi_module_struct cli_sapi_module = {
        sapi_cli_register_variables,    /* register server variables */
        sapi_cli_log_message,                   /* Log message */
 
-       NULL,                                                   /* Block interruptions */
-       NULL,                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index e16eecef4054ebee01619f71d0044940f14390fe..ffba00173efee5192ea596d9ec235afcf52b53eb 100644 (file)
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -126,9 +126,6 @@ static sapi_module_struct php_embed_module = {
        php_embed_register_variables,   /* register server variables */
        php_embed_log_message,          /* Log message */
   
-       NULL,                          /* Block interruptions */
-       NULL,                          /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index f9430943e1ea128033ae789e2c7d6c437e31e497..e6f6320299de9d700c64124f8cc93c40c0347a63 100644 (file)
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -209,9 +209,6 @@ static sapi_module_struct fastcgi_sapi_module = {
        sapi_fastcgi_register_variables,
        sapi_fastcgi_log_message,
 
-       NULL,                                                                   /* Block interruptions */
-       NULL,                                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 9f2d3f296d1739a4f1abea0a818d7807860041ec..6f9db5c45422db4e1a1a97f9f31dba4eb01a83b9 100644 (file)
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -603,9 +603,6 @@ static sapi_module_struct isapi_sapi_module = {
        sapi_isapi_register_server_variables,   /* register server variables */
        NULL,                                                                   /* Log message */
 
-       NULL,                                                                   /* Block interruptions */
-       NULL,                                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index f2e4efacb61bbc212250dfa0e1c7315d4aaa6295..5365f5bac01a95a1367345f80de92540d58cb59a 100644 (file)
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -380,9 +380,6 @@ static sapi_module_struct nsapi_sapi_module = {
        sapi_nsapi_register_server_variables,   /* register server variables */
        nsapi_log_message,                      /* Log message */
 
-       NULL,                                   /* Block interruptions */
-       NULL,                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
index 415c691cc76daa84c8b615bfe3a2ef3ac77c2973..ddaa965b22619d48d23eb2e23514ef1eae77b8ed 100644 (file)
--- a/sapi/phttpd/phttpd.c
+++ b/sapi/phttpd/phttpd.c
@@ -180,9 +180,6 @@ static sapi_module_struct phttpd_sapi_module = {
        NULL,                                                                   /* register server variables */
        NULL,                                                                   /* Log message */
 
-       NULL,                                                                   /* Block interruptions */
-       NULL,                                                                   /* Unblock interruptions */
-
     STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index e4b782f4f17af369aa0806899a4dee29d23f51e7..8c17c7d0c764d6557838b240d6c57e7015fd73b9 100644 (file)
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -378,8 +378,6 @@ static sapi_module_struct pi3web_sapi_module = {
        sapi_pi3web_read_cookies,               /* read Cookies */
        sapi_pi3web_register_variables, /* register server variables */
        NULL,                                   /* Log message */
-       NULL,                                   /* Block interruptions */
-       NULL,                                   /* Unblock interruptions */     
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };

diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index d86bb0917c2cd4888989dfd63baca5bb4c2c81a1..02c6d168b1d1a137cb96887486882db657463781 100644 (file)
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -501,8 +501,6 @@ static sapi_module_struct roxen_sapi_module = {
   php_roxen_sapi_read_cookies,         /* read Cookies */
   NULL,                                        /* register server variables */
   NULL,                                        /* Log message */
-  NULL,                                        /* Block interruptions */
-  NULL,                                        /* Unblock interruptions */
 
   STANDARD_SAPI_MODULE_PROPERTIES
 };

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index be2ead961303ff00e11a0ba0c166e398b7ca0064..ba0b9e226e68488bcedc5342aac4f6a65cdf2dc6 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -244,9 +244,6 @@ static sapi_module_struct servlet_sapi_module = {
        NULL,                                                   /* register server variables */
        NULL,                                                   /* Log message */
 
-       NULL,                                                   /* Block interruptions */
-       NULL,                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c
index 0c0384de251911da9d6313b41a18d8c40d98aad3..e76f8ae32b242ee84d7974ec46f308c1ad68d1d6 100644 (file)
--- a/sapi/tux/php_tux.c
+++ b/sapi/tux/php_tux.c
@@ -288,9 +288,6 @@ static sapi_module_struct tux_sapi_module = {
        sapi_tux_register_variables,
        NULL,                                                                   /* Log message */
 
-       NULL,                                                                   /* Block interruptions */
-       NULL,                                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 

diff --git a/sapi/webjames/webjames.c b/sapi/webjames/webjames.c
index 9d2f25013aecdf130738167ba67569225271687b..a5c47f6401a3c20aa65c950597cae88f4a76d89a 100644 (file)
--- a/sapi/webjames/webjames.c
+++ b/sapi/webjames/webjames.c
@@ -278,9 +278,6 @@ static sapi_module_struct sapi_module = {
        sapi_webjames_register_variables,       /* register server variables */
        NULL,                                                                   /* Log message */
 
-       NULL,                                                                   /* Block interruptions */
-       NULL,                                                                   /* Unblock interruptions */
-
        STANDARD_SAPI_MODULE_PROPERTIES
 };