diff options
| -rw-r--r-- | sapi/apache/mod_php4.c | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
| -rw-r--r-- | sapi/isapi/php4isapi.c | 2 | ||||
| -rw-r--r-- | sapi/pi3web/pi3web_sapi.c | 2 | ||||
| -rw-r--r-- | sapi/servlet/servlet.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 1321c5cb1b..1bcf3bccf4 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -502,7 +502,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename) return OK; } - zend_try { + zend_first_try { /* We don't accept OPTIONS requests, but take everything else */ if (r->method_number == M_OPTIONS) { r->allowed |= (1 << METHODS) - 1; diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 2ab43d3239..5e895bd899 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -486,7 +486,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine tsrm_ls = ts_resource(0); #endif - zend_try { + zend_first_try { if (!cgi) { while ((c=ap_php_getopt(argc, argv, OPTSTRING))!=-1) { switch (c) { diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c index 80f5d53915..6256d7f93b 100644 --- a/sapi/isapi/php4isapi.c +++ b/sapi/isapi/php4isapi.c @@ -720,7 +720,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) #endif TSRMLS_FETCH(); - zend_try { + zend_first_try { #ifdef PHP_ENABLE_SEH __try { #endif diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c index 1e94b161a2..12a0178b61 100644 --- a/sapi/pi3web/pi3web_sapi.c +++ b/sapi/pi3web/pi3web_sapi.c @@ -377,7 +377,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) int iRet = PIAPI_COMPLETED; TSRMLS_FETCH(); - zend_try { + zend_first_try { file_handle.filename = lpCB->lpszFileName; file_handle.free_filename = 0; file_handle.type = ZEND_HANDLE_FILENAME; diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index 1cb890bae3..4bec1bcd04 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -320,7 +320,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send #endif TSRMLS_FETCH(); - zend_try { + zend_first_try { SG(server_context) = emalloc(sizeof(servlet_request)); ((servlet_request*)SG(server_context))->jenv=jenv; ((servlet_request*)SG(server_context))->servlet=self; |