OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2007 19:27:36
Branch: HEAD Handle: 2007062218273600
Modified files:
openpkg-src/apache apache.base
Log:
add a bunch of additional things which are now possible with Apache 2
Summary:
Revision Changes Path
1.24 +43 -5 openpkg-src/apache/apache.base
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.base
============================================================================
$ cvs diff -u -r1.23 -r1.24 apache.base
--- openpkg-src/apache/apache.base 22 Jun 2007 16:37:36 -0000 1.23
+++ openpkg-src/apache/apache.base 22 Jun 2007 17:27:36 -0000 1.24
@@ -16,10 +16,14 @@
Group @l_ngrp@
# runtime files
+LockFile @l_prefix@/var/apache/run/accept.lock
<IfModule mpm_prefork_module>
PidFile @l_prefix@/var/apache/run/apache.pid
ScoreBoardFile @l_prefix@/var/apache/run/apache.sb
</IfModule>
+<IfModule cgid_module>
+ ScriptSock @l_prefix@/var/apache/run/apache.cgisock
+</IfModule>
# server behaviour
Timeout 300
@@ -48,6 +52,12 @@
# access logging
<IfModule log_config_module>
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\"
\"%{User-Agent}i\"" combined
+ <IfModule logio_module>
+ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\"
\"%{User-Agent}i\" %I %O" combined_io
+ </IfModule>
+ <IfModule ssl_module>
+ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\"
\"%{User-Agent}i\" %{SSL_PROTOCOL}x %{SSL_CIPHER}x" combined_ssl
+ </IfModule>
LogFormat "%h %l %u %t \"%r\" %>s %b" common
LogFormat "%{Referer}i -> %U" referer
LogFormat "%{User-agent}i" agent
@@ -59,6 +69,13 @@
ErrorLog @l_prefix@/var/apache/log/error.log
ServerSignature on
+# script logging
+<IfModule cgi_module>
+ ScriptLog @l_prefix@/var/apache/log/script.log
+ ScriptLogBuffer 1024
+ ScriptLogLength 10485760
+</IfModule>
+
# secure root directory
<Directory />
Options FollowSymLinks
@@ -82,6 +99,7 @@
# default directories and files
<IfModule userdir_module>
UserDir public_html
+ UserDir disabled root
</IfModule>
<IfModule dir_module>
DirectoryIndex index.html
@@ -155,11 +173,15 @@
</Location>
</IfModule>
-# automatic CGI recognition by extension
+# automatic CGI and SSI recognition
<IfModule mime_module>
<IfModule cgi_module>
AddHandler cgi-script .cgi
</IfModule>
+ <IfModule include_module>
+ AddType text/html .shtml
+ AddOutputFilter INCLUDES .shtml
+ </IfModule>
</IfModule>
# multi-language error documents
@@ -183,7 +205,7 @@
# automatic directory indexing
<IfModule autoindex_module>
- IndexOptions FancyIndexing
+ IndexOptions FancyIndexing HTMLTable VersionSort
ReadmeName README
HeaderName HEADER
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
@@ -218,7 +240,9 @@
DefaultType text/plain
<IfModule mime_module>
TypesConfig @l_prefix@/etc/apache/mime.types
- AddType application/x-tar .tgz
+ AddType application/x-compress .Z
+ AddType application/x-gzip .gz .tgz
+ AddType application/x-tar .tar
AddEncoding x-compress Z
AddEncoding x-gzip gz tgz
AddLanguage da .dk
@@ -257,7 +281,9 @@
AddCharset UTF-8 .utf8
</IfModule>
<IfModule negotiation_module>
- LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz
ca es sv tw
+ AddHandler type-map .var
+ LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl
nn no pl pt pt-BR ru sv zh-CN zh-TW
+ ForceLanguagePriority Prefer Fallback
</IfModule>
<IfModule mime_magic_module>
MIMEMagicFile @l_prefix@/etc/apache/mime.magic
@@ -268,7 +294,7 @@
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
SSLMutex sem
- SSLSessionCache shm:@l_prefix@/var/apache/run/ssl_scache(512000)
+ SSLSessionCache
shm:@l_prefix@/var/apache/run/apache.ssl_scache(512000)
SSLSessionCacheTimeout 300
SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
<IfModule setenvif_module>
@@ -286,6 +312,18 @@
AddType application/x-pkcs7-crl .crl
</IfModule>
+# DAV support
+<IfModule dav_module>
+ DavLockDB @l_prefix@/var/apache/run/apache.davlock
+ BrowserMatch "Microsoft Data Access Internet Publishing Provider"
redirect-carefully
+ BrowserMatch "MS FrontPage"
redirect-carefully
+ BrowserMatch "^WebDrive"
redirect-carefully
+ BrowserMatch "^WebDAVFS/1.[0123]"
redirect-carefully
+ BrowserMatch "^gnome-vfs/1.0"
redirect-carefully
+ BrowserMatch "^XML Spy"
redirect-carefully
+ BrowserMatch "^Dreamweaver-WebDAV-SCM1"
redirect-carefully
+</IfModule>
+
# Include Extension Configurations
Include "@l_prefix@/etc/apache/apache.d/*.conf"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
