[PHP4BETA] CVS update: php4

Date: Friday May 21, 1999 @ 15:22 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv11300 Modified Files: cgi_main.c main.c Log Message: * Fix error handling startup on the thread-safe CGI version * A failed require() is a compile-time error, consider it as one Index: php4/cgi_main.c diff -u php4/cgi_main.c:1.13 php4/cgi_main.c:1.14 --- php4/cgi_main.c:1.13 Tue May 11 16:38:13 1999 +++ php4/cgi_main.c Fri May 21 15:22:17 1999 @@ -261,6 +261,9 @@ 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); Index: php4/main.c diff -u php4/main.c:1.58 php4/main.c:1.59 --- php4/main.c:1.58 Thu May 20 15:06:28 1999 +++ php4/main.c Fri May 21 15:22:17 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.58 1999/05/20 19:06:28 zeev Exp $ */ +/* $Id: main.c,v 1.59 1999/05/21 19:22:17 zeev Exp $ */ #include <stdio.h> @@ -564,7 +564,7 @@ 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)); -- PHP 4 Beta