pajoye Mon, 19 Oct 2009 17:04:44 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289757
Log: - Merge: 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_1/ _U php/php-src/branches/PHP_5_3_1/ext/mysql/ _U php/php-src/branches/PHP_5_3_1/ext/mysqli/ _U php/php-src/branches/PHP_5_3_1/ext/mysqlnd/ _U php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/ _U php/php-src/branches/PHP_5_3_1/ext/tidy/tests/ U php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c _U php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_1 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289752 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289706,289752 /php/php-src/trunk:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289752 /php/php-src/trunk/ext/mysql:284726 + /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289612,289621-289624,289666,289706,289752 /php/php-src/trunk/ext/mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289752 /php/php-src/trunk/ext/mysqli:284726 + /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289706,289752 /php/php-src/trunk/ext/mysqli:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289752 /php/php-src/trunk/ext/mysqlnd:284726 + /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289612,289621-289624,289666,289706,289752 /php/php-src/trunk/ext/mysqlnd:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289752 /php/php-src/trunk/ext/pdo_mysql:284726 + /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289612,289621-289624,289666,289706,289752 /php/php-src/trunk/ext/pdo_mysql:284726 Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289752 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:288351,289341,289612,289621-289624,289666-289667,289706,289752 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Modified: php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c =================================================================== --- php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-19 16:59:40 UTC (rev 289756) +++ php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c 2009-10-19 17:04:44 UTC (rev 289757) @@ -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; Property changes on: php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289752 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:288351,289341,289612,289621-289624,289666-289667,289706,289752 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
