* Fix error handling startup on the thread-safe CGI version

* A failed require() is a compile-time error, consider it as one

diff --git a/cgi_main.c b/cgi_main.c
index a2e37a4f0318c9b76519bafa1dce498914a177d9..fb053dc709fe4e8c632b770aa6805c6619943c53 100644 (file)
--- a/cgi_main.c
+++ b/cgi_main.c
@@ -261,6 +261,9 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
        executor_globals = ts_resource(executor_globals_id);
        core_globals = ts_resource(core_globals_id);
        sapi_globals = ts_resource(sapi_globals_id);
+       if (setjmp(EG(bailout))!=0) {
+               return -1;
+       }
 #endif
 
        init_request_info(SLS_C);

diff --git a/main/main.c b/main/main.c
index 25ecda6381a38b4db3b95c34ecb4432bdfe0da89..71c568ec21c5b855d6fd69abd19adb7f7329919b 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -564,7 +564,7 @@ static void php_message_handler_for_zend(long message, void *data)
                        php3_error(E_WARNING, "Failed opening '%s' for inclusion", php3_strip_url_passwd((char *) data));
                        break;
                case ZMSG_FAILED_REQUIRE_FOPEN:
-                       php3_error(E_ERROR, "Failed opening required '%s'", php3_strip_url_passwd((char *) data));
+                       php3_error(E_COMPILE_ERROR, "Failed opening required '%s'", php3_strip_url_passwd((char *) data));
                        break;
                case ZMSG_FAILED_HIGHLIGHT_FOPEN:
                        php3_error(E_WARNING, "Failed opening '%s' for highlighting", php3_strip_url_passwd((char *) data));