X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-ini.patch;h=2b8f90af4c9759b07875005a1f94f5e40deff494;hb=refs%2Fheads%2FPHP_7_0;hp=e376857fed30137090e764e643985650e0ad40b2;hpb=7954582fdca3349c5d02a8afcf314795b35db8df;p=packages%2Fphp.git diff --git a/php-ini.patch b/php-ini.patch index e376857..2b8f90a 100644 --- 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-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 @@ -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 @@ +@@ -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 @@ -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 @@ +@@ -718,7 +732,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 @@ +@@ -732,65 +746,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,23 +121,31 @@ 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 @@ +@@ -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 @@ -143,7 +155,6 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini -;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 @@ -154,17 +165,15 @@ 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. --; 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 @@ -173,7 +182,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini ;;;;;;;;;;;;;;;;;;; ; Module Settings ; -@@ -950,19 +876,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 @@ -196,17 +205,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini [intl] ;intl.default_locale = -@@ -1176,6 +1102,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 -@@ -1215,6 +1144,9 @@ +@@ -1154,6 +1070,9 @@ ; http://php.net/mysqli.default-socket mysqli.default_socket = @@ -216,7 +215,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 @@ +@@ -1281,7 +1200,7 @@ [browscap] ; http://php.net/browscap @@ -225,7 +224,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 @@ +@@ -1708,7 +1627,7 @@ ; Sets the directory name where SOAP extension will put cache files. ; http://php.net/soap.wsdl-cache-dir