- Fixed crash when using -e option

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 6df89d60457942d69227ae05c5572d574dd04169..ced0875913756cc7c5e78003cb7a14ac8be74511 100644 (file)
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1569,7 +1569,7 @@ static zend_module_entry cgi_module_entry = {
 int main(int argc, char *argv[])
 {
        int exit_status = SUCCESS;
-       int cgi = 0, c;
+       int cgi = 0, c, use_extended_info = 0;
        zend_file_handle file_handle;
 
        /* temporary locals */
@@ -1678,7 +1678,7 @@ int main(int argc, char *argv[])
                                break;
 
                        case 'e': /* enable extended info output */
-                               CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
+                               use_extended_info = 1;
                                break;
 
                        case 't': 
@@ -1781,6 +1781,10 @@ int main(int argc, char *argv[])
 #endif
                return FAILURE;
        }
+       
+       if (use_extended_info) {
+               CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
+       }
 
        /* check force_cgi after startup, so we have proper output */
        if (cgi && CGIG(force_redirect)) {