]> granicus.if.org Git - php/commitdiff
fix list not working when exec is set but not executing
authorkrakjoe <joe.watkins@live.co.uk>
Sun, 17 Nov 2013 15:57:49 +0000 (15:57 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Sun, 17 Nov 2013 15:57:49 +0000 (15:57 +0000)
phpdbg_list.c
test.php

index 35de246ad0485d5a0f5adca4b284539a392c90d0..0770babc97fa05c3ec40ec6641ced2f3e22e926a 100644 (file)
@@ -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;
        }
index 3733eda7e2f72c606990df185e0518655446da79..02c58b50da63362e0f286d311a54887b51b9e625 100644 (file)
--- a/test.php
+++ b/test.php
@@ -1,4 +1,6 @@
 <?php
+include 'web-bootstrap.php'; 
+
 class phpdbg {
     public function isGreat($greeting = null) {
         printf(