diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/aolserver/aolserver.c | 1 | ||||
| -rw-r--r-- | sapi/apache/mod_php4.c | 10 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 1 | ||||
| -rw-r--r-- | sapi/isapi/php4isapi.c | 1 | ||||
| -rw-r--r-- | sapi/phttpd/phttpd.c | 3 | ||||
| -rw-r--r-- | sapi/roxen/roxen.c | 1 | ||||
| -rw-r--r-- | sapi/servlet/servlet.c | 1 | ||||
| -rw-r--r-- | sapi/thttpd/thttpd.c | 1 |
8 files changed, 17 insertions, 2 deletions
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index d1b5dc86d8..a7d200754e 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -303,6 +303,7 @@ static sapi_module_struct sapi_module = { php_ns_sapi_ub_write, /* unbuffered write */ NULL, /* flush */ NULL, /* get uid */ + NULL, /* getenv */ php_error, /* error handler */ diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index edf848dd6a..7a9cb0ee94 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -306,6 +306,14 @@ static int php_apache_get_uid(SLS_D) } +static char *php_apache_getenv(char *name, int name_len SLS_DC) +{ + char *value; + + return (char *) table_get(((request_rec *) SG(server_context))->subprocess_env, name)); +} + + static sapi_module_struct sapi_module = { "Apache", /* name */ @@ -318,7 +326,7 @@ static sapi_module_struct sapi_module = { sapi_apache_ub_write, /* unbuffered write */ sapi_apache_flush, /* flush */ php_apache_get_uid, /* get uid */ - + php_apache_getenv, /* getenv */ php_error, /* error handler */ diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index bf6138cd3c..db0c5cda52 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -189,6 +189,7 @@ static sapi_module_struct sapi_module = { sapi_cgibin_ub_write, /* unbuffered write */ sapi_cgibin_flush, /* flush */ NULL, /* get uid */ + NULL, /* getenv */ php_error, /* error handler */ diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c index 8c4ff5c695..9f71738211 100644 --- a/sapi/isapi/php4isapi.c +++ b/sapi/isapi/php4isapi.c @@ -351,6 +351,7 @@ static sapi_module_struct sapi_module = { sapi_isapi_ub_write, /* unbuffered write */ NULL, /* flush */ NULL, /* get uid */ + NULL, /* getenv */ php_error, /* error handler */ diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c index 76184a7e7a..194cf9ebf5 100644 --- a/sapi/phttpd/phttpd.c +++ b/sapi/phttpd/phttpd.c @@ -173,7 +173,8 @@ static sapi_module_struct sapi_module = { php_phttpd_sapi_ub_write, /* unbuffered write */ NULL, /* flush */ NULL, /* get uid */ - + NULL, /* getenv */ + php_error, /* error handler */ php_phttpd_sapi_header_handler, /* header handler */ diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index 1d4f920e44..0b87ed855e 100644 --- a/sapi/roxen/roxen.c +++ b/sapi/roxen/roxen.c @@ -527,6 +527,7 @@ static sapi_module_struct sapi_module = { php_roxen_sapi_ub_write, /* unbuffered write */ NULL, /* flush */ NULL, /* get uid */ + NULL, /* getenv */ php_error, /* error handler */ diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index 4ba10f9d13..bc80e0f3be 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -222,6 +222,7 @@ static sapi_module_struct sapi_module = { sapi_servlet_ub_write, /* unbuffered write */ NULL, /* flush */ NULL, /* get uid */ + NULL, /* getenv */ php_error, /* error handler */ diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c index 4fab0c2abf..236439e4e3 100644 --- a/sapi/thttpd/thttpd.c +++ b/sapi/thttpd/thttpd.c @@ -113,6 +113,7 @@ static sapi_module_struct sapi_module = { sapi_thttpd_ub_write, NULL, NULL, /* get uid */ + NULL, /* getenv */ php_error, |