tony2001 Fri, 30 Apr 2010 08:20:57 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=298795
Log: merge the fix for #51688 Bug: http://bugs.php.net/51688 (Closed) php_cgi_ini_activate_user_config() crashes when given apache-rewritten URL Changed paths: U php/php-src/trunk/sapi/fpm/fpm/fpm_main.c Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c =================================================================== --- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-04-30 08:15:09 UTC (rev 298794) +++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-04-30 08:20:57 UTC (rev 298795) @@ -753,6 +753,9 @@ if (!IS_ABSOLUTE_PATH(path, path_len)) { real_path = tsrm_realpath(path, NULL TSRMLS_CC); + if (real_path == NULL) { + return; + } real_path_len = strlen(real_path); path = real_path; path_len = real_path_len;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
