Skip to content

Commit 8603b4a

Browse files
author
Marius Cramer
committed
Merge branch 'feature/independent-php' into 'master'
Ensure the internal PHP scripts work even if system-wide PHP settings are set Another solution would be to reference the `php.ini` in `./server/lib` from all scripts...but maybe that's a bit of an overkill. See: http://bugtracker.ispconfig.org/index.php?do=details&task_id=3293&project=3&string=php&type[0]=&sev[0]=&pri[0]=&due[0]=&reported[0]=&cat[0]=&status[0]=open&percent[0]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=&closedto=&pagenum=2 See merge request !188
2 parents 6e1f2d5 + 4bc0309 commit 8603b4a

File tree

7 files changed

+41
-8
lines changed

7 files changed

+41
-8
lines changed

install/tpl/apache_apps_fcgi_starter.master

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ PHPRC={fastcgi_phpini_path}
33
export PHPRC
44
export PHP_FCGI_MAX_REQUESTS=5000
55
export PHP_FCGI_CHILDREN=1
6-
exec {fastcgi_bin} -d magic_quotes_gpc=off
6+
exec {fastcgi_bin} -d \
7+
-d disable_classes= \
8+
-d disable_functions= \
9+
-d magic_quotes_gpc=off \
10+
-d open_basedir=

install/tpl/apache_ispconfig_fcgi_starter.master

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ PHPRC={fastcgi_phpini_path}
33
export PHPRC
44
export PHP_FCGI_MAX_REQUESTS=5000
55
export PHP_FCGI_CHILDREN=1
6-
exec {fastcgi_bin} -d magic_quotes_gpc=off -d session.save_path=/usr/local/ispconfig/interface/temp
6+
exec {fastcgi_bin} \
7+
-d disable_classes= \
8+
-d disable_functions= \
9+
-d magic_quotes_gpc=off \
10+
-d open_basedir= \
11+
-d session.save_path=/usr/local/ispconfig/interface/temp

server/cron.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
1010
fi
1111

1212
cd /usr/local/ispconfig/server
13-
/usr/bin/php -q /usr/local/ispconfig/server/cron.php
13+
/usr/bin/php -q \
14+
-d disable_classes= \
15+
-d disable_functions= \
16+
-d open_basedir= \
17+
/usr/local/ispconfig/server/cron.php

server/scripts/ispconfig_update.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
php -q /usr/local/ispconfig/server/scripts/ispconfig_update.php
3+
php -q \
4+
-d disable_classes= \
5+
-d disable_functions= \
6+
-d open_basedir= \
7+
/usr/local/ispconfig/server/scripts/ispconfig_update.php

server/scripts/update_from_dev.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ cd /tmp
44
wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/repository/archive.tar.gz?ref=master"
55
tar xzf ispconfig3-dev.tar.gz
66
cd ispconfig3.git/install
7-
php -q update.php
7+
php -q \
8+
-d disable_classes= \
9+
-d disable_functions= \
10+
-d open_basedir= \
11+
update.php
812
cd /tmp
913
rm -rf /tmp/ispconfig3.git /tmp/ispconfig3-dev.tar.gz
1014

server/scripts/update_from_tgz.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ if [ -f ISPConfig-3-stable.tar.gz ]
1212
then
1313
tar xvfz ISPConfig-3-stable.tar.gz
1414
cd ispconfig3_install/install/
15-
php -q update.php
15+
php -q \
16+
-d disable_classes= \
17+
-d disable_functions= \
18+
-d open_basedir= \
19+
update.php
1620
rm -rf /tmp/ispconfig3_install/install
1721
rm -f ISPConfig-3-stable.tar.gz
1822
else

server/server.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,15 @@ if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
1515
fi
1616

1717
cd /usr/local/ispconfig/server
18-
/usr/bin/php -q /usr/local/ispconfig/server/server.php
18+
/usr/bin/php -q \
19+
-d disable_classes= \
20+
-d disable_functions= \
21+
-d open_basedir= \
22+
/usr/local/ispconfig/server/server.php
1923

2024
cd /usr/local/ispconfig/security
21-
/usr/bin/php -q /usr/local/ispconfig/security/check.php
25+
/usr/bin/php -q \
26+
-d disable_classes= \
27+
-d disable_functions= \
28+
-d open_basedir= \
29+
/usr/local/ispconfig/security/check.php

0 commit comments

Comments
 (0)