summaryrefslogtreecommitdiff
path: root/www/apache-current/patches/patch-ae
blob: 0d5eb3e707fb777b0ce932b65668d00f6bc172a2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
$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>