- Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is.

This commit is contained in:
foobar 2002-11-26 05:57:06 +00:00
parent 95b4045f48
commit dd53efc196
18 changed files with 8 additions and 52 deletions

View file

@ -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 */

View file

@ -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
};

View file

@ -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
};

View file

@ -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
};

View file

@ -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
};
/* }}} */

View file

@ -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
};

View file

@ -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
};
/* }}} */

View file

@ -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
};
/* }}} */

View file

@ -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
};
/* }}} */

View file

@ -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
};

View file

@ -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
};

View file

@ -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
};

View file

@ -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
};

View file

@ -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
};

View file

@ -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
};

View file

@ -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
};

View file

@ -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
};

View file

@ -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
};