bjori Fri Dec 12 13:07:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/exif exif.c
/php-src/ext/bcmath bcmath.c
/php-src/ext/dba dba.c
/php-src/ext/gd gd.c
/php-src/ext/ldap ldap.c
Log:
Fixed bug#46847 (phpinfo() is missing some settings.)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.411&r2=1.2027.2.547.2.965.2.412&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.411
php-src/NEWS:1.2027.2.547.2.965.2.412
--- php-src/NEWS:1.2027.2.547.2.965.2.411 Fri Dec 12 12:46:24 2008
+++ php-src/NEWS Fri Dec 12 13:07:28 2008
@@ -7,6 +7,7 @@
- Deprecated session_register(), session_unregister() and
session_is_registered(). (Hannes)
+- Fixed bug #46847 (phpinfo() is missing some settings). (Hannes)
- Fixed bug #46811 (ini_set() doesn't return false on failure). (Hannes)
- Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable error when
given bad data). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.12&r2=1.173.2.5.2.20.2.13&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.12
php-src/ext/exif/exif.c:1.173.2.5.2.20.2.13
--- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.12 Mon Nov 17 11:27:54 2008
+++ php-src/ext/exif/exif.c Fri Dec 12 13:07:28 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.173.2.5.2.20.2.12 2008/11/17 11:27:54 felipe Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.13 2008/12/12 13:07:28 bjori Exp $ */
/* ToDos
*
@@ -138,7 +138,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.12 2008/11/17
11:27:54 felipe Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.13 2008/12/12
13:07:28 bjori Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -150,6 +150,7 @@
php_info_print_table_row(2, "Supported EXIF Version", "0220");
php_info_print_table_row(2, "Supported filetypes", "JPEG,TIFF");
php_info_print_table_end();
+ DISPLAY_INI_ENTRIES();
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/bcmath.c?r1=1.62.2.2.2.8.2.7&r2=1.62.2.2.2.8.2.8&diff_format=u
Index: php-src/ext/bcmath/bcmath.c
diff -u php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.7
php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.8
--- php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.7 Mon Nov 17 11:27:53 2008
+++ php-src/ext/bcmath/bcmath.c Fri Dec 12 13:07:28 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bcmath.c,v 1.62.2.2.2.8.2.7 2008/11/17 11:27:53 felipe Exp $ */
+/* $Id: bcmath.c,v 1.62.2.2.2.8.2.8 2008/12/12 13:07:28 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -182,6 +182,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "BCMath support", "enabled");
php_info_print_table_end();
+ DISPLAY_INI_ENTRIES();
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.111.2.4.2.5.2.8&r2=1.111.2.4.2.5.2.9&diff_format=u
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.111.2.4.2.5.2.8
php-src/ext/dba/dba.c:1.111.2.4.2.5.2.9
--- php-src/ext/dba/dba.c:1.111.2.4.2.5.2.8 Mon Nov 17 11:27:54 2008
+++ php-src/ext/dba/dba.c Fri Dec 12 13:07:28 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.111.2.4.2.5.2.8 2008/11/17 11:27:54 felipe Exp $ */
+/* $Id: dba.c,v 1.111.2.4.2.5.2.9 2008/12/12 13:07:28 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -524,6 +524,7 @@
php_info_print_table_row(2, "Supported handlers", "none");
}
php_info_print_table_end();
+ DISPLAY_INI_ENTRIES();
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.25&r2=1.312.2.20.2.32.2.26&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.25
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.26
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.25 Mon Nov 17 11:27:55 2008
+++ php-src/ext/gd/gd.c Fri Dec 12 13:07:28 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.25 2008/11/17 11:27:55 felipe Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.26 2008/12/12 13:07:28 bjori Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1114,6 +1114,7 @@
#if HAVE_GD_FONTMUTEX && HAVE_LIBFREETYPE
gdFontCacheMutexShutdown();
#endif
+ UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
#endif
@@ -1312,6 +1313,7 @@
php_info_print_table_row(2, "JIS-mapped Japanese Font Support",
"enabled");
#endif
php_info_print_table_end();
+ DISPLAY_INI_ENTRIES();
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.21&r2=1.161.2.3.2.11.2.22&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.21
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.22
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.21 Mon Nov 17 11:27:56 2008
+++ php-src/ext/ldap/ldap.c Fri Dec 12 13:07:28 2008
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.11.2.21 2008/11/17 11:27:56 felipe Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.22 2008/12/12 13:07:28 bjori Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -224,7 +224,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v
1.161.2.3.2.11.2.21 2008/11/17 11:27:56 felipe Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v
1.161.2.3.2.11.2.22 2008/12/12 13:07:28 bjori Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -271,6 +271,7 @@
#endif
php_info_print_table_end();
+ DISPLAY_INI_ENTRIES();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
