diff options
| author | Zeev Suraski <zeev@php.net> | 1999-05-21 19:22:17 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-05-21 19:22:17 +0000 |
| commit | c57c0e9cd58da7c583b029e9709d5420f286c31e (patch) | |
| tree | f0cc734ea865f3ed63f53a224aa82ac0709407c3 | |
| parent | f33c22c05548486d34bbe02d548cdfd680985f08 (diff) | |
| download | php-git-c57c0e9cd58da7c583b029e9709d5420f286c31e.tar.gz | |
* Fix error handling startup on the thread-safe CGI version
* A failed require() is a compile-time error, consider it as one
| -rw-r--r-- | cgi_main.c | 3 | ||||
| -rw-r--r-- | main/main.c | 2 |
2 files changed, 4 insertions, 1 deletions
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)); |