Merge branch 'xdebug_2_1'

eloraburns · Feb 2, 2012 · 004b99c · 004b99c
2 parents b9af949 + 52eb81b
commit 004b99c
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/xdebug_handler_dbgp.c b/xdebug_handler_dbgp.c
@@ -1250,6 +1250,10 @@ static int xdebug_do_eval(char *eval_string, zval *ret_zval TSRMLS_DC)
 	zend_op_array     *original_active_op_array = EG(active_op_array);
 	zend_execute_data *original_execute_data = EG(current_execute_data);
 	int                original_no_extensions = EG(no_extensions);
+#if PHP_VERSION_ID >= 50300
+	void             **original_argument_stack_top = EG(argument_stack)->top;
+	void             **original_argument_stack_end = EG(argument_stack)->end;
+#endif
 
 	/* Remember error reporting level */
 	old_error_reporting = EG(error_reporting);
@@ -1271,6 +1275,10 @@ static int xdebug_do_eval(char *eval_string, zval *ret_zval TSRMLS_DC)
 	EG(active_op_array) = original_active_op_array;
 	EG(current_execute_data) = original_execute_data;
 	EG(no_extensions) = original_no_extensions;
+#if PHP_VERSION_ID >= 50300
+	EG(argument_stack)->top = original_argument_stack_top;
+	EG(argument_stack)->end = original_argument_stack_end;
+#endif
 
 	return res;
 }