X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-ini.patch;h=2b8f90af4c9759b07875005a1f94f5e40deff494;hb=e97fe9f652379d39a8f9b120cd26ef3c54531e71;hp=7d3dbcd019aa279ad1498dd5dca3746e08c70fca;hpb=9e37791e10b6d602be368c17a2ab0aafc619da11;p=packages%2Fphp.git

diff --git a/php-ini.patch b/php-ini.patch
index 7d3dbcd..2b8f90a 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,8 +1,8 @@
---- php-5.5.4/php.ini	2013-09-18 13:08:04.000000000 +0000
-+++ php-5.5.4/php.ini	2013-09-20 07:55:29.509891329 +0000
+--- php-7.0.12/php.ini	2016-10-13 14:04:17.000000000 +0000
++++ php-7.0.12/php.ini	2016-10-27 07:40:55.773715000 +0000
 @@ -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
+ ; much more verbose when it comes to errors. We recommend using the
+ ; development version only in development environments, as errors shown to
  ; application users can inadvertently leak otherwise secure information.
 +;
 +; This is the default settings file for new PHP installations from
@@ -19,9 +19,9 @@
 +; few options)
 +
  
- ;;;;;;;;;;;;;;;;;;;
- ; Quick Reference ;
-@@ -157,7 +171,7 @@
+ ; This is php.ini-production INI file.
+ 
+@@ -149,7 +163,7 @@
  ;   Production Value: 5
  
  ; short_open_tag
@@ -30,7 +30,16 @@
  ;   Development Value: Off
  ;   Production Value: Off
  
-@@ -203,7 +217,7 @@
+@@ -175,7 +189,7 @@
+ ;user_ini.filename = ".user.ini"
+ 
+ ; To disable this feature set this option to empty value
+-;user_ini.filename =
++user_ini.filename =
+ 
+ ; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
+ ;user_ini.cache_ttl = 300
+@@ -195,7 +209,7 @@
  ; documents, however this remains supported for backward compatibility reasons.
  ; Note that this directive does not control the <?= shorthand tag, which can be
  ; used regardless of this directive.
@@ -39,7 +48,7 @@
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -371,7 +385,7 @@
+@@ -356,7 +370,7 @@
  ; threat in any way, but it makes it possible to determine whether you use PHP
  ; on your server or not.
  ; http://php.net/expose-php
@@ -48,7 +57,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -724,7 +738,7 @@
+@@ -718,7 +732,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -57,7 +66,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -738,53 +752,6 @@
+@@ -732,65 +746,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -88,6 +97,11 @@
 -; http://php.net/cgi.fix-pathinfo
 -;cgi.fix_pathinfo=1
 -
+-; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
+-; of the web tree and people will not be able to circumvent .htaccess security.
+-; http://php.net/cgi.dicard-path
+-;cgi.discard_path=1
+-
 -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
 -; security tokens of the calling client.  This allows IIS to define the
 -; security context that the request runs under.  mod_fastcgi under Apache
@@ -101,29 +115,37 @@
 -;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
 -;cgi.rfc2616_headers = 0
+-
+-; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #!
+-; (shebang) at the top of the running script. This line might be needed if the
+-; script support running both as stand-alone script and via PHP CGI<. PHP in CGI
+-; mode skips this line and ignores its content if this directive is turned on.
+-; http://php.net/cgi.check-shebang-line
+-;cgi.check_shebang_line=1
 -
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -862,50 +829,8 @@
+@@ -868,47 +823,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
 -; Windows Extensions
 -; Note that ODBC support is built in, so no dll is needed for it.
--; 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).
+-; 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.
 -;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_fileinfo.dll
+-;extension=php_ftp.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
 -;extension=php_gmp.dll
@@ -133,10 +155,8 @@
 -;extension=php_ldap.dll
 -;extension=php_mbstring.dll
 -;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
@@ -145,17 +165,15 @@
 -;extension=php_pdo_pgsql.dll
 -;extension=php_pdo_sqlite.dll
 -;extension=php_pgsql.dll
--;extension=php_pspell.dll
 -;extension=php_shmop.dll
 -
--; The MIBS data available in the PHP distribution must be installed. 
--; See http://www.php.net/manual/en/snmp.installation.php 
+-; The MIBS data available in the PHP distribution must be installed.
+-; See http://www.php.net/manual/en/snmp.installation.php
 -;extension=php_snmp.dll
 -
 -;extension=php_soap.dll
 -;extension=php_sockets.dll
 -;extension=php_sqlite3.dll
--;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
@@ -164,30 +182,30 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -940,9 +865,9 @@
- ;filter.default_flags =
- 
- [iconv]
--;iconv.input_encoding = ISO-8859-1
--;iconv.internal_encoding = ISO-8859-1
--;iconv.output_encoding = ISO-8859-1
+@@ -946,19 +862,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]
  ;intl.default_locale =
-@@ -1156,6 +1081,9 @@
- ; http://php.net/mysql.connect-timeout
- mysql.connect_timeout = 60
- 
-+; The name of the character set to use as the default character set.
-+;mysql.connect_charset=utf8
-+
- ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
- ; SQL-Errors will be displayed.
- ; http://php.net/mysql.trace-mode
-@@ -1195,6 +1123,9 @@
+@@ -1154,6 +1070,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -197,7 +215,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1361,7 +1292,7 @@
+@@ -1281,7 +1200,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -206,7 +224,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1834,7 +1765,7 @@
+@@ -1708,7 +1627,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir