diff options
| author | David Soria Parra <dsp@php.net> | 2009-06-09 13:29:39 +0000 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2009-06-09 13:29:39 +0000 |
| commit | c52581d95e85028c99101387a0f3fd586ece4101 (patch) | |
| tree | a6375d5d0ef46751cb457adc08ed3499ccd83a0f | |
| parent | 8d699be646833c776f19ab418c4a3a9591c41302 (diff) | |
| download | php-git-c52581d95e85028c99101387a0f3fd586ece4101.tar.gz | |
Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for non apache).
The fix was provided by Sriram Natarajan.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -34,6 +34,8 @@ (Nuno, Scott) - Fixed bug #42143 (The constant NAN is reported as 0 on Windows) (Kanwaljeet Singla, Venkat Raman Don) +- Fixed bug #47042 (cgi sapi is incorrectly removing SCRIPT_FILENAME). + (Sriram Natarajan, David Soria Parra) 27 May 2009, PHP 5.2.10RC1 diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 8bcc46b96e..dff71ec5d4 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -964,7 +964,8 @@ static void init_request_info(TSRMLS_D) } if (env_path_translated != NULL && env_redirect_url != NULL && - orig_script_filename != NULL && script_path_translated != NULL) { + env_path_translated != script_path_translated && + strcmp(env_path_translated, script_path_translated) != 0) { /* pretty much apache specific. If we have a redirect_url then our script_filename and script_name point to the |