]>
Commit | Line | Data |
---|---|---|
ce9aa3af ER |
1 | --- php-5.4.5/php.ini~ 2012-07-20 12:22:18.000000000 +0300 |
2 | +++ php-5.4.5/php.ini 2012-07-20 12:32:16.646206310 +0300 | |
86ce2ca6 | 3 | @@ -208,7 +208,7 @@ |
c0240cb1 | 4 | ; Development Value: Off |
5 | ; Production Value: Off | |
6 | ; http://php.net/short-open-tag | |
7 | -short_open_tag = Off | |
8 | +short_open_tag = On | |
9 | ||
10 | ; Allow ASP-style <% %> tags. | |
11 | ; http://php.net/asp-tags | |
86ce2ca6 | 12 | @@ -372,7 +372,7 @@ |
c0240cb1 | 13 | ; threat in any way, but it makes it possible to determine whether you use PHP |
14 | ; on your server or not. | |
15 | ; http://php.net/expose-php | |
16 | -expose_php = On | |
17 | +expose_php = Off | |
18 | ||
19 | ;;;;;;;;;;;;;;;;;;; | |
20 | ; Resource Limits ; | |
86ce2ca6 | 21 | @@ -725,7 +725,7 @@ |
c0240cb1 | 22 | |
23 | ; Directory in which the loadable extensions (modules) reside. | |
24 | ; http://php.net/extension-dir | |
25 | -; extension_dir = "./" | |
91ccfdbd | 26 | +;extension_dir = "/usr/lib/php" |
c0240cb1 | 27 | ; On windows: |
28 | ; extension_dir = "ext" | |
29 | ||
ce9aa3af | 30 | @@ -735,53 +735,6 @@ |
c0240cb1 | 31 | ; http://php.net/enable-dl |
ce9aa3af ER |
32 | enable_dl = Off |
33 | ||
c0240cb1 | 34 | -; cgi.force_redirect is necessary to provide security running PHP as a CGI under |
35 | -; most web servers. Left undefined, PHP turns this on by default. You can | |
36 | -; turn it off here AT YOUR OWN RISK | |
37 | -; **You CAN safely turn this off for IIS, in fact, you MUST.** | |
38 | -; http://php.net/cgi.force-redirect | |
39 | -;cgi.force_redirect = 1 | |
40 | - | |
41 | -; if cgi.nph is enabled it will force cgi to always sent Status: 200 with | |
42 | -; every request. PHP's default behavior is to disable this feature. | |
43 | -;cgi.nph = 1 | |
44 | - | |
45 | -; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape | |
46 | -; (iPlanet) web servers, you MAY need to set an environment variable name that PHP | |
47 | -; will look for to know it is OK to continue execution. Setting this variable MAY | |
48 | -; cause security issues, KNOW WHAT YOU ARE DOING FIRST. | |
49 | -; http://php.net/cgi.redirect-status-env | |
ce9aa3af | 50 | -;cgi.redirect_status_env = |
c0240cb1 | 51 | - |
52 | -; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's | |
53 | -; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok | |
54 | -; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting | |
55 | -; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting | |
56 | -; of zero causes PHP to behave as before. Default is 1. You should fix your scripts | |
57 | -; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. | |
58 | -; http://php.net/cgi.fix-pathinfo | |
59 | -;cgi.fix_pathinfo=1 | |
60 | - | |
61 | -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate | |
62 | -; security tokens of the calling client. This allows IIS to define the | |
63 | -; security context that the request runs under. mod_fastcgi under Apache | |
64 | -; does not currently support this feature (03/17/2002) | |
65 | -; Set to 1 if running under IIS. Default is zero. | |
66 | -; http://php.net/fastcgi.impersonate | |
ce9aa3af | 67 | -;fastcgi.impersonate = 1 |
c0240cb1 | 68 | - |
69 | -; Disable logging through FastCGI connection. PHP's default behavior is to enable | |
70 | -; this feature. | |
71 | -;fastcgi.logging = 0 | |
72 | - | |
73 | -; cgi.rfc2616_headers configuration option tells PHP what type of headers to | |
74 | -; use when sending HTTP response code. If it's set 0 PHP sends Status: header that | |
75 | -; is supported by Apache. When this option is set to 1 PHP will send | |
76 | -; RFC2616 compliant header. | |
77 | -; Default is zero. | |
78 | -; http://php.net/cgi.rfc2616-headers | |
79 | -;cgi.rfc2616_headers = 0 | |
ce9aa3af | 80 | - |
c0240cb1 | 81 | ;;;;;;;;;;;;;;;; |
82 | ; File Uploads ; | |
ce9aa3af | 83 | ;;;;;;;;;;;;;;;; |
86ce2ca6 | 84 | @@ -859,52 +812,9 @@ |
c0240cb1 | 85 | ; If you only provide the name of the extension, PHP will look for it in its |
86 | ; default extension directory. | |
87 | ; | |
88 | -; Windows Extensions | |
89 | -; Note that ODBC support is built in, so no dll is needed for it. | |
90 | -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) | |
91 | -; extension folders as well as the separate PECL DLL download (PHP 5). | |
92 | -; Be sure to appropriately set the extension_dir directive. | |
86ce2ca6 | 93 | -; |
c0240cb1 | 94 | -;extension=php_bz2.dll |
95 | -;extension=php_curl.dll | |
96 | -;extension=php_fileinfo.dll | |
97 | -;extension=php_gd2.dll | |
98 | -;extension=php_gettext.dll | |
99 | -;extension=php_gmp.dll | |
100 | -;extension=php_intl.dll | |
101 | -;extension=php_imap.dll | |
102 | -;extension=php_interbase.dll | |
103 | -;extension=php_ldap.dll | |
104 | -;extension=php_mbstring.dll | |
105 | -;extension=php_exif.dll ; Must be after mbstring as it depends on it | |
106 | -;extension=php_mysql.dll | |
107 | -;extension=php_mysqli.dll | |
108 | -;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client | |
b4025702 | 109 | -;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client |
c0240cb1 | 110 | -;extension=php_openssl.dll |
111 | -;extension=php_pdo_firebird.dll | |
c0240cb1 | 112 | -;extension=php_pdo_mysql.dll |
113 | -;extension=php_pdo_oci.dll | |
114 | -;extension=php_pdo_odbc.dll | |
115 | -;extension=php_pdo_pgsql.dll | |
116 | -;extension=php_pdo_sqlite.dll | |
117 | -;extension=php_pgsql.dll | |
118 | -;extension=php_pspell.dll | |
119 | -;extension=php_shmop.dll | |
9eb543e2 ER |
120 | - |
121 | -; The MIBS data available in the PHP distribution must be installed. | |
122 | -; See http://www.php.net/manual/en/snmp.installation.php | |
123 | -;extension=php_snmp.dll | |
124 | - | |
125 | -;extension=php_soap.dll | |
126 | -;extension=php_sockets.dll | |
9eb543e2 ER |
127 | -;extension=php_sqlite3.dll |
128 | -;extension=php_sybase_ct.dll | |
129 | -;extension=php_tidy.dll | |
130 | -;extension=php_xmlrpc.dll | |
131 | -;extension=php_xsl.dll | |
132 | -;extension=php_zip.dll | |
869f05f7 | 133 | - |
86ce2ca6 ER |
134 | +; Ideally in PLD Linux you should install appropriate php-<extension> or |
135 | +; php-pecl-<extension> package. | |
136 | +; | |
9eb543e2 ER |
137 | ;;;;;;;;;;;;;;;;;;; |
138 | ; Module Settings ; | |
869f05f7 | 139 | ;;;;;;;;;;;;;;;;;;; |
86ce2ca6 ER |
140 | @@ -938,9 +848,9 @@ |
141 | ;filter.default_flags = | |
142 | ||
143 | [iconv] | |
144 | -;iconv.input_encoding = ISO-8859-1 | |
145 | -;iconv.internal_encoding = ISO-8859-1 | |
146 | -;iconv.output_encoding = ISO-8859-1 | |
147 | +iconv.input_encoding = UTF-8 | |
148 | +iconv.internal_encoding = UTF-8 | |
149 | +iconv.output_encoding = UTF-8 | |
150 | ||
151 | [intl] | |
152 | ;intl.default_locale = | |
153 | @@ -1152,6 +1062,9 @@ | |
c0240cb1 | 154 | ; http://php.net/mysql.connect-timeout |
155 | mysql.connect_timeout = 60 | |
156 | ||
157 | +; The name of the character set to use as the default character set. | |
158 | +;mysql.connect_charset=utf8 | |
159 | + | |
160 | ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and | |
161 | ; SQL-Errors will be displayed. | |
162 | ; http://php.net/mysql.trace-mode | |
86ce2ca6 | 163 | @@ -1191,6 +1104,9 @@ |
c0240cb1 | 164 | ; http://php.net/mysqli.default-socket |
165 | mysqli.default_socket = | |
166 | ||
167 | +; The name of the character set to use as the default character set. | |
168 | +;mysqli.connect_charset=utf8 | |
169 | + | |
170 | ; Default host for mysql_connect() (doesn't apply in safe mode). | |
171 | ; http://php.net/mysqli.default-host | |
172 | mysqli.default_host = | |
86ce2ca6 | 173 | @@ -1357,7 +1273,7 @@ |
c0240cb1 | 174 | |
175 | [browscap] | |
176 | ; http://php.net/browscap | |
177 | -;browscap = extra/browscap.ini | |
178 | +browscap = /etc/php/browscap.ini | |
179 | ||
180 | [Session] | |
181 | ; Handler used to store/retrieve data. | |
86ce2ca6 | 182 | @@ -1822,7 +1738,7 @@ |
c0240cb1 | 183 | |
184 | ; Sets the directory name where SOAP extension will put cache files. | |
185 | ; http://php.net/soap.wsdl-cache-dir | |
186 | -soap.wsdl_cache_dir="/tmp" | |
187 | +soap.wsdl_cache_dir="/var/run/php" | |
188 | ||
189 | ; (time to live) Sets the number of second while cached file will be used | |
190 | ; instead of original one. |