]> granicus.if.org Git - php/commitdiff
show conditionals
authorkrakjoe <joe.watkins@live.co.uk>
Wed, 13 Nov 2013 14:50:13 +0000 (14:50 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Wed, 13 Nov 2013 14:50:13 +0000 (14:50 +0000)
phpdbg_prompt.c
tutorials/show-conditionals.png [new file with mode: 0644]

index d4af16586f351ef719d1561eebeb59b311ebd3ab..a3d95d4a22c4e312ac99e2e2deea8c9a9163bf3b 100644 (file)
@@ -698,12 +698,13 @@ zend_vm_enter:
     }\
 } while(!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING))
 
-        phpdbg_print_opline(
-                   execute_data, 0 TSRMLS_CC);
-
         /* allow conditional breakpoints to access the vm uninterrupted */
         if (!(PHPDBG_G(flags) & PHPDBG_IN_COND_BP)) {
             
+            /* not while in conditionals */
+            phpdbg_print_opline(
+                       execute_data, 0 TSRMLS_CC);
+            
             /* conditions cannot be executed by eval()'d code */
             if (!(PHPDBG_G(flags) & PHPDBG_IN_EVAL) 
                 && (PHPDBG_G(flags) & PHPDBG_HAS_COND_BP)
diff --git a/tutorials/show-conditionals.png b/tutorials/show-conditionals.png
new file mode 100644 (file)
index 0000000..1decbcc
Binary files /dev/null and b/tutorials/show-conditionals.png differ