diff options
| author | Xinchen Hui <laruence@php.net> | 2015-05-26 16:24:39 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-05-26 16:24:39 +0800 |
| commit | 1f077cc4f4c0ceef0c86591d4fc4469818adc7d2 (patch) | |
| tree | d4c83ea79f9cf7d935918f2fbe01ea70e518f274 | |
| parent | c630779648a3fd34d684e230527059403b06464c (diff) | |
| parent | 76a290d0be25a028f968edff074c9d8b6c673dba (diff) | |
| download | php-git-1f077cc4f4c0ceef0c86591d4fc4469818adc7d2.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index c217d7af44..8b1503d6f0 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1889,11 +1889,11 @@ consult the installation file that came with this distribution, or visit \n\ zend_first_try { while (fcgi_accept_request(&request) >= 0) { + char *primary_script = NULL; request_body_fd = -1; SG(server_context) = (void *) &request; init_request_info(TSRMLS_C); CG(interactive) = 0; - char *primary_script = NULL; fpm_request_info(); |