packages: roundcubemail/apache.conf - merged bits from .htaccess

[glen]

Author: glen                         Date: Fri Apr 20 17:17:37 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged bits from .htaccess

---- Files affected:
packages/roundcubemail:
   apache.conf (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/roundcubemail/apache.conf
diff -u packages/roundcubemail/apache.conf:1.10 packages/roundcubemail/apache.conf:1.11
--- packages/roundcubemail/apache.conf:1.10	Tue Jan 18 08:26:05 2011
+++ packages/roundcubemail/apache.conf	Fri Apr 20 19:17:32 2012
@@ -1,7 +1,6 @@
 Alias /roundcube /usr/share/roundcube
 <Directory /usr/share/roundcube>
 	AddDefaultCharset	UTF-8
-	php_value	upload_max_filesize	2M
 	php_admin_value	open_basedir	"/usr/share/roundcube:/usr/share/pear:/usr/share/php:/usr/share/misc:/var/lib/roundcube:/var/log/roundcube:/etc/webapps/roundcube:/etc/mail:/tmp"
 
 	<FilesMatch "(\.inc|\~)$|^_">
@@ -11,6 +10,57 @@
 
 	Order deny,allow
 	Allow from all
+
+	php_flag	display_errors	Off
+	php_flag	log_errors	On
+	# php_value	error_log	logs/errors
+
+	php_value	upload_max_filesize	5M
+	php_value	post_max_size		6M
+	php_value	memory_limit		64M
+
+	php_flag	zlib.output_compression		Off
+	php_flag	magic_quotes_gpc		Off
+	php_flag	magic_quotes_runtime		Off
+	php_flag	zend.ze1_compatibility_mode	Off
+	php_flag 	suhosin.session.encrypt 	Off
+
+	#php_value	session.cookie_path		/
+	php_flag	session.auto_start	Off
+	php_value	session.gc_maxlifetime	21600
+	php_value	session.gc_divisor	500
+	php_value	session.gc_probability	1
+
+	# http://bugs.php.net/bug.php?id=30766
+	php_value	mbstring.func_overload	0
+
+	<IfModule mod_rewrite.c>
+		RewriteEngine On
+		RewriteRule ^favicon.ico$ skins/default/images/favicon.ico
+		# security rules
+		RewriteRule .svn/ - [F]
+		RewriteRule ^README|INSTALL|LICENSE|SQL|bin|CHANGELOG$ - [F]
+	</IfModule>
+
+	<IfModule mod_deflate.c>
+		SetOutputFilter DEFLATE
+	</IfModule>
+
+	<IfModule mod_headers.c>
+	# replace 'append' with 'merge' for Apache version 2.2.9 and later
+	#Header append Cache-Control public env=!NO_CACHE
+	</IfModule>
+
+	<IfModule mod_expires.c>
+		ExpiresActive On
+		ExpiresDefault "access plus 1 month"
+	</IfModule>
+
+	FileETag MTime Size
+
+	<IfModule mod_autoindex.c>
+		Options -Indexes
+	</ifModule>
 </Directory>
 
 <Directory /usr/share/roundcube/config>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/roundcubemail/apache.conf?r1=1.10&r2=1.11