From: Zeev Suraski <zeev@php.net>
Date: Fri, 21 May 1999 19:22:17 +0000 (+0000)
Subject: * Fix error handling startup on the thread-safe CGI version
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c57c0e9cd58da7c583b029e9709d5420f286c31e;p=php

* 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 a2e37a4f03..fb053dc709 100644
--- 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 25ecda6381..71c568ec21 100644
--- 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));