tony2001 Fri, 04 Dec 2009 11:52:46 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291701
Log:
now this thing really works!
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c 2009-12-04
11:52:28 UTC (rev 291700)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c 2009-12-04
11:52:46 UTC (rev 291701)
@@ -1774,6 +1774,15 @@
fpm_request_info();
+ /* request startup only after we've done all we can to
+ * get path_translated */
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
+ fcgi_finish_request(&request, 1);
+ SG(server_context) = NULL;
+ php_module_shutdown(TSRMLS_C);
+ return FAILURE;
+ }
+
if (SG(request_info).path_translated) {
if (php_fopen_primary_script(&file_handle
TSRMLS_CC) == FAILURE) {
zend_try {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
