X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-ini.patch;h=2b8f90af4c9759b07875005a1f94f5e40deff494;hb=refs%2Fheads%2FPHP_7_0;hp=7d03c6e0aac17e99b6ec138d722d7567866f22d9;hpb=8e95d3efd3e05b2419be3a092efa3cb763c382fd;p=packages%2Fphp.git diff --git a/php-ini.patch b/php-ini.patch index 7d03c6e..2b8f90a 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,17 +1,17 @@ ---- php-5.6.0beta1/php.ini~ 2014-04-21 21:38:01.000000000 +0300 -+++ php-5.6.0beta1/php.ini 2014-04-21 21:51:47.379819417 +0300 +--- 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 recommending using the - ; development version only in development environments as errors shown to + ; much more verbose when it comes to errors. We recommend using the + ; development version only in development environments, as errors shown to ; application users can inadvertently leak otherwise secure information. +; +; This is the default settings file for new PHP installations from -+; PLD Linux Distribution. ++; TLD Linux. +; +; It's based mainly on php.ini-production, but with some changes made with +; security in mind (see below, consult also http://php.net/manual/en/security.php). +; -+; Please note, that in PLD installations /etc/php/php.ini file ++; Please note, that in TLD installations /etc/php/php.ini file +; contains global settings for all SAPIs (cgi, cli, apache...), +; and after reading this file, SAPI-specific file (/etc/php/php-cgi-fcgi.ini, +; /etc/php/php-cli.ini, /etc/php/php-apache.ini...) is INCLUDED @@ -19,9 +19,18 @@ +; few options) + - ;;;;;;;;;;;;;;;;;;; - ; Quick Reference ; -@@ -198,7 +212,7 @@ + ; This is php.ini-production INI file. + +@@ -149,7 +163,7 @@ + ; Production Value: 5 + + ; short_open_tag +-; Default Value: On ++; Default Value: Off + ; Development Value: Off + ; Production Value: Off + +@@ -175,7 +189,7 @@ ;user_ini.filename = ".user.ini" ; To disable this feature set this option to empty value @@ -30,16 +39,16 @@ ; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes) ;user_ini.cache_ttl = 300 -@@ -223,7 +237,7 @@ +@@ -195,7 +209,7 @@ + ; documents, however this remains supported for backward compatibility reasons. + ; Note that this directive does not control the tags. - ; http://php.net/asp-tags -@@ -372,7 +372,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 @@ -48,7 +57,7 @@ ;;;;;;;;;;;;;;;;;;; ; Resource Limits ; -@@ -725,7 +725,7 @@ +@@ -718,7 +732,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -57,7 +66,7 @@ ; On windows: ; extension_dir = "ext" -@@ -760,53 +760,6 @@ +@@ -732,65 +746,6 @@ ; http://php.net/enable-dl enable_dl = Off @@ -88,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 @@ -107,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 ; ;;;;;;;;;;;;;;;; -@@ -884,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 @@ -133,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 @@ -144,26 +165,24 @@ -;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 -+; Ideally in PLD Linux you should install appropriate php- or ++; Ideally in TLD Linux you should install appropriate php- or +; php-pecl- package. ;;;;;;;;;;;;;;;;;;; ; Module Settings ; -@@ -964,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 @@ -186,17 +205,7 @@ [intl] ;intl.default_locale = -@@ -1152,6 +1062,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 -@@ -1191,6 +1104,9 @@ +@@ -1154,6 +1070,9 @@ ; http://php.net/mysqli.default-socket mysqli.default_socket = @@ -206,7 +215,7 @@ ; Default host for mysql_connect() (doesn't apply in safe mode). ; http://php.net/mysqli.default-host mysqli.default_host = -@@ -1357,7 +1273,7 @@ +@@ -1281,7 +1200,7 @@ [browscap] ; http://php.net/browscap @@ -215,7 +224,7 @@ [Session] ; Handler used to store/retrieve data. -@@ -1822,7 +1738,7 @@ +@@ -1708,7 +1627,7 @@ ; Sets the directory name where SOAP extension will put cache files. ; http://php.net/soap.wsdl-cache-dir