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

bwoebi · bwoebi · commit 3043bd285cbb · 2013-12-18T11:08:32.000+01:00
diff --git a/phpdbg_bp.c b/phpdbg_bp.c
@@ -1024,7 +1024,7 @@ static inline phpdbg_breakbase_t *phpdbg_find_conditional_breakpoint(zend_execut
 		zend_try {
 			PHPDBG_G(flags) |= PHPDBG_IN_COND_BP;
 			zend_execute(EG(active_op_array) TSRMLS_CC);
-			if (i_zend_is_true(retval)) {
+			if (i_zend_is_true(retval TSRMLS_CC)) {
 				breakpoint = SUCCESS;
 			}
 		} zend_catch {

Original file line number	Diff line number	Diff line change
`@@ -1024,7 +1024,7 @@ static inline phpdbg_breakbase_t *phpdbg_find_conditional_breakpoint(zend_execut`
`1024`	`1024`	`zend_try {`
`1025`	`1025`	`PHPDBG_G(flags) \|= PHPDBG_IN_COND_BP;`
`1026`	`1026`	`zend_execute(EG(active_op_array) TSRMLS_CC);`
`1027`		`- if (i_zend_is_true(retval)) {`
	`1027`	`+ if (i_zend_is_true(retval TSRMLS_CC)) {`
`1028`	`1028`	`breakpoint = SUCCESS;`
`1029`	`1029`	`}`
`1030`	`1030`	`} zend_catch {`