com php-src: Cleanup: phpdbg.c phpdbg_win.h
| From: | Bob Weinand | Date: | Sun, 16 Mar 2014 19:04:08 +0000 |
| Subject: | com php-src: Cleanup: phpdbg.c phpdbg_win.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77021@lists.php.net to get a copy of this message | ||
Commit: 98025a40b8b0a791b75fa6b330ed8d54c92da31c
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 16 Mar 2014 20:04:08 +0100
Parents: 3fcdd6ab0f8537d49019cbd01809c6a40a869f37
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=98025a40b8b0a791b75fa6b330ed8d54c92da31c
Log:
Cleanup
Changed paths:
M phpdbg.c
M phpdbg_win.h
Diff:
diff --git a/phpdbg.c b/phpdbg.c
index af3b75c..12611e3 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 da97c79..68c3052 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