From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 16 Mar 2014 19:04:08 +0000 (+0100)
Subject: Cleanup
X-Git-Tag: php-5.6.0beta2~1^2~37^2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98025a40b8b0a791b75fa6b330ed8d54c92da31c;p=php

Cleanup
---

diff --git a/phpdbg.c b/phpdbg.c
index af3b75c95e..12611e3ebe 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -1336,6 +1336,11 @@ phpdbg_out:
 		}
 #endif
 
+#ifdef _WIN32
+	} __except(phpdbg_exception_handler_win32(xp = GetExceptionInformation())) {
+		phpdbg_error("Access violation (Segementation fault) encountered\ntrying to abort cleanly...");
+	}
+#endif
 #ifndef ZTS
 		/* force cleanup of auto and core globals */
 		zend_hash_clean(CG(auto_globals));
@@ -1373,11 +1378,7 @@ phpdbg_out:
 		} zend_end_try();
 
 		sapi_shutdown();
-#ifdef _WIN32
-	} __except(phpdbg_exception_handler_win32(xp = GetExceptionInformation())) {
-		// if !EXCEPTION_CONTINUE_EXECUTION
-	}
-	#endif
+
 	}
 
 	if (cleaning || remote) {
diff --git a/phpdbg_win.h b/phpdbg_win.h
index da97c797b1..68c3052790 100644
--- a/phpdbg_win.h
+++ b/phpdbg_win.h
@@ -34,6 +34,4 @@ void phpdbg_win_set_mm_heap(zend_mm_heap *heap);
 
 int phpdbg_exception_handler_win32(EXCEPTION_POINTERS *xp);
 
-int __stdcall phpdbg_watch_set_segv_handler_asm();
-
 #endif
\ No newline at end of file