Use zend_first_try

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 1321c5cb1bcca1d8a431dbd6202b920ce77c9a51..1bcf3bccf4c1f79f30a1601a0c7705e945c7a5af 100644 (file)
--- 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 2ab43d3239d034657864a49c5776e02d8d5deb28..5e895bd8997f11d230c3cccab102c72eed3e1483 100644 (file)
--- 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 80f5d53915ca2fbd5eec096f2f59b03e9ce5b72f..6256d7f93b1738725710d4e0eb35553fc9435cd1 100644 (file)
--- 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 1e94b161a2416a4068a0c823d238a32803a5aed9..12a0178b6133bdf0ef1e6212bf5c803f0a028f6f 100644 (file)
--- 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 1cb890bae35c84c751f072e9fea5fc8e3e97122c..4bec1bcd040475a67a96516ffb10bb705c9874bd 100644 (file)
--- 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;