dickmeiss Fri May 30 05:45:57 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4 NEWS
/php4/ext/yaz php_yaz.c
Log:
Prevent yaz from logging unless yaz.log_file is set
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.218 php4/NEWS:1.1247.2.219
--- php4/NEWS:1.1247.2.218 Thu May 29 11:42:45 2003
+++ php4/NEWS Fri May 30 05:45:57 2003
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Jul 2003, Version 4.3.3
+- Prevent yaz from logging unless yaz.log_file is set (Adam Dickmeiss)
- Added long options into CLI & CGI (e.g. --version). (Marcus)
- Added new command line parameters -B, -F, -R and -E which allow to process
stdin line by line (See 'php -h' or 'man php' for more). (Marcus)
Index: php4/ext/yaz/php_yaz.c
diff -u php4/ext/yaz/php_yaz.c:1.57.2.4 php4/ext/yaz/php_yaz.c:1.57.2.5
--- php4/ext/yaz/php_yaz.c:1.57.2.4 Tue May 27 05:50:45 2003
+++ php4/ext/yaz/php_yaz.c Fri May 30 05:45:57 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_yaz.c,v 1.57.2.4 2003/05/27 09:50:45 dickmeiss Exp $ */
+/* $Id: php_yaz.c,v 1.57.2.5 2003/05/30 09:45:57 dickmeiss Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1473,6 +1473,7 @@
PHP_MINIT_FUNCTION(yaz)
{
int i;
+ const char *fname;
nmem_init();
#ifdef ZTS
yaz_mutex = tsrm_mutex_alloc();
@@ -1481,9 +1482,10 @@
REGISTER_INI_ENTRIES();
- if (YAZSG(log_file))
+ fname = YAZSG(log_file);
+ if (fname && *fname)
{
- yaz_log_init_file(YAZSG(log_file));
+ yaz_log_init_file(fname);
yaz_log_init_level(LOG_ALL);
}
else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
