Rel 14; use tls instead of ssl for fsockopen etc by default (backported from upstream...

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

diff --git a/php-ini.patch b/php-ini.patch
index a5704d3281e8ebb8a834ab732f14cf3fbd25938d..58ad800a0a5b0cbbc23d826437ac6dc6ee594f66 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,6 +1,5 @@
-diff -ruN php-5.6.12.orig/php.ini php-5.6.12/php.ini
---- php-5.6.12.orig/php.ini    2015-08-06 09:55:57.000000000 +0200
-+++ php-5.6.12/php.ini 2015-08-08 09:21:30.507130679 +0200
+--- php-5.6.27/php.ini~        2016-10-18 23:32:02.000000000 +0300
++++ php-5.6.27/php.ini 2016-10-18 23:33:47.459569105 +0300
 @@ -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
@@ -58,7 +57,7 @@ diff -ruN php-5.6.12.orig/php.ini php-5.6.12/php.ini
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -745,53 +759,6 @@
+@@ -757,65 +757,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -89,6 +88,11 @@ diff -ruN php-5.6.12.orig/php.ini php-5.6.12/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
@@ -108,6 +112,13 @@ diff -ruN php-5.6.12.orig/php.ini php-5.6.12/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 ;