svn: /php/php-src/ branches/PHP_5_2/php.ini-dist branches/PHP_5_2/php.ini-recommended branches/PHP_5_3/php.ini-development
branches/PHP_5_3/php.ini-production trunk/php.ini-development trunk/php.ini-production
| From: | Kalle Sommer Nielsen | Date: | Mon, 16 Aug 2010 00:26:39 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/php.ini-dist branches/PHP_5_2/php.ini-recommended branches/PHP_5_3/php.ini-development branches/PHP_5_3/php.ini-production trunk/php.ini-development trunk/php.ini-production |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63290@lists.php.net to get a copy of this message | ||
kalle Mon, 16 Aug 2010 00:26:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302279
Log:
Fixed bug #52593 (exif is placed before mbstring in php.ini)
Bug: http://bugs.php.net/52593 (Bogus) Getting scope
variables of the caller function
Changed paths:
U php/php-src/branches/PHP_5_2/php.ini-dist
U php/php-src/branches/PHP_5_2/php.ini-recommended
U php/php-src/branches/PHP_5_3/php.ini-development
U php/php-src/branches/PHP_5_3/php.ini-production
U php/php-src/trunk/php.ini-development
U php/php-src/trunk/php.ini-production
Modified: php/php-src/branches/PHP_5_2/php.ini-dist
===================================================================
--- php/php-src/branches/PHP_5_2/php.ini-dist 2010-08-15 21:59:40 UTC (rev 302278)
+++ php/php-src/branches/PHP_5_2/php.ini-dist 2010-08-16 00:26:39 UTC (rev 302279)
@@ -614,7 +614,6 @@
;extension=php_curl.dll
;extension=php_dba.dll
;extension=php_dbase.dll
-;extension=php_exif.dll
;extension=php_fdf.dll
;extension=php_gd2.dll
;extension=php_gettext.dll
@@ -624,6 +623,7 @@
;extension=php_interbase.dll
;extension=php_ldap.dll
;extension=php_mbstring.dll
+;extension=php_exif.dll
;extension=php_mcrypt.dll
;extension=php_mhash.dll
;extension=php_mime_magic.dll
Modified: php/php-src/branches/PHP_5_2/php.ini-recommended
===================================================================
--- php/php-src/branches/PHP_5_2/php.ini-recommended 2010-08-15 21:59:40 UTC (rev 302278)
+++ php/php-src/branches/PHP_5_2/php.ini-recommended 2010-08-16 00:26:39 UTC (rev 302279)
@@ -665,7 +665,6 @@
;extension=php_curl.dll
;extension=php_dba.dll
;extension=php_dbase.dll
-;extension=php_exif.dll
;extension=php_fdf.dll
;extension=php_gd2.dll
;extension=php_gettext.dll
@@ -675,6 +674,7 @@
;extension=php_interbase.dll
;extension=php_ldap.dll
;extension=php_mbstring.dll
+;extension=php_exif.dll
;extension=php_mcrypt.dll
;extension=php_mhash.dll
;extension=php_mime_magic.dll
Modified: php/php-src/branches/PHP_5_3/php.ini-development
===================================================================
--- php/php-src/branches/PHP_5_3/php.ini-development 2010-08-15 21:59:40 UTC (rev 302278)
+++ php/php-src/branches/PHP_5_3/php.ini-development 2010-08-16 00:26:39 UTC (rev 302279)
@@ -947,7 +947,6 @@
;extension=php_bz2.dll
;extension=php_curl.dll
;extension=php_dba.dll
-;extension=php_exif.dll
;extension=php_fileinfo.dll
;extension=php_gd2.dll
;extension=php_gettext.dll
@@ -957,6 +956,7 @@
;extension=php_interbase.dll
;extension=php_ldap.dll
;extension=php_mbstring.dll
+;extension=php_exif.dll ; Must be after mbstring as it depends on it
;extension=php_ming.dll
;extension=php_mssql.dll
;extension=php_mysql.dll
Modified: php/php-src/branches/PHP_5_3/php.ini-production
===================================================================
--- php/php-src/branches/PHP_5_3/php.ini-production 2010-08-15 21:59:40 UTC (rev 302278)
+++ php/php-src/branches/PHP_5_3/php.ini-production 2010-08-16 00:26:39 UTC (rev 302279)
@@ -947,7 +947,6 @@
;extension=php_bz2.dll
;extension=php_curl.dll
;extension=php_dba.dll
-;extension=php_exif.dll
;extension=php_fileinfo.dll
;extension=php_gd2.dll
;extension=php_gettext.dll
@@ -957,6 +956,7 @@
;extension=php_interbase.dll
;extension=php_ldap.dll
;extension=php_mbstring.dll
+;extension=php_exif.dll ; Must be after mbstring as it depends on it
;extension=php_ming.dll
;extension=php_mssql.dll
;extension=php_mysql.dll
Modified: php/php-src/trunk/php.ini-development
===================================================================
--- php/php-src/trunk/php.ini-development 2010-08-15 21:59:40 UTC (rev 302278)
+++ php/php-src/trunk/php.ini-development 2010-08-16 00:26:39 UTC (rev 302279)
@@ -860,7 +860,6 @@
;extension=php_bz2.dll
;extension=php_curl.dll
;extension=php_dba.dll
-;extension=php_exif.dll
;extension=php_fileinfo.dll
;extension=php_gd2.dll
;extension=php_gettext.dll
@@ -870,6 +869,7 @@
;extension=php_interbase.dll
;extension=php_ldap.dll
;extension=php_mbstring.dll
+;extension=php_exif.dll ; Must be after mbstring as it depends on it
;extension=php_ming.dll
;extension=php_mssql.dll
;extension=php_mysql.dll
Modified: php/php-src/trunk/php.ini-production
===================================================================
--- php/php-src/trunk/php.ini-production 2010-08-15 21:59:40 UTC (rev 302278)
+++ php/php-src/trunk/php.ini-production 2010-08-16 00:26:39 UTC (rev 302279)
@@ -860,7 +860,6 @@
;extension=php_bz2.dll
;extension=php_curl.dll
;extension=php_dba.dll
-;extension=php_exif.dll
;extension=php_fileinfo.dll
;extension=php_gd2.dll
;extension=php_gettext.dll
@@ -870,6 +869,7 @@
;extension=php_interbase.dll
;extension=php_ldap.dll
;extension=php_mbstring.dll
+;extension=php_exif.dll ; Must be after mbstring as it depends on it
;extension=php_ming.dll
;extension=php_mssql.dll
;extension=php_mysql.dll