summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube/bootstrap.php
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-03-28 17:35:04 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-03-28 17:35:04 +0100
commit589083a94c2e5d50914fba99c80c18d730af697a (patch)
treefb0084b564660a86a7c86f12984ff5cd34aff299 /program/lib/Roundcube/bootstrap.php
parent0fcb2b139bf0c50dec3b82898434f203c21d847f (diff)
Skip some irrelevant ini checks in CLI mode
Diffstat (limited to 'program/lib/Roundcube/bootstrap.php')
-rw-r--r--program/lib/Roundcube/bootstrap.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 0640a94..929a4ff 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -31,12 +31,19 @@ $config = array(
// critical PHP settings here. Only these, which doesn't provide
// an error/warning in the logs later. See (#1486307).
'mbstring.func_overload' => 0,
- 'suhosin.session.encrypt' => 0,
- 'session.auto_start' => 0,
- 'file_uploads' => 1,
'magic_quotes_runtime' => 0,
'magic_quotes_sybase' => 0, // #1488506
);
+
+// check these additional ini settings if not called via CLI
+if (php_sapi_name() != 'cli') {
+ $config += array(
+ 'suhosin.session.encrypt' => 0,
+ 'session.auto_start' => 0,
+ 'file_uploads' => 1,
+ );
+}
+
foreach ($config as $optname => $optval) {
if ($optval != ini_get($optname) && @ini_set($optname, $optval) === false) {
die("ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n"