summaryrefslogtreecommitdiff
path: root/php.ini-production
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-08-10 17:31:59 -0700
committerStanislav Malyshev <stas@php.net>2013-08-10 17:31:59 -0700
commit0f09b978cc0d149ee54ee154b190b72dc6886be5 (patch)
tree22eff2b6c68adca7b85e4439a6cd453d11cd07f2 /php.ini-production
parent0959475e11e58f69e58352ffe8dc54fc2d003f3c (diff)
parent143ec706388d3d3dcbfe73e4d14f57c97daa134d (diff)
downloadphp-git-0f09b978cc0d149ee54ee154b190b72dc6886be5.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: php.ini-development/production: remove php_zip.dll Update NEWS 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 91b55d614c..817dd5cc4d 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -910,7 +910,6 @@ default_socket_timeout = 60
;extension=php_tidy.dll
;extension=php_xmlrpc.dll
;extension=php_xsl.dll
-;extension=php_zip.dll
;;;;;;;;;;;;;;;;;;;
; Module Settings ;