summaryrefslogtreecommitdiff
path: root/www/apache22/files/patch-docs:conf:httpd-std.conf
blob: f70a76bf17df9f822d1a441d813404dddd083f09 (plain) (blame)
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
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
--- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
+++ docs/conf/httpd-std.conf	Sun Apr  8 04:26:54 2001
@@ -64,7 +64,7 @@
 # PidFile: The file in which the server should record its process
 # identification number when it starts.
 #
-PidFile logs/httpd.pid
+PidFile /var/run/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/run/apache_runtime_status
 </IfModule>
 
 #
@@ -182,6 +182,28 @@
 #
 # Example:
 # LoadModule foo_module modules/mod_foo.so
+#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
+#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
+#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
+#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
+#LoadModule cgid_module			libexec/apache/mod_cgid.so
+#LoadModule dav_module			libexec/apache/mod_dav.so
+#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
+#LoadModule digest_module		libexec/apache/mod_digest.so
+#LoadModule expires_module		libexec/apache/mod_expires.so
+#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
+#LoadModule headers_module		libexec/apache/mod_headers.so
+#LoadModule imap_module			libexec/apache/mod_imap.so
+#LoadModule include_module		libexec/apache/mod_include.so
+#LoadModule info_module			libexec/apache/mod_info.so
+#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
+#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
+#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
+#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
+#LoadModule speling_module		libexec/apache/mod_speling.so
+#LoadModule status_module		libexec/apache/mod_status.so
+#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
+#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
 
 ### Section 2: 'Main' server configuration
 #
@@ -221,7 +243,7 @@
 #  don't use Group #-1 on these systems!
 #
 User nobody
-Group #-1
+Group nogroup
 
 #
 # ServerAdmin: Your address, where problems with the server should be
@@ -249,7 +271,7 @@
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "@@ServerRoot@@/htdocs"
+DocumentRoot "@@ServerRoot@@/www/data"
 
 #
 # Each directory to which Apache has access, can be configured with respect
@@ -274,7 +296,7 @@
 #
 # This should be changed to whatever you set DocumentRoot to.
 #
-<Directory "@@ServerRoot@@/htdocs">
+<Directory "@@ServerRoot@@/www/data">
 
 #
 # This may also be "None", "All", or any combination of "Indexes",
@@ -326,7 +348,22 @@
 # DirectoryIndex: Name of the file or files to use as a pre-written HTML
 # directory index.  Separate multiple entries with spaces.
 #
-DirectoryIndex index.html
+<IfModule mod_php3.c>
+    <IfModule mod_php4.c>
+        DirectoryIndex index.php index.php3 index.html
+    </IfModule>
+    <IfModule !mod_php4.c>
+        DirectoryIndex index.php3 index.html
+    </IfModule>
+</IfModule>
+<IfModule !mod_php3.c>
+    <IfModule mod_php4.c>
+        DirectoryIndex index.php index.html
+    </IfModule>
+    <IfModule !mod_php4.c>
+        DirectoryIndex index.html
+    </IfModule>
+</IfModule>
 
 #
 # AccessFileName: The name of the file to look for in each directory
@@ -372,7 +409,7 @@
 # TypesConfig describes where the mime.types file (or equivalent) is
 # to be found.
 #
-TypesConfig conf/mime.types
+TypesConfig etc/apache/mime.types
 
 #
 # DefaultType is the default MIME type the server will use for a document
@@ -397,7 +434,7 @@
 # module is part of the server.
 #
 <IfModule mod_mime_magic.c>
-    MIMEMagicFile conf/magic
+    MIMEMagicFile etc/apache/magic
 </IfModule>
 
 #
@@ -417,7 +454,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,7 +479,7 @@
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog logs/access_log common
+#CustomLog logs/access_log common
 
 #
 # If you would like to have agent and referer logfiles, uncomment the
@@ -455,7 +492,7 @@
 # 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
@@ -474,9 +511,9 @@
 # require it to be present in the URL.  So "/icons" isn't aliased in this
 # example, only "/icons/"..
 #
-Alias /icons/ "@@ServerRoot@@/icons/"
+Alias /icons/ "@@ServerRoot@@/www/icons/"
 
-<Directory "@@ServerRoot@@/icons">
+<Directory "@@ServerRoot@@/www/icons">
     Options Indexes MultiViews
     AllowOverride None
     Order allow,deny
@@ -491,7 +528,7 @@
 # The same rules about trailing "/" apply to ScriptAlias directives as to
 # Alias.
 #
-ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
+ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/"
 
 <IfModule mod_cgid.c>
 #
@@ -505,7 +542,7 @@
 # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
-<Directory "@@ServerRoot@@/cgi-bin">
+<Directory "@@ServerRoot@@/www/cgi-bin">
     AllowOverride None
     Options None
     Order allow,deny
@@ -657,6 +694,7 @@
 AddLanguage ja .ja
 AddLanguage pl .po
 AddLanguage kr .kr
+AddLanguage ko .kr
 AddLanguage pt .pt
 AddLanguage no .no
 AddLanguage pt-br .pt-br
@@ -741,8 +779,17 @@
 # For example, the PHP3 module (not part of the Apache distribution - see
 # http://www.php.net) will typically use:
 #
-#AddType application/x-httpd-php3 .php3
-#AddType application/x-httpd-php3-source .phps
+<IfModule mod_php3.c>
+    AddType application/x-httpd-php3 .php3
+    AddType application/x-httpd-php3-source .php3s
+</IfModule>
+#
+# And for PHP 4.x, use:
+#
+<IfModule mod_php4.c>
+    AddType application/x-httpd-php .php
+    AddType application/x-httpd-php-source .phps
+</IfModule>
 
 AddType application/x-tar .tgz