diff options
| author | Antony Dovgal <tony2001@php.net> | 2009-12-04 11:52:46 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2009-12-04 11:52:46 +0000 |
| commit | d1cb54864985ea802cc2e81694c0d190c9b45fd0 (patch) | |
| tree | d6af28c3b731c18f05b982185fcdc71255785a1c | |
| parent | 719b45a9319a91556a7eb0c5e35de22d42ca9f4f (diff) | |
| download | php-git-d1cb54864985ea802cc2e81694c0d190c9b45fd0.tar.gz | |
now this thing really works!
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 82ef4e7bde..024ac14c13 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1774,6 +1774,15 @@ consult the installation file that came with this distribution, or visit \n\ 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 { |