From 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 04:14:10 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

---
 server/server.sh |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/server.sh b/server/server.sh
index 522e0d5..2d05d4f 100755
--- a/server/server.sh
+++ b/server/server.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 
 . /etc/profile
@@ -14,7 +15,15 @@
 fi
 
 cd /usr/local/ispconfig/server
-/usr/bin/php -q /usr/local/ispconfig/server/server.php
+/usr/bin/php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    /usr/local/ispconfig/server/server.php
 
 cd /usr/local/ispconfig/security
-/usr/bin/php -q /usr/local/ispconfig/security/check.php
+/usr/bin/php -q \
+    -d disable_classes= \
+    -d disable_functions= \
+    -d open_basedir= \
+    /usr/local/ispconfig/security/check.php

--
Gitblit v1.9.1