Sync with HEAD.

1 files changed, 48 insertions, 13 deletions

diff --git a/etc/rc b/etc/rc
index bb67ee7..ef1feef 100755
--- a/etc/rc
+++ b/etc/rc
@@ -219,31 +219,66 @@ echo "done."
 cap_mkdb /etc/login.conf
 
 if [ "$PLATFORM" != "cdrom" ]; then
-# Populate a dummy php.ini to avoid
-# the file being clobbered and the firewall
-# not being able to boot back up.
-cat >/usr/local/lib/php.ini <<EOF
+	# Populate a dummy php.ini to avoid
+	# the file being clobbered and the firewall
+	# not being able to boot back up.
+	cat >/usr/local/lib/php.ini <<EOF
 output_buffering = "0"
 implicit_flush = true
 magic_quotes_gpc = Off
 max_execution_time = 99999999
 max_input_time = 99999999
-register_argc_argv = Off
+register_argc_argv = On
 file_uploads = On
 upload_tmp_dir = /tmp
-upload_max_filesize = 90M
-post_max_size = 90M
+upload_max_filesize = 100M
+post_max_size = 100M
 html_errors = Off
+zlib.output_compression = On
+zlib.output_compression_level = 5
 include_path = ".:/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg"
-apc.enabled="1"
-apc.enable_cli="1"
-apc.shm_size="30"
-extension_dir=/usr/local/lib/php/extensions/no-debug-non-zts-20020429/
+
+; add additional extensions below
+; standard PHP extension
 extension=apc.so
-extension=radius.so
+extension=pcre.so
+extension=bz2.so
+extension=bcmath.so
+extension=ctype.so
+extension=curl.so
+extension=gettext.so
+extension=mbstring.so
+extension=pcntl.so
+extension=posix.so
+extension=readline.so
+extension=session.so
+extension=shmop.so
+extension=sysvmsg.so
+extension=sysvsem.so
+extension=sysvshm.so
+extension=tokenizer.so
+extension=xml.so
+extension=zlib.so
+
+; standard PHP extensions currently beeing unused
+;extension=json.so
+;extension=ncurses.so
+;xmlreader.so
+;xmlwriter.so
+
+;[xdebug]
+;xdebug.remote_enable = On
+;xdebug.default_enable = On
+;xdebug.remote_mode = On
+;xdebug.remote_handler = dbgp
+;xdebug.remote_host = 127.0.0.1
+;xdebug.remote_port = 17869
+;xdebug.idekey = devphp
+
 
 EOF
-fi
+
+cp /usr/local/lib/php.ini /usr/local/etc/
 
 rm -f /cf/conf/backup/backup.cache