cvs: php4 /sapi/isapi php4isapi.c

shane Sun Jan 7 15:45:27 2001 EDT Modified files: /php4/sapi/isapi php4isapi.c Log: define flag to turn off exception handling Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.63 php4/sapi/isapi/php4isapi.c:1.64 --- php4/sapi/isapi/php4isapi.c:1.63 Tue Jan 2 14:49:29 2001 +++ php4/sapi/isapi/php4isapi.c Sun Jan 7 15:45:24 2001 @@ -43,6 +43,16 @@ # define GetLastError() errno #endif +/* +uncomment the following lines to turn off +exception trapping when running under a debugger + + +#ifdef _DEBUG +#define NO_EXCEPTION_HANDLERS +#endif +*/ + #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION") #define ISAPI_SERVER_VAR_BUF_SIZE 1024 #define ISAPI_POST_DATA_BUF 1024 @@ -425,8 +435,11 @@ && atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])) { /* Register SSL ISAPI variables */ sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB, track_vars_array, NULL ELS_CC PLS_CC); + } + + if (isapi_special_server_variables[SPECIAL_VAR_HTTPS]) { + efree(isapi_special_server_variables[SPECIAL_VAR_HTTPS]); } - efree(isapi_special_server_variables[SPECIAL_VAR_HTTPS]); #ifdef WITH_ZEUS @@ -624,7 +637,7 @@ CLS_FETCH(); ELS_FETCH(); PLS_FETCH(); -#ifdef PHP_WIN32 +#if !defined (NO_EXCEPTION_HANDLERS) && defined(PHP_WIN32) LPEXCEPTION_POINTERS e; #endif @@ -633,7 +646,9 @@ return HSE_STATUS_ERROR; } +#if !defined (NO_EXCEPTION_HANDLERS) __try { +#endif init_request_info(sapi_globals, lpECB); SG(server_context) = lpECB; @@ -647,6 +662,7 @@ if (SG(request_info).cookie_data) { efree(SG(request_info).cookie_data); } +#if !defined (NO_EXCEPTION_HANDLERS) #ifdef PHP_WIN32 } __except(exceptionhandler(&e,GetExceptionInformation())) { #else @@ -700,6 +716,9 @@ } __except(EXCEPTION_EXECUTE_HANDLER) { my_endthread(); } +#else + php_request_shutdown(NULL); +#endif return HSE_STATUS_SUCCESS; }