From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 17 Nov 2013 15:57:49 +0000 (+0000)
Subject: fix list not working when exec is set but not executing
X-Git-Tag: php-5.6.0alpha1~110^2~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0151e91a5b315ceb607c84518fad94eecef866d;p=php

fix list not working when exec is set but not executing
---

diff --git a/phpdbg_list.c b/phpdbg_list.c
index 35de246ad0..0770babc97 100644
--- a/phpdbg_list.c
+++ b/phpdbg_list.c
@@ -33,7 +33,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
 
 PHPDBG_LIST(lines) /* {{{ */
 {
-	if (!PHPDBG_G(exec) || !zend_is_executing(TSRMLS_C)) {
+	if (!PHPDBG_G(exec) && !zend_is_executing(TSRMLS_C)) {
 		phpdbg_error("Not executing, and execution context not set");
 		return SUCCESS;
 	}
diff --git a/test.php b/test.php
index 3733eda7e2..02c58b50da 100644
--- a/test.php
+++ b/test.php
@@ -1,4 +1,6 @@
 <?php
+include 'web-bootstrap.php'; 
+
 class phpdbg {
     public function isGreat($greeting = null) {
         printf(