stas                                     Fri, 16 Oct 2009 23:34:31 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=289706

Log:
improve fix for #49767 and #47627 - make PHP report
"no script" on 404 again

Bugs: http://bugs.php.net/49767 (Closed) estrdup crash
      http://bugs.php.net/47627 (Bogus) "No input file specified" causing crash
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
    U   php/php-src/trunk/sapi/cgi/cgi_main.c

Modified: php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c    2009-10-16 23:01:57 UTC 
(rev 289705)
+++ php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c    2009-10-16 23:34:31 UTC 
(rev 289706)
@@ -2038,7 +2038,7 @@
                                1. we are running from shell and got filename 
was there
                                2. we are running as cgi or fastcgi
                        */
-                       if (cgi || SG(request_info).path_translated) {
+                       if (cgi || fastcgi || SG(request_info).path_translated) 
{
                                if (php_fopen_primary_script(&file_handle 
TSRMLS_CC) == FAILURE) {
                                        if (errno == EACCES) {
                                                
SG(sapi_headers).http_response_code = 403;

Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===================================================================
--- php/php-src/trunk/sapi/cgi/cgi_main.c       2009-10-16 23:01:57 UTC (rev 
289705)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c       2009-10-16 23:34:31 UTC (rev 
289706)
@@ -2031,7 +2031,7 @@
                                1. we are running from shell and got filename 
was there
                                2. we are running as cgi or fastcgi
                        */
-                       if (cgi || SG(request_info).path_translated) {
+                       if (cgi || fastcgi || SG(request_info).path_translated) 
{
                                if (php_fopen_primary_script(&file_handle 
TSRMLS_CC) == FAILURE) {
                                        if (errno == EACCES) {
                                                
SG(sapi_headers).http_response_code = 403;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to