cvs: /php4 main.c /php4/ext/standard dl.c

zeev Mon Sep 6 18:40:27 1999 EDT Modified files: /php4 main.c /php4/ext/standard dl.c Log: A couple of BoundsChecker fixes Index: php4/main.c diff -u php4/main.c:1.114 php4/main.c:1.115 --- php4/main.c:1.114 Sun Sep 5 15:59:28 1999 +++ php4/main.c Mon Sep 6 18:40:26 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.114 1999/09/05 19:59:28 sas Exp $ */ +/* $Id: main.c,v 1.115 1999/09/06 22:40:26 zeev Exp $ */ #include <stdio.h> @@ -854,7 +854,7 @@ 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, ""); Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.9 php4/ext/standard/dl.c:1.10 --- php4/ext/standard/dl.c:1.9 Fri Aug 13 17:03:27 1999 +++ php4/ext/standard/dl.c Mon Sep 6 18:40:27 1999 @@ -104,11 +104,18 @@ /* 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; }