- updated to 5.6.40

[packages/php.git] / php-ini.patch

diff --git a/php-ini.patch b/php-ini.patch
index e376857fed30137090e764e643985650e0ad40b2..2085f51dac307721df8e2091471472d665214d3d 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,6 +1,5 @@
-diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
---- php-5.6.0.orig/php.ini     2014-08-27 13:31:35.000000000 +0000
-+++ php-5.6.0/php.ini  2014-09-15 08:41:06.585000000 +0000
+--- php-5.6.27/php.ini 2016-10-14 11:03:12.000000000 +0000
++++ php-5.6.27/php.ini 2016-10-27 08:42:28.983715000 +0000
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommend using the
  ; development version only in development environments, as errors shown to
@@ -49,7 +48,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -363,7 +377,7 @@
+@@ -360,7 +374,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
@@ -58,7 +57,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -732,7 +746,7 @@
+@@ -729,7 +743,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -67,7 +66,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -746,53 +760,6 @@
+@@ -743,65 +757,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -98,6 +97,11 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
 -; 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
@@ -117,11 +121,18 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
 -; 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 ;
  ;;;;;;;;;;;;;;;;
-@@ -870,49 +837,8 @@
+@@ -879,48 +834,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -154,7 +165,6 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
 -;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. 
@@ -168,12 +178,12 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
-+; Ideally in TLD Linux you should install appropriate php-<extension> or
-+; php-pecl-<extension> package.
++; Ideally in TLD Linux you should install appropriate php56-<extension> or
++; php56-pecl-<extension> package.
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -950,19 +876,19 @@
+@@ -958,19 +873,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
@@ -196,7 +206,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  
  [intl]
  ;intl.default_locale =
-@@ -1176,6 +1102,9 @@
+@@ -1181,6 +1096,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -206,7 +216,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  ; 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
-@@ -1215,6 +1144,9 @@
+@@ -1220,6 +1138,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -216,7 +226,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1381,7 +1313,7 @@
+@@ -1386,7 +1307,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -225,7 +235,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1841,7 +1773,7 @@
+@@ -1846,7 +1767,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir