diff options
author | Elan Ruusamäe | 2014-04-27 08:22:41 (GMT) |
---|---|---|
committer | Elan Ruusamäe | 2014-04-27 08:25:05 (GMT) |
commit | 8d42644ed22186d73f839ef6759766b4aedd49eb (patch) | |
tree | f28ae860bc333ba8a9e3c0f3e118636aed9e97ec /php-ini.patch | |
parent | e2d9e36f4781717d4964a5c68e86605eecbde18f (diff) | |
download | php-8d42644ed22186d73f839ef6759766b4aedd49eb.zip php-8d42644ed22186d73f839ef6759766b4aedd49eb.tar.gz |
PHP 5.6.0beta1, new packages: phpdbg
Diffstat (limited to 'php-ini.patch')
-rw-r--r-- | php-ini.patch | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/php-ini.patch b/php-ini.patch index 9d1ace5..7d03c6e 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,5 +1,5 @@ ---- 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 +--- php-5.6.0beta1/php.ini~ 2014-04-21 21:38:01.000000000 +0300 ++++ php-5.6.0beta1/php.ini 2014-04-21 21:51:47.379819417 +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 @@ -57,7 +57,7 @@ ; On windows: ; extension_dir = "ext" -@@ -735,53 +735,6 @@ +@@ -760,53 +760,6 @@ ; http://php.net/enable-dl enable_dl = Off @@ -101,8 +101,8 @@ -;fastcgi.logging = 0 - -; cgi.rfc2616_headers configuration option tells PHP what type of headers to --; use when sending HTTP response code. If it's set 0 PHP sends Status: header that --; is supported by Apache. When this option is set to 1 PHP will send +-; use when sending HTTP response code. If set to 0, PHP sends Status: header that +-; is supported by Apache. When this option is set to 1, PHP will send -; RFC2616 compliant header. -; Default is zero. -; http://php.net/cgi.rfc2616-headers @@ -111,7 +111,7 @@ ;;;;;;;;;;;;;;;; ; File Uploads ; ;;;;;;;;;;;;;;;; -@@ -830,51 +830,9 @@ +@@ -884,49 +837,8 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -120,9 +120,7 @@ -; 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 @@ -137,8 +135,7 @@ -;extension=php_exif.dll ; Must be after mbstring as it depends on it -;extension=php_mysql.dll -;extension=php_mysqli.dll --;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client --;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client +-;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client -;extension=php_openssl.dll -;extension=php_pdo_firebird.dll -;extension=php_pdo_mysql.dll @@ -161,19 +158,30 @@ -;extension=php_tidy.dll -;extension=php_xmlrpc.dll -;extension=php_xsl.dll -- ++; Ideally in PLD Linux you should install appropriate php-<extension> or ++; php-pecl-<extension> package. + ;;;;;;;;;;;;;;;;;;; ; Module Settings ; - ;;;;;;;;;;;;;;;;;;; -@@ -938,9 +848,9 @@ - ;filter.default_flags = - - [iconv] --;iconv.input_encoding = ISO-8859-1 --;iconv.internal_encoding = ISO-8859-1 --;iconv.output_encoding = ISO-8859-1 +@@ -964,19 +876,19 @@ + ; Use of this INI entry is deprecated, use global input_encoding instead. + ; If empty, default_charset or input_encoding or iconv.input_encoding is used. + ; The precedence is: default_charset < intput_encoding < iconv.input_encoding +-;iconv.input_encoding = +iconv.input_encoding = UTF-8 + + ; Use of this INI entry is deprecated, use global internal_encoding instead. + ; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. + ; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +-;iconv.internal_encoding = +iconv.internal_encoding = UTF-8 + + ; Use of this INI entry is deprecated, use global output_encoding instead. + ; If empty, default_charset or output_encoding or iconv.output_encoding is used. + ; The precedence is: default_charset < output_encoding < iconv.output_encoding + ; To use an output encoding conversion, iconv's output handler must be set + ; otherwise output encoding conversion cannot be performed. +-;iconv.output_encoding = +iconv.output_encoding = UTF-8 [intl] |