drop charsetini patches

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

diff --git a/php-ini.patch b/php-ini.patch
index 51709d2be08169935f9b706ba73538d465103ed7..565546655596a9a57b2793536c7f2c60318b169d 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-7.0.0RC3/php.ini~      2015-09-20 21:20:29.000000000 +0300
-+++ php-7.0.0RC3/php.ini       2015-09-20 21:25:50.349958427 +0300
+--- php-7.1.0RC3/php.ini~      2016-10-04 18:47:57.000000000 +0300
++++ php-7.1.0RC3/php.ini       2016-10-04 18:50:05.861335161 +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"
  
-@@ -760,53 +760,6 @@
+@@ -761,65 +761,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -88,6 +88,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
@@ -107,11 +112,18 @@
 -; 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 ;
  ;;;;;;;;;;;;;;;;
-@@ -825,46 +825,8 @@
+@@ -824,47 +824,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -124,6 +136,7 @@
 -;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
@@ -155,8 +168,8 @@
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
-+; Ideally in PLD Linux you should install appropriate php70-<extension> or
-+; php70-pecl-<extension> package.
++; Ideally in PLD Linux you should install appropriate php71-<extension> or
++; php71-pecl-<extension> package.
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;