ebbf33e124
Changes with Apache 2.0.16 *) Change the default installation directory to /usr/local/apache2, as now defined by the "Apache" layout in config.layout. [Marc Slemko] *) OS/2: Added support for building loadable modules as OS/2 DLLs. [Brian Havard] *) Get MaxRequestsPerChild working with the Windows MPM. [Bill Stoddard] *) Make generic hooks to work, with mod_generic_hook_import/export experimental modules. [Ben Laurie, Will Rowe] *) Fix segfaults for configuration file syntax errors such as "<Directory>" followed by "</Directory" and "<Directory>" followed by "</Directoryz>". [Jeff Trawick] *) Cleanup the --enable-layout option of configure. This makes us use a consistent location for the config.layout file, and it makes configure more portable. [jun-ichiro hagino <itojun@iijlab.net>] *) Changes to 'ab'; fixed int overrun's, added statistics, output in csv/gnuplot format, rudimentary ssl support and various other tweaks to make results more true to what is measured. The upshot of this it turns out that 'ab' has often underreported the true performance of apache. Often by a order of magnitude :-) See talk/paper of Sander Temme <sctemme@covalent.net> at April ApacheCon 2001 for details. [Dirk-Willem van Gulik] *) Clean up mod_cgid's temporary request pool. Besides fixing a storage leak this ensures that some unnecessary pipes are closed. [Jeff Trawick] *) Performance: Add quick_handler hook. This hook is called at the very beginning of the request processing before location_walk, translate_name, etc. This hook is useful for URI keyed content caches like Mike Abbott's Quick Shortcut Cache. [Bill Stoddard] *) top_module global variable renamed to ap_top_module [Perl] *) Move ap_set_last_modified to the core. This is a potentially controversial change, because this is kind of HTTP specific. However many protocols should be able to take advantage of this kind of information. I expect that headers will need one more layer of indirection for multi-protocol work, but this is a small step in the right direction. [Ryan Bloom] *) Enable mod_status by default. This matches what Apache 1.3 does. [Ed Korthof] *) Add a ScriptSock directive to the default config file. This is only enabled when mod_cgid is used. [Taketo Kabe <kabe@sra-tohoku.co.jp>]
100 lines
3 KiB
Text
100 lines
3 KiB
Text
$NetBSD: patch-ae,v 1.2 2001/04/08 10:55:22 itojun Exp $
|
|
|
|
--- docs/conf/httpd-std.conf.orig Mon Mar 26 01:54:48 2001
|
|
+++ docs/conf/httpd-std.conf Sun Apr 8 12:05:13 2001
|
|
@@ -58,13 +58,13 @@
|
|
# DISK. The PID of the main server process is automatically appended to
|
|
# the filename.
|
|
#
|
|
-#LockFile logs/accept.lock
|
|
+#LockFile /var/log/httpd/accept.lock
|
|
|
|
#
|
|
# PidFile: The file in which the server should record its process
|
|
# identification number when it starts.
|
|
#
|
|
-PidFile logs/httpd.pid
|
|
+PidFile /var/log/httpd/httpd.pid
|
|
|
|
#
|
|
# ScoreBoardFile: File used to store internal server process information.
|
|
@@ -73,7 +73,7 @@
|
|
# no two invocations of Apache share the same scoreboard file.
|
|
#
|
|
<IfModule !perchild.c>
|
|
-ScoreBoardFile logs/apache_runtime_status
|
|
+ScoreBoardFile /var/log/httpd/apache_runtime_status
|
|
</IfModule>
|
|
|
|
#
|
|
@@ -158,6 +158,9 @@
|
|
#Listen 3000
|
|
#Listen 12.34.56.78:80
|
|
|
|
+Listen 0.0.0.0:80
|
|
+Listen [::]:80
|
|
+
|
|
#
|
|
# BindAddress: You can support virtual hosts with this option. This directive
|
|
# is used to tell the server which IP address to listen to. It can either
|
|
@@ -372,7 +375,7 @@
|
|
# TypesConfig describes where the mime.types file (or equivalent) is
|
|
# to be found.
|
|
#
|
|
-TypesConfig conf/mime.types
|
|
+TypesConfig /usr/pkg/etc/httpd/mime.types
|
|
|
|
#
|
|
# DefaultType is the default MIME type the server will use for a document
|
|
@@ -397,7 +400,7 @@
|
|
# module is part of the server.
|
|
#
|
|
<IfModule mod_mime_magic.c>
|
|
- MIMEMagicFile conf/magic
|
|
+ MIMEMagicFile /usr/pkg/etc/httpd/magic
|
|
</IfModule>
|
|
|
|
#
|
|
@@ -417,7 +420,7 @@
|
|
# 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 logs/error_log
|
|
+ErrorLog /var/log/httpd/error_log
|
|
|
|
#
|
|
# LogLevel: Control the number of messages logged to the error_log.
|
|
@@ -442,20 +445,20 @@
|
|
# define per-<VirtualHost> access logfiles, transactions will be
|
|
# logged therein and *not* in this file.
|
|
#
|
|
-CustomLog logs/access_log common
|
|
+CustomLog /var/log/httpd/access_log common
|
|
|
|
#
|
|
# If you would like to have agent and referer logfiles, uncomment the
|
|
# following directives.
|
|
#
|
|
-#CustomLog logs/referer_log referer
|
|
-#CustomLog logs/agent_log agent
|
|
+#CustomLog /var/log/httpd/referer_log referer
|
|
+#CustomLog /var/log/httpd/agent_log agent
|
|
|
|
#
|
|
# If you prefer a single logfile with access, agent, and referer information
|
|
# (Combined Logfile Format) you can use the following directive.
|
|
#
|
|
-#CustomLog logs/access_log combined
|
|
+#CustomLog /var/log/httpd/access_log combined
|
|
|
|
#
|
|
# Optionally add a line containing the server version and virtual host
|
|
@@ -944,6 +947,6 @@
|
|
# ServerAdmin webmaster@dummy-host.example.com
|
|
# DocumentRoot /www/docs/dummy-host.example.com
|
|
# ServerName dummy-host.example.com
|
|
-# ErrorLog logs/dummy-host.example.com-error_log
|
|
-# CustomLog logs/dummy-host.example.com-access_log common
|
|
+# ErrorLog /var/log/httpd/dummy-host.example.com-error_log
|
|
+# CustomLog /var/log/httpd/dummy-host.example.com-access_log common
|
|
#</VirtualHost>
|