thetaphi Thu Dec 4 03:56:08 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard browscap.c
Log:
Fix bug #25916: get_browser() -> PHP Fatal error: Nesting level too deep - recursive
dependency?
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.491 php-src/NEWS:1.1247.2.492
--- php-src/NEWS:1.1247.2.491 Thu Dec 4 01:37:14 2003
+++ php-src/NEWS Thu Dec 4 03:56:06 2003
@@ -5,6 +5,8 @@
(Jani)
- Fixed header handler in NSAPI SAPI module (header->replace was ignored,
send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #25916 (get_browser() -> PHP Fatal error: Nesting level
+ too deep - recursive dependency?). (Uwe Schindler)
- Fixed bug #26488 (Missing declaration of CRTSCTS in ext/dio/dio.c). (Jani)
- Fixed bug #26467 (flock() does not force the "wouldblock" parameter to be
passed by reference). (Wez)
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.60.2.15
php-src/ext/standard/browscap.c:1.60.2.16
--- php-src/ext/standard/browscap.c:1.60.2.15 Wed Aug 13 19:39:03 2003
+++ php-src/ext/standard/browscap.c Thu Dec 4 03:56:07 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: browscap.c,v 1.60.2.15 2003/08/13 23:39:03 sniper Exp $ */
+/* $Id: browscap.c,v 1.60.2.16 2003/12/04 08:56:07 thetaphi Exp $ */
#include "php.h"
#include "php_regex.h"
@@ -149,7 +149,7 @@
zend_file_handle fh;
memset(&fh, 0, sizeof(fh));
- if (zend_hash_init(&browser_hash, 0, NULL, (dtor_func_t)
browscap_entry_dtor, 1)==FAILURE) {
+ if (zend_hash_init_ex(&browser_hash, 0, NULL, (dtor_func_t)
browscap_entry_dtor, 1, 0)==FAILURE) {
return FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
