From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 10 Nov 2013 21:39:07 +0000 (-0200)
Subject: Merge branch 'master' of github.com:krakjoe/phpdbg
X-Git-Tag: php-5.6.0alpha1~110^2~503^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=816925c7da8c6ab2007d49644c878ebc02d278e7;p=php

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

816925c7da8c6ab2007d49644c878ebc02d278e7
diff --cc phpdbg_prompt.c
index d064d2dd37,684e88c64b..de28d8f559
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -381,23 -390,23 +389,23 @@@ zend_vm_enter
  			}
  		}
  
-         if (PHPDBG_G(has_sym_bp)) {
+         if (PHPDBG_G(has_sym_bp) && execute_data->opline->opcode != ZEND_RETURN) {
              zend_execute_data *previous = execute_data->prev_execute_data;
 -            if (previous && (previous != execute_data)) {
 -                if (previous->opline) {
 -                    if (previous->opline->opcode == ZEND_DO_FCALL || previous->opline->opcode == ZEND_DO_FCALL_BY_NAME) {
 -                        if (phpdbg_find_breakpoint_symbol(previous->function_state.function TSRMLS_CC) == SUCCESS) {
 -                            while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
 -				                continue;
 -			                }
 -                        }
 -                    }
 -                }
 -            }
 +            if (previous && previous != execute_data && previous->opline) {
 +				if (previous->opline->opcode == ZEND_DO_FCALL
 +					|| previous->opline->opcode == ZEND_DO_FCALL_BY_NAME) {
 +					if (phpdbg_find_breakpoint_symbol(
 +						previous->function_state.function TSRMLS_CC) == SUCCESS) {
 +						while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
 +							continue;
 +						}
 +					}
 +				}
 +			}
          }
 -		
 +
  		PHPDBG_G(vmret) = execute_data->opline->handler(execute_data TSRMLS_CC);
 -		
 +
  		phpdbg_print_opline(
  		    execute_data TSRMLS_CC);