Sync w/ HEAD

1 files changed, 57 insertions, 15 deletions

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 5358b2f..1576f45 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -61,21 +61,63 @@ function opcode_cache_configuration() {
 		$php_conf = file_get_contents("/usr/local/lib/php.ini");
 
 $php_ini = <<<EOFF
-output_buffering = "0"
-implicit_flush = true
-magic_quotes_gpc = Off
-max_execution_time = 99999999
-max_input_time = 99999999
-register_argc_argv = On
-file_uploads = On
-extension_dir=/usr/local/lib/php/extensions/no-debug-non-zts-20020429/
-upload_tmp_dir = /tmp
-upload_max_filesize = 100M
-post_max_size = 100M
-html_errors = Off
-include_path = ".:/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg"
-extension=radius.so
-extension=ldap.so
+	output_buffering = "0"
+	implicit_flush = true
+	magic_quotes_gpc = Off
+	max_execution_time = 99999999
+	max_input_time = 99999999
+	register_argc_argv = On
+	file_uploads = On
+	upload_tmp_dir = /tmp
+	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"
+	extension_dir=/usr/local/lib/php/20060613/
+
+	; add additional extensions below
+	;extension=xdebug.so
+	;extension=suhosin.so
+	;extension=uuid.so
+
+	; standard PHP extension
+	extension=apc.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
+
 {$opcode_cacher}
 
 EOFF;