From 959ad0e9eaf9c32f2c341a7fccd06cf1e1998246 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Mon, 6 Sep 1999 22:40:27 +0000 Subject: [PATCH] A couple of BoundsChecker fixes --- ext/standard/dl.c | 11 +++++++++-- main/main.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 6d3db207b0..6fef6ec045 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -104,11 +104,18 @@ void php3_dl(pval *file,int type,pval *return_value) /* load dynamic symbol */ handle = dlopen(libpath, RTLD_LAZY); if (!handle) { + int error_type; + + if (type==MODULE_TEMPORARY) { + error_type = E_ERROR; + } else { + error_type = E_CORE_ERROR; + } #if MSVC5 - php_error(E_ERROR,"Unable to load dynamic library '%s'
\n%s",libpath,php3_win_err()); + php_error(error_type,"Unable to load dynamic library '%s'
\n%s",libpath,php3_win_err()); #else printf("dlerror = %s\n", dlerror()); - php_error(E_ERROR,"Unable to load dynamic library '%s' - %s",libpath,dlerror()); + php_error(error_type,"Unable to load dynamic library '%s' - %s",libpath,dlerror()); #endif RETURN_FALSE; } diff --git a/main/main.c b/main/main.c index 842c120567..6fbf6f6314 100644 --- a/main/main.c +++ b/main/main.c @@ -854,7 +854,7 @@ int php_module_startup(sapi_module_struct *sf) PG(header_is_being_sent) = 0; SG(request_info).headers_only = 0; - PG(connection_status) |= PHP_CONNECTION_NORMAL; + PG(connection_status) = PHP_CONNECTION_NORMAL; #if HAVE_SETLOCALE setlocale(LC_CTYPE, ""); -- 2.40.0