summaryrefslogtreecommitdiff
path: root/php.ini-production
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-08-10 17:31:48 -0700
committerStanislav Malyshev <stas@php.net>2013-08-10 17:31:48 -0700
commit143ec706388d3d3dcbfe73e4d14f57c97daa134d (patch)
treeee613b925ad70c649a8f9ae1377a56f049d88bce /php.ini-production
parentac538e5e166253a933b1f9f4badae5e19efbf26c (diff)
parent503d39d9252b4134f2387ac7914f60083aa1c990 (diff)
downloadphp-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
Diffstat (limited to 'php.ini-production')
-rw-r--r--php.ini-production1
1 files changed, 0 insertions, 1 deletions
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 ;