com php-src: always unset unclean_shutdown: phpdbg.c
| From: | Bob Weinand | Date: | Fri, 29 Nov 2013 02:42:34 +0000 |
| Subject: | com php-src: always unset unclean_shutdown: phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74548@lists.php.net to get a copy of this message | ||
Commit: f822764129e148bcca00a354b9ad68eea598b834
Author: krakjoe <joe.watkins@live.co.uk> Fri, 29 Nov 2013 02:42:34 +0000
Parents: 734fe5508a96868a3e6c03c323f5fb436dc91aa0
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f822764129e148bcca00a354b9ad68eea598b834
Log:
always unset unclean_shutdown
Changed paths:
M phpdbg.c
Diff:
diff --git a/phpdbg.c b/phpdbg..c
index 6ae0347..f04d694 100644
--- 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) {