From: Kalle Sommer Nielsen <kalle@php.net>
Date: Mon, 16 Aug 2010 00:26:39 +0000 (+0000)
Subject: Fixed bug #52593 (exif is placed before mbstring in php.ini)
X-Git-Tag: php-5.4.0alpha1~191^2~1099
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ff6f90446f4d085a535b68da7855ee27bed2fa0;p=php

Fixed bug #52593 (exif is placed before mbstring in php.ini)
---

diff --git a/php.ini-development b/php.ini-development
index 714cff6397..3e19eeff7a 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -860,7 +860,6 @@ default_socket_timeout = 60
 ;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 @@ default_socket_timeout = 60
 ;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
diff --git a/php.ini-production b/php.ini-production
index adbbe16cfb..3a38742998 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -860,7 +860,6 @@ default_socket_timeout = 60
 ;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 @@ default_socket_timeout = 60
 ;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