bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade apache to 2.2.9 (#3671)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11653 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian
2008-07-05 12:59:10 +00:00
parent de8b93b56b
commit 1c43ae7615
6 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
net/apache/files/etc/apache/httpd.conf
View File

@ -13,9 +13,9 @@
# Configuration and logfile names: If the filenames you specify for many
# of the server's control files begin with "/" (or "drive:/" for Win32), the
# server will use that explicit path. If the filenames do *not* begin
# with "/", the value of ServerRoot is prepended -- so "/var/log/foo.log"
# with "/", the value of ServerRoot is prepended -- so "/var/log/foo_log"
# with ServerRoot set to "/usr" will be interpreted by the
# server as "/usr//var/log/foo.log".
# server as "/usr//var/log/foo_log".
#
# ServerRoot: The top of the directory tree under which the server's
@ -53,6 +53,7 @@ Listen 80
#
<IfModule !mpm_netware_module>
<IfModule !mpm_winnt_module>
#
# If you wish httpd to run as a different user or group, you must run
# httpd as root initially and it will switch.
@ -63,6 +64,8 @@ Listen 80
#
User nobody
Group nogroup
</IfModule>
</IfModule>
# 'Main' server configuration
@ -180,7 +183,7 @@ DocumentRoot "/usr/share/htdocs"
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
ErrorLog /var/log/error_log
ErrorLog "/var/log/error_log"
#
# LogLevel: Control the number of messages logged to the error_log.
@ -209,13 +212,13 @@ LogLevel debug
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
CustomLog /var/log/access_log common
CustomLog "/var/log/access_log" common
#
# If you prefer a logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
#CustomLog /var/log/access_log combined
#CustomLog "/var/log/access_log" combined
</IfModule>
<IfModule alias_module>
@ -364,37 +367,37 @@ EnableSendfile off
# necessary.
# Server-pool management (MPM specific)
## Include /etc/apache/extra/httpd-mpm.conf
#Include /etc/apache/extra/httpd-mpm.conf
# Multi-language error messages
## Include /etc/apache/extra/httpd-multilang-errordoc.conf
#Include /etc/apache/extra/httpd-multilang-errordoc.conf
# Fancy directory listings
## Include /etc/apache/extra/httpd-autoindex.conf
#Include /etc/apache/extra/httpd-autoindex.conf
# Language settings
## Include /etc/apache/extra/httpd-languages.conf
#Include /etc/apache/extra/httpd-languages.conf
# User home directories
## Include /etc/apache/extra/httpd-userdir.conf
#Include /etc/apache/extra/httpd-userdir.conf
# Real-time info on requests and configuration
## Include /etc/apache/extra/httpd-info.conf
#Include /etc/apache/extra/httpd-info.conf
# Virtual hosts
## Include /etc/apache/extra/httpd-vhosts.conf
#Include /etc/apache/extra/httpd-vhosts.conf
# Local access to the Apache HTTP Server Manual
## Include /etc/apache/extra/httpd-manual.conf
#Include /etc/apache/extra/httpd-manual.conf
# Distributed authoring and versioning (WebDAV)
## Include /etc/apache/extra/httpd-dav.conf
#Include /etc/apache/extra/httpd-dav.conf
# Various default settings
## Include /etc/apache/extra/httpd-default.conf
#Include /etc/apache/extra/httpd-default.conf
# Secure (SSL/TLS) connections
## Include /etc/apache/extra/httpd-ssl.conf
#Include /etc/apache/extra/httpd-ssl.conf
#
# Note: The following must must be present to support
# starting without SSL on platforms with no /dev/random equivalent