[PHP-CVS] com php-src: fix crash on clean: phpdbg.c

[Bob Weinand]

Commit:    801a575c47f825a8eb116b6cb6035225371d5829
Author:    krakjoe <joe.watk...@live.co.uk>         Thu, 14 Nov 2013 11:30:31 
+0000
Parents:   dcb6906bc4df5a3f7f86f1e72c107671a7bc32c1
Branches:  PHP-5.6

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=801a575c47f825a8eb116b6cb6035225371d5829

Log:
fix crash on clean

Changed paths:
  M  phpdbg.c


Diff:
diff --git a/phpdbg.c b/phpdbg.c
index 841eeda..35b1075 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -476,10 +476,6 @@ phpdbg_main:
                        zend_activate_modules(TSRMLS_C);
                } zend_end_try();
 
-               zend_try {
-                   zend_activate_auto_globals(TSRMLS_C);
-               } zend_end_try();
-
         /* print blurb */
                phpdbg_welcome(cleaning TSRMLS_CC);
 
@@ -517,7 +513,9 @@ phpdbg_main:
                } zend_end_try();
 #endif
 
-               php_module_shutdown(TSRMLS_C);
+               zend_try {
+                   php_module_shutdown(TSRMLS_C);
+               } zend_end_try();
 
                sapi_shutdown();
        }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php