summaryrefslogtreecommitdiff
path: root/php-ini.patch
diff options
context:
space:
mode:
authorElan Ruusamäe2013-08-18 12:17:13 (GMT)
committerElan Ruusamäe2013-08-18 12:17:13 (GMT)
commite9db96771e6cba522921dc62e3c2100bbd40e7da (patch)
treeb20ae5e7385798922c76bafcb2f7666232b982fd /php-ini.patch
parent218d01416ee2cc8e48e2d9cbaa36c11698508597 (diff)
downloadphp-e9db96771e6cba522921dc62e3c2100bbd40e7da.zip
php-e9db96771e6cba522921dc62e3c2100bbd40e7da.tar.gz
up to 5.5.2; fixes CVE-2013-4248auto/th/php55-5.5.2-1
Diffstat (limited to 'php-ini.patch')
-rw-r--r--php-ini.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/php-ini.patch b/php-ini.patch
index c651cf6..086c479 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.4.5/php.ini~ 2012-07-20 12:22:18.000000000 +0300
-+++ php-5.4.5/php.ini 2012-07-20 12:32:16.646206310 +0300
+--- php-5.5.2/php.ini~ 2013-08-18 15:03:23.000000000 +0300
++++ php-5.5.2/php.ini 2013-08-18 15:04:12.055644364 +0300
@@ -82,6 +82,20 @@
; much more verbose when it comes to errors. We recommending using the
; development version only in development environments as errors shown to
@@ -102,7 +102,7 @@
;;;;;;;;;;;;;;;;
; File Uploads ;
;;;;;;;;;;;;;;;;
-@@ -859,52 +812,9 @@
+@@ -830,51 +830,9 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
@@ -111,7 +111,9 @@
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
-; Be sure to appropriately set the extension_dir directive.
--;
++; Ideally in PLD Linux you should install appropriate php-<extension> or
++; php-pecl-<extension> package.
+ ;
-;extension=php_bz2.dll
-;extension=php_curl.dll
-;extension=php_fileinfo.dll
@@ -150,11 +152,7 @@
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
--;extension=php_zip.dll
-
-+; Ideally in PLD Linux you should install appropriate php-<extension> or
-+; php-pecl-<extension> package.
-+;
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;