CVS update: php31/main
| From: | shane | Date: | Thu, 27 Aug 1998 21:42:32 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-626@lists.php.net to get a copy of this message | ||
Date: Thursday August 27, 1998 @ 17:42
Author: shane
Update of /repository/php31/main
In directory asf:/u2/tmp/cvs-serv2172/main
Modified Files:
internal_functions.c
Log Message:
make double loading of dl's only make error warnings when errorlevel 8 is set. This is to
allow redistribution of scripts using dl() to work when the dl is already loaded in ini file
Index: php31/main/internal_functions.c
diff -c php31/main/internal_functions.c:2.4 php31/main/internal_functions.c:2.5
*** php31/main/internal_functions.c:2.4 Thu Aug 20 17:50:31 1998
--- php31/main/internal_functions.c Thu Aug 27 17:42:32 1998
***************
*** 29,35 ****
*/
! /* $Id: internal_functions.c,v 2.4 1998/08/20 21:50:31 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 29,35 ----
*/
! /* $Id: internal_functions.c,v 2.5 1998/08/27 21:42:32 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 531,537 ****
ptr++;
count++;
}
! if (unload) { /* before unloading, display all remaining bad function in the module */
while (ptr->fname) {
if (_php3_hash_exists(&GLOBAL(function_table), ptr->fname, strlen(ptr->fname)+1)) {
php3_error(E_CORE_WARNING,"Module load failed - duplicate function name -
%s",ptr->fname);
--- 531,541 ----
ptr++;
count++;
}
!
! /*quietly close down. if someone is distributing code and using
! dl(), we dont want a ton of warnings flying around because someone
! else loads it in the ini file.*/
! if (unload && (GLOBAL(php3_ini)->error_reporting & 8)) { /* before unloading,
display all remaining bad function in the module */
while (ptr->fname) {
if (_php3_hash_exists(&GLOBAL(function_table), ptr->fname, strlen(ptr->fname)+1)) {
php3_error(E_CORE_WARNING,"Module load failed - duplicate function name -
%s",ptr->fname);
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net