From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 20 Nov 2013 18:52:42 +0000 (-0200)
Subject: Merge branch 'master' of github.com:krakjoe/phpdbg
X-Git-Tag: php-5.6.0alpha1~110^2~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ba9abfa2aec0b679758879ab15eee801317dd44;p=php

Merge branch 'master' of github.com:krakjoe/phpdbg
---

9ba9abfa2aec0b679758879ab15eee801317dd44
diff --cc phpdbg_prompt.c
index 37cdfe9df7,a800e46247..aaba7971f5
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -485,10 -485,10 +485,10 @@@ out
  
  PHPDBG_COMMAND(eval) /* {{{ */
  {
- 	zend_bool stepping = (PHPDBG_G(flags) & PHPDBG_IS_STEPPING);
+ 	zend_bool stepping = ((PHPDBG_G(flags) & PHPDBG_IS_STEPPING)==PHPDBG_IS_STEPPING);
  	zval retval;
  	char *code = NULL;
 -	
 +
  	if (!(PHPDBG_G(flags) & PHPDBG_IS_STEPONEVAL)) {
  		PHPDBG_G(flags) &= ~ PHPDBG_IS_STEPPING;
  	}
@@@ -1210,9 -1210,10 +1210,10 @@@ zend_vm_enter
  	} while(!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING));\
  } while(0)
  
 -		/* allow conditional breakpoints and 
 +		/* allow conditional breakpoints and
  			initialization to access the vm uninterrupted */
- 		if (PHPDBG_G(flags) & PHPDBG_IN_COND_BP|PHPDBG_IS_INITIALIZING) {
+ 		if ((PHPDBG_G(flags) & PHPDBG_IN_COND_BP) ||
+ 			(PHPDBG_G(flags) & PHPDBG_IS_INITIALIZING)) {
  			/* skip possible breakpoints */
  			goto next;
  		}