diff options
| author | Elan Ruusamäe | 2012-04-27 22:37:49 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 869f05f70ff9a9b2e20c67df470cefe12dd005c9 (patch) | |
| tree | 3f270fff8782f07f2133a191a0c15d274060e98d /php-ini.patch | |
| parent | 9040d146fb2492101a2914ae5a8ec150a3477f65 (diff) | |
| download | php-869f05f70ff9a9b2e20c67df470cefe12dd005c9.zip php-869f05f70ff9a9b2e20c67df470cefe12dd005c9.tar.gz | |
- up to 5.4.1 (CVE-2012-1172), should compile with apache 2.4
Changed files:
php-ini.patch -> 1.42.4.3
php.spec -> 1.945.2.15
Diffstat (limited to 'php-ini.patch')
| -rw-r--r-- | php-ini.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/php-ini.patch b/php-ini.patch index 7d6be8e..56250b5 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,5 +1,5 @@ ---- php-5.4.0RC3/php.ini~ 2011-12-10 03:28:54.000000000 +0200 -+++ php-5.4.0RC3/php.ini 2011-12-10 03:29:47.322573066 +0200 +--- php-5.4.1/php.ini~ 2012-04-28 01:25:58.000000000 +0300 ++++ php-5.4.1/php.ini 2012-04-28 01:27:51.622637977 +0300 @@ -223,7 +223,7 @@ ; Development Value: Off ; Production Value: Off @@ -83,7 +83,7 @@ ;;;;;;;;;;;;;;;; ; File Uploads ; -@@ -805,52 +805,8 @@ +@@ -812,52 +812,9 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -92,7 +92,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 @@ -126,18 +128,16 @@ - -;extension=php_soap.dll -;extension=php_sockets.dll --;extension=php_sqlite.dll -;extension=php_sqlite3.dll -;extension=php_sybase_ct.dll -;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 ; + ;;;;;;;;;;;;;;;;;;; @@ -1235,6 +1140,9 @@ ; http://php.net/mysql.connect-timeout mysql.connect_timeout = 60 |