diff options
| author | Zeev Suraski <zeev@php.net> | 2000-02-10 17:26:57 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-02-10 17:26:57 +0000 |
| commit | 7d926a0e0c0862b4469200b5ebb7cc85c263b2dc (patch) | |
| tree | 01b0f0522ad4a4e3b2929e03b9985b3bfa57fc76 /sapi | |
| parent | ec0e2d7312ba5e55bb4ffb2f35b72e19a48ee89a (diff) | |
| download | php-git-7d926a0e0c0862b4469200b5ebb7cc85c263b2dc.tar.gz | |
More cleanup...
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/aolserver/aolserver.c | 1 | ||||
| -rw-r--r-- | sapi/apache/mod_php4.c | 7 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
| -rw-r--r-- | sapi/isapi/php4isapi.c | 1 | ||||
| -rw-r--r-- | sapi/phttpd/phttpd.c | 1 | ||||
| -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, 15 insertions, 0 deletions
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index 7ba56d4e68..d1b5dc86d8 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -302,6 +302,7 @@ static sapi_module_struct sapi_module = { php_ns_sapi_ub_write, /* unbuffered write */ NULL, /* flush */ + NULL, /* get uid */ php_error, /* error handler */ diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 5d05e01f52..edf848dd6a 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -300,6 +300,12 @@ static int php_apache_sapi_activate(SLS_D) } +static int php_apache_get_uid(SLS_D) +{ + return ((request_rec *) SG(server_context))->finfo.st_uid; +} + + static sapi_module_struct sapi_module = { "Apache", /* name */ @@ -311,6 +317,7 @@ static sapi_module_struct sapi_module = { sapi_apache_ub_write, /* unbuffered write */ sapi_apache_flush, /* flush */ + php_apache_get_uid, /* get uid */ php_error, /* error handler */ diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index c036b8c2f1..bf6138cd3c 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -176,6 +176,7 @@ static int sapi_cgi_deactivate(SLS_D) } + static sapi_module_struct sapi_module = { "CGI", /* name */ @@ -187,6 +188,7 @@ static sapi_module_struct sapi_module = { sapi_cgibin_ub_write, /* unbuffered write */ sapi_cgibin_flush, /* flush */ + NULL, /* get uid */ php_error, /* error handler */ diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c index 9ef51cbb1f..8c4ff5c695 100644 --- a/sapi/isapi/php4isapi.c +++ b/sapi/isapi/php4isapi.c @@ -350,6 +350,7 @@ static sapi_module_struct sapi_module = { sapi_isapi_ub_write, /* unbuffered write */ NULL, /* flush */ + NULL, /* get uid */ php_error, /* error handler */ diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c index 7c98cd70a3..76184a7e7a 100644 --- a/sapi/phttpd/phttpd.c +++ b/sapi/phttpd/phttpd.c @@ -172,6 +172,7 @@ static sapi_module_struct sapi_module = { php_phttpd_sapi_ub_write, /* unbuffered write */ NULL, /* flush */ + NULL, /* get uid */ php_error, /* error handler */ diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index cff4324f9d..1d4f920e44 100644 --- a/sapi/roxen/roxen.c +++ b/sapi/roxen/roxen.c @@ -526,6 +526,7 @@ static sapi_module_struct sapi_module = { php_roxen_sapi_ub_write, /* unbuffered write */ NULL, /* flush */ + NULL, /* get uid */ php_error, /* error handler */ diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index 645528b86c..4ba10f9d13 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -221,6 +221,7 @@ static sapi_module_struct sapi_module = { sapi_servlet_ub_write, /* unbuffered write */ NULL, /* flush */ + NULL, /* get uid */ php_error, /* error handler */ diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c index 2a39f189a4..4fab0c2abf 100644 --- a/sapi/thttpd/thttpd.c +++ b/sapi/thttpd/thttpd.c @@ -112,6 +112,7 @@ static sapi_module_struct sapi_module = { sapi_thttpd_ub_write, NULL, + NULL, /* get uid */ php_error, |