Browse Source

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

* A failed require() is a compile-time error, consider it as one
experimental/newoperator
Zeev Suraski 27 years ago
parent
commit
c57c0e9cd5
  1. 3
      cgi_main.c
  2. 2
      main/main.c

3
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);

2
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));

Loading…
Cancel
Save