A couple of BoundsChecker fixes

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 6d3db207b07689354ce0df28c7f5b0359963cf7c..6fef6ec045f733cf4d9c35f8ed17e4bfedb5195d 100644 (file)
--- 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'<br>\n%s",libpath,php3_win_err());
+               php_error(error_type,"Unable to load dynamic library '%s'<br>\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 842c120567bf146ea0ae636fecdbd918de9363b2..6fbf6f6314e49e1c6c61fb7679947440361dfcf6 100644 (file)
--- 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, "");