- don't obsolete php-devel to allow multiple versions

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

diff --git a/php-ini.patch b/php-ini.patch
index 9c247b9854a93d3dc175d45e74423bf979619e8e..2b8f90af4c9759b07875005a1f94f5e40deff494 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.6.12.orig/php.ini    2015-08-06 07:55:57.000000000 +0000
-+++ php-5.6.12/php.ini 2015-08-09 14:51:00.224790532 +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 recommend using the
  ; development version only in development environments, as errors shown to
@@ -48,7 +48,7 @@
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -360,7 +374,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
@@ -57,7 +57,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -731,7 +745,7 @@
+@@ -718,7 +732,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -66,7 +66,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -745,53 +759,6 @@
+@@ -732,65 +746,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -97,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
@@ -116,23 +121,31 @@
 -; 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 ;
  ;;;;;;;;;;;;;;;;
-@@ -869,48 +836,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
@@ -142,7 +155,6 @@
 -;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_12c.dll  ; Use with Oracle Database 12c Instant Client
 -;extension=php_openssl.dll
@@ -155,14 +167,13 @@
 -;extension=php_pgsql.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
@@ -171,7 +182,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -948,19 +875,19 @@
+@@ -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
@@ -194,17 +205,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1174,6 +1101,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
-@@ -1213,6 +1143,9 @@
+@@ -1154,6 +1070,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -214,7 +215,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1379,7 +1312,7 @@
+@@ -1281,7 +1200,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -223,7 +224,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1839,7 +1772,7 @@
+@@ -1708,7 +1627,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir