diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-10 17:31:48 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-10 17:31:48 -0700 |
| commit | 143ec706388d3d3dcbfe73e4d14f57c97daa134d (patch) | |
| tree | ee613b925ad70c649a8f9ae1377a56f049d88bce | |
| parent | ac538e5e166253a933b1f9f4badae5e19efbf26c (diff) | |
| parent | 503d39d9252b4134f2387ac7914f60083aa1c990 (diff) | |
| download | php-git-143ec706388d3d3dcbfe73e4d14f57c97daa134d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
php.ini-development/production: remove php_zip.dll
Update NEWS
| -rw-r--r-- | php.ini-development | 1 | ||||
| -rw-r--r-- | php.ini-production | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/php.ini-development b/php.ini-development index 0cb23737fe..7197dae6fc 100644 --- a/php.ini-development +++ b/php.ini-development @@ -907,7 +907,6 @@ default_socket_timeout = 60 ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll -;extension=php_zip.dll ;;;;;;;;;;;;;;;;;;; ; Module Settings ; diff --git a/php.ini-production b/php.ini-production index fa16a97f08..5590d2c448 100644 --- a/php.ini-production +++ b/php.ini-production @@ -907,7 +907,6 @@ default_socket_timeout = 60 ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll -;extension=php_zip.dll ;;;;;;;;;;;;;;;;;;; ; Module Settings ; |