diff options
| author | Zeev Suraski <zeev@php.net> | 2000-02-10 19:41:21 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-02-10 19:41:21 +0000 |
| commit | 6d0ab6166cc1a4eca90211cdfa0ca144704ad677 (patch) | |
| tree | ee2b2758afeb47bf3a9648c0067d9b747b91e5b2 /sapi/cgi/cgi_main.c | |
| parent | 9709f7ec73557e0a1a85ad3fbc4c73806de50620 (diff) | |
| download | php-git-6d0ab6166cc1a4eca90211cdfa0ca144704ad677.tar.gz | |
SAPIfication, Episode VI: Return of the SAPI
Remove mostly all references to APACHE and CGI_BINARY from the code.
- Apache include files are no longer included by any PHP code, except for the Apache SAPI module.
- No server specific code is in any of the base PHP code.
Still left to be done:
- Eliminate any references to APACHE from the few remaining modules.
- Move request_info.c's logic to SAPI
- Modify the regex function names, and globals, so that we can always
include them, without having to fear any interference with Apache;
Always use the bundled regex library
Diffstat (limited to 'sapi/cgi/cgi_main.c')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index af4bf9da1c..b764bfaa02 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -25,8 +25,6 @@ #include "SAPI.h" -#if CGI_BINARY - #include <stdio.h> #include "php.h" #ifdef MSVC5 @@ -138,7 +136,7 @@ static void sapi_cgi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS char *val; int l=0; - sn = request_info.script_name; + sn = getenv("SCRIPT_NAME"); pi = SG(request_info).request_uri; if (sn) l += strlen(sn); @@ -574,5 +572,3 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine return SUCCESS; } - -#endif |