Merge branch 'xdebug_3_4'

Author: derickr

src/base/base.c

@@ -733,7 +733,7 @@ static void xdebug_execute_user_code_begin(zend_execute_data *execute_data)
 		EX(opline) = EX(func)->op_array.opcodes;
 	}
 
-	if (XG_BASE(in_execution) && XDEBUG_VECTOR_COUNT(XG_BASE(stack)) == 0) {
+	if (XG_BASE(in_execution) && XDEBUG_VECTOR_COUNT(XG_BASE(stack)) == 0 && ((EG(flags) & EG_FLAGS_IN_SHUTDOWN) == 0)) {
 		if (XDEBUG_MODE_IS(XDEBUG_MODE_STEP_DEBUG)) {
 			xdebug_debugger_set_program_name(op_array->filename);
 			xdebug_debug_init_if_requested_at_startup();

tests/debugger/bug02322.phpt

@@ -0,0 +1,32 @@
+--TEST--
+Test for bug #2322: Xdebug tries to open debugging connection in destructors during shutdown
+--SKIPIF--
+<?php
+require __DIR__ . '/../utils.inc';
+check_reqs('dbgp');
+?>
+--INI--
+xdebug.mode=debug
+xdebug.start_with_request=yes
+xdebug.log=
+--FILE--
+<?php
+class Testing
+{
+	function __destruct() {
+		echo "Destruct\n";
+	}
+}
+
+$t = array();
+for ($i=0; $i<5; $i++) {
+	$t[] = new Testing();
+}
+?>
+--EXPECTF--
+Xdebug: [Step Debug] %sdebugging client%s
+Destruct
+Destruct
+Destruct
+Destruct
+Destruct