]>
Commit | Line | Data |
---|---|---|
1b2e1154 AO |
1 | diff -ruN php-5.6.12.orig/php.ini php-5.6.12/php.ini |
2 | --- php-5.6.12.orig/php.ini 2015-08-06 09:55:57.000000000 +0200 | |
3 | +++ php-5.6.12/php.ini 2015-08-08 09:21:30.507130679 +0200 | |
d9391e16 | 4 | @@ -82,6 +82,20 @@ |
1b2e1154 AO |
5 | ; much more verbose when it comes to errors. We recommend using the |
6 | ; development version only in development environments, as errors shown to | |
d9391e16 ER |
7 | ; application users can inadvertently leak otherwise secure information. |
8 | +; | |
9 | +; This is the default settings file for new PHP installations from | |
10 | +; PLD Linux Distribution. | |
11 | +; | |
12 | +; It's based mainly on php.ini-production, but with some changes made with | |
13 | +; security in mind (see below, consult also http://php.net/manual/en/security.php). | |
14 | +; | |
15 | +; Please note, that in PLD installations /etc/php/php.ini file | |
16 | +; contains global settings for all SAPIs (cgi, cli, apache...), | |
17 | +; and after reading this file, SAPI-specific file (/etc/php/php-cgi-fcgi.ini, | |
18 | +; /etc/php/php-cli.ini, /etc/php/php-apache.ini...) is INCLUDED | |
19 | +; (so you don't have to duplicate whole large file to override only | |
20 | +; few options) | |
21 | + | |
22 | ||
1b2e1154 AO |
23 | ; This is php.ini-production INI file. |
24 | ||
25 | @@ -175,7 +189,7 @@ | |
360a5277 ER |
26 | ;user_ini.filename = ".user.ini" |
27 | ||
28 | ; To disable this feature set this option to empty value | |
29 | -;user_ini.filename = | |
30 | +user_ini.filename = | |
31 | ||
32 | ; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes) | |
33 | ;user_ini.cache_ttl = 300 | |
1b2e1154 | 34 | @@ -199,7 +213,7 @@ |
c0240cb1 | 35 | ; Development Value: Off |
36 | ; Production Value: Off | |
37 | ; http://php.net/short-open-tag | |
38 | -short_open_tag = Off | |
39 | +short_open_tag = On | |
40 | ||
41 | ; Allow ASP-style <% %> tags. | |
42 | ; http://php.net/asp-tags | |
1b2e1154 | 43 | @@ -360,7 +374,7 @@ |
c0240cb1 | 44 | ; threat in any way, but it makes it possible to determine whether you use PHP |
45 | ; on your server or not. | |
46 | ; http://php.net/expose-php | |
47 | -expose_php = On | |
48 | +expose_php = Off | |
49 | ||
50 | ;;;;;;;;;;;;;;;;;;; | |
51 | ; Resource Limits ; | |
1b2e1154 | 52 | @@ -731,7 +745,7 @@ |
c0240cb1 | 53 | |
54 | ; Directory in which the loadable extensions (modules) reside. | |
55 | ; http://php.net/extension-dir | |
56 | -; extension_dir = "./" | |
91ccfdbd | 57 | +;extension_dir = "/usr/lib/php" |
c0240cb1 | 58 | ; On windows: |
59 | ; extension_dir = "ext" | |
60 | ||
1b2e1154 | 61 | @@ -745,53 +759,6 @@ |
c0240cb1 | 62 | ; http://php.net/enable-dl |
ce9aa3af ER |
63 | enable_dl = Off |
64 | ||
c0240cb1 | 65 | -; cgi.force_redirect is necessary to provide security running PHP as a CGI under |
66 | -; most web servers. Left undefined, PHP turns this on by default. You can | |
67 | -; turn it off here AT YOUR OWN RISK | |
68 | -; **You CAN safely turn this off for IIS, in fact, you MUST.** | |
69 | -; http://php.net/cgi.force-redirect | |
70 | -;cgi.force_redirect = 1 | |
71 | - | |
72 | -; if cgi.nph is enabled it will force cgi to always sent Status: 200 with | |
73 | -; every request. PHP's default behavior is to disable this feature. | |
74 | -;cgi.nph = 1 | |
75 | - | |
76 | -; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape | |
77 | -; (iPlanet) web servers, you MAY need to set an environment variable name that PHP | |
78 | -; will look for to know it is OK to continue execution. Setting this variable MAY | |
79 | -; cause security issues, KNOW WHAT YOU ARE DOING FIRST. | |
80 | -; http://php.net/cgi.redirect-status-env | |
ce9aa3af | 81 | -;cgi.redirect_status_env = |
c0240cb1 | 82 | - |
83 | -; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's | |
84 | -; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok | |
85 | -; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting | |
86 | -; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting | |
87 | -; of zero causes PHP to behave as before. Default is 1. You should fix your scripts | |
88 | -; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. | |
89 | -; http://php.net/cgi.fix-pathinfo | |
90 | -;cgi.fix_pathinfo=1 | |
91 | - | |
92 | -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate | |
93 | -; security tokens of the calling client. This allows IIS to define the | |
94 | -; security context that the request runs under. mod_fastcgi under Apache | |
95 | -; does not currently support this feature (03/17/2002) | |
96 | -; Set to 1 if running under IIS. Default is zero. | |
97 | -; http://php.net/fastcgi.impersonate | |
ce9aa3af | 98 | -;fastcgi.impersonate = 1 |
c0240cb1 | 99 | - |
100 | -; Disable logging through FastCGI connection. PHP's default behavior is to enable | |
101 | -; this feature. | |
102 | -;fastcgi.logging = 0 | |
103 | - | |
104 | -; cgi.rfc2616_headers configuration option tells PHP what type of headers to | |
8d42644e ER |
105 | -; use when sending HTTP response code. If set to 0, PHP sends Status: header that |
106 | -; is supported by Apache. When this option is set to 1, PHP will send | |
c0240cb1 | 107 | -; RFC2616 compliant header. |
108 | -; Default is zero. | |
109 | -; http://php.net/cgi.rfc2616-headers | |
110 | -;cgi.rfc2616_headers = 0 | |
ce9aa3af | 111 | - |
c0240cb1 | 112 | ;;;;;;;;;;;;;;;; |
113 | ; File Uploads ; | |
ce9aa3af | 114 | ;;;;;;;;;;;;;;;; |
1b2e1154 | 115 | @@ -869,48 +836,8 @@ |
c0240cb1 | 116 | ; If you only provide the name of the extension, PHP will look for it in its |
117 | ; default extension directory. | |
118 | ; | |
119 | -; Windows Extensions | |
120 | -; Note that ODBC support is built in, so no dll is needed for it. | |
121 | -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) | |
122 | -; extension folders as well as the separate PECL DLL download (PHP 5). | |
123 | -; Be sure to appropriately set the extension_dir directive. | |
8d42644e | 124 | -; |
c0240cb1 | 125 | -;extension=php_bz2.dll |
126 | -;extension=php_curl.dll | |
127 | -;extension=php_fileinfo.dll | |
128 | -;extension=php_gd2.dll | |
129 | -;extension=php_gettext.dll | |
130 | -;extension=php_gmp.dll | |
131 | -;extension=php_intl.dll | |
132 | -;extension=php_imap.dll | |
133 | -;extension=php_interbase.dll | |
134 | -;extension=php_ldap.dll | |
135 | -;extension=php_mbstring.dll | |
136 | -;extension=php_exif.dll ; Must be after mbstring as it depends on it | |
137 | -;extension=php_mysql.dll | |
138 | -;extension=php_mysqli.dll | |
8d42644e | 139 | -;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client |
c0240cb1 | 140 | -;extension=php_openssl.dll |
141 | -;extension=php_pdo_firebird.dll | |
c0240cb1 | 142 | -;extension=php_pdo_mysql.dll |
143 | -;extension=php_pdo_oci.dll | |
144 | -;extension=php_pdo_odbc.dll | |
145 | -;extension=php_pdo_pgsql.dll | |
146 | -;extension=php_pdo_sqlite.dll | |
147 | -;extension=php_pgsql.dll | |
c0240cb1 | 148 | -;extension=php_shmop.dll |
9eb543e2 ER |
149 | - |
150 | -; The MIBS data available in the PHP distribution must be installed. | |
151 | -; See http://www.php.net/manual/en/snmp.installation.php | |
152 | -;extension=php_snmp.dll | |
153 | - | |
154 | -;extension=php_soap.dll | |
155 | -;extension=php_sockets.dll | |
9eb543e2 ER |
156 | -;extension=php_sqlite3.dll |
157 | -;extension=php_sybase_ct.dll | |
158 | -;extension=php_tidy.dll | |
159 | -;extension=php_xmlrpc.dll | |
160 | -;extension=php_xsl.dll | |
8d42644e ER |
161 | +; Ideally in PLD Linux you should install appropriate php-<extension> or |
162 | +; php-pecl-<extension> package. | |
163 | ||
9eb543e2 ER |
164 | ;;;;;;;;;;;;;;;;;;; |
165 | ; Module Settings ; | |
1b2e1154 | 166 | @@ -948,19 +875,19 @@ |
8d42644e ER |
167 | ; Use of this INI entry is deprecated, use global input_encoding instead. |
168 | ; If empty, default_charset or input_encoding or iconv.input_encoding is used. | |
169 | ; The precedence is: default_charset < intput_encoding < iconv.input_encoding | |
170 | -;iconv.input_encoding = | |
86ce2ca6 | 171 | +iconv.input_encoding = UTF-8 |
8d42644e ER |
172 | |
173 | ; Use of this INI entry is deprecated, use global internal_encoding instead. | |
174 | ; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. | |
175 | ; The precedence is: default_charset < internal_encoding < iconv.internal_encoding | |
176 | -;iconv.internal_encoding = | |
86ce2ca6 | 177 | +iconv.internal_encoding = UTF-8 |
8d42644e ER |
178 | |
179 | ; Use of this INI entry is deprecated, use global output_encoding instead. | |
180 | ; If empty, default_charset or output_encoding or iconv.output_encoding is used. | |
181 | ; The precedence is: default_charset < output_encoding < iconv.output_encoding | |
182 | ; To use an output encoding conversion, iconv's output handler must be set | |
183 | ; otherwise output encoding conversion cannot be performed. | |
184 | -;iconv.output_encoding = | |
86ce2ca6 ER |
185 | +iconv.output_encoding = UTF-8 |
186 | ||
187 | [intl] | |
188 | ;intl.default_locale = | |
1b2e1154 | 189 | @@ -1174,6 +1101,9 @@ |
c0240cb1 | 190 | ; http://php.net/mysql.connect-timeout |
191 | mysql.connect_timeout = 60 | |
192 | ||
193 | +; The name of the character set to use as the default character set. | |
194 | +;mysql.connect_charset=utf8 | |
195 | + | |
196 | ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and | |
197 | ; SQL-Errors will be displayed. | |
198 | ; http://php.net/mysql.trace-mode | |
1b2e1154 | 199 | @@ -1213,6 +1143,9 @@ |
c0240cb1 | 200 | ; http://php.net/mysqli.default-socket |
201 | mysqli.default_socket = | |
202 | ||
203 | +; The name of the character set to use as the default character set. | |
204 | +;mysqli.connect_charset=utf8 | |
205 | + | |
206 | ; Default host for mysql_connect() (doesn't apply in safe mode). | |
207 | ; http://php.net/mysqli.default-host | |
208 | mysqli.default_host = | |
1b2e1154 | 209 | @@ -1379,7 +1312,7 @@ |
c0240cb1 | 210 | |
211 | [browscap] | |
212 | ; http://php.net/browscap | |
213 | -;browscap = extra/browscap.ini | |
51507b46 | 214 | +;browscap = /usr/share/browscap/php_browscap.ini |
c0240cb1 | 215 | |
216 | [Session] | |
217 | ; Handler used to store/retrieve data. | |
1b2e1154 | 218 | @@ -1677,7 +1610,7 @@ |
2aae9fcf ER |
219 | [Assertion] |
220 | ; Assert(expr); active by default. | |
221 | ; http://php.net/assert.active | |
222 | -;assert.active = On | |
223 | +assert.active = Off | |
224 | ||
225 | ; Issue a PHP warning for each failed assertion. | |
226 | ; http://php.net/assert.warning | |
1b2e1154 | 227 | @@ -1839,7 +1772,7 @@ |
c0240cb1 | 228 | |
229 | ; Sets the directory name where SOAP extension will put cache files. | |
230 | ; http://php.net/soap.wsdl-cache-dir | |
231 | -soap.wsdl_cache_dir="/tmp" | |
3f8f8051 | 232 | +soap.wsdl_cache_dir="/var/cache/php" |
c0240cb1 | 233 | |
234 | ; (time to live) Sets the number of second while cached file will be used | |
235 | ; instead of original one. |