]> granicus.if.org Git - php/commitdiff
always unset unclean_shutdown
authorkrakjoe <joe.watkins@live.co.uk>
Fri, 29 Nov 2013 02:42:34 +0000 (02:42 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Fri, 29 Nov 2013 02:42:34 +0000 (02:42 +0000)
phpdbg.c

index 6ae03471fa7be8514cc4b9454bce5f8207374fc2..f04d69413cca87a5d1b9f24ffbbd65cebf25ae95 100644 (file)
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -1046,9 +1046,10 @@ phpdbg_interact:
                                        /* set streams */
                                        if (streams[0] && streams[1]) {
                                                PHPDBG_G(flags) &= ~PHPDBG_IS_QUITTING;
-                                               
-                                               CG(unclean_shutdown) = 0;
                                        }
+                                       
+                                       /* this must be forced */
+                                       CG(unclean_shutdown) = 0;
                                }
 #endif
                                if (PHPDBG_G(flags) & PHPDBG_IS_QUITTING) {
@@ -1057,6 +1058,9 @@ phpdbg_interact:
                        } zend_end_try();
                } while(!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING));
                
+               /* this must be forced */
+               CG(unclean_shutdown) = 0;
+               
 phpdbg_out:
 #ifndef _WIN32
                if (PHPDBG_G(flags) & PHPDBG_IS_DISCONNECTED) {