wsanchez 00/01/26 12:10:45
Modified: . STATUS
conf httpd.conf-dist
src/main http_main.c
Log:
STATUS
Revision Changes Path
1.801 +2 -2 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.800
retrieving revision 1.801
diff -u -r1.800 -r1.801
--- STATUS 2000/01/26 15:38:57 1.800
+++ STATUS 2000/01/26 20:10:23 1.801
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 2000/01/26 15:38:57 $]
+ Last modified at [$Date: 2000/01/26 20:10:23 $]
Release:
@@ -573,7 +573,7 @@
mips-sgi-irix6.4 no Lars Eilebrecht
mips-siemens-reliantunix5.4 yes Martin Kraemer
OS/2 yes Brian Havard
- powerpc-apple-rhapsody5.3 no Wilfredo Sanchez
+ powerpc-apple-rhapsody5.6 yes Wilfredo Sanchez
rs6000-ibm-aix3.2.5 no Sameer Parekh
rs6000-ibm-aix4.1 no Lars Eilebrecht
rs6000-ibm-aix4.2 no Bill Stoddard
1.52 +33 -0 apache-1.3/conf/httpd.conf-dist
Index: httpd.conf-dist
===================================================================
RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- httpd.conf-dist 1999/12/09 16:01:09 1.51
+++ httpd.conf-dist 2000/01/26 20:10:32 1.52
@@ -328,7 +328,9 @@
# UserDir: The name of the directory which is appended onto a user's home
# directory if a ~user request is received.
#
+<IfModule mod_userdir.c>
UserDir public_html
+</IfModule>
#
# Control access to UserDir directories. The following is an example
@@ -351,7 +353,9 @@
# DirectoryIndex: Name of the file or files to use as a pre-written HTML
# directory index. Separate multiple entries with spaces.
#
+<IfModule mod_dir.c>
DirectoryIndex index.html
+</IfModule>
#
# AccessFileName: The name of the file to look for in each directory
@@ -397,7 +401,9 @@
# TypesConfig describes where the mime.types file (or equivalent) is
# to be found.
#
+<IfModule mod_mime.c>
TypesConfig conf/mime.types
+</IfModule>
#
# DefaultType is the default MIME type the server will use for a document
@@ -495,6 +501,9 @@
# Aliases: Add here as many aliases as you need (with no limit). The format
is
# Alias fakename realname
#
+<IfModule mod_alias.c>
+
+#
# Note that if you include a trailing / on fakename then the server will
# require it to be present in the URL. So "/icons" isn't aliased in this
# example, only "/icons/"..
@@ -529,6 +538,9 @@
Allow from all
</Directory>
+</IfModule>
+# End of aliases.
+
#
# Redirect allows you to tell clients about documents which used to exist in
# your server's namespace, but do not anymore. This allows you to tell the
@@ -539,6 +551,7 @@
#
# Directives controlling the display of server-generated directory listings.
#
+<IfModule mod_autoindex.c>
#
# FancyIndexing is whether you want fancy directory indexing or standard
@@ -615,6 +628,14 @@
#
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
+</IfModule>
+# End of indexing directives.
+
+#
+# Document types.
+#
+<IfModule mod_mime.c>
+
#
# AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress
# information on the fly. Note: Not all browsers support this.
@@ -669,7 +690,9 @@
# Just list the languages in decreasing order of preference. We have
# more or less alphabetized them here. You probably want to change this.
#
+<IfModule mod_negotiation.c>
LanguagePriority en da nl et fr de el it pt ltz ca es sv
+</IfModule>
#
# AddType allows you to tweak mime.types without actually editing it, or to
@@ -722,6 +745,9 @@
#
#AddHandler type-map var
+</IfModule>
+# End of document types.
+
#
# Action lets you define media types that will execute a script whenever
# a matching file is called. This eliminates the need for repeated URL
@@ -763,6 +789,11 @@
# request will *not* be available to such a script.
#
+# Customize behaviour based on the browser
+#
+<IfModule mod_setenvif.c>
+
+#
# The following directives modify normal HTTP response behavior.
# The first directive disables keepalive for Netscape 2.x and browsers that
# spoof it. There are known problems with these browser implementations.
@@ -781,6 +812,8 @@
BrowserMatch "RealPlayer 4\.0" force-response-1.0
BrowserMatch "Java/1\.0" force-response-1.0
BrowserMatch "JDK/1\.0" force-response-1.0
+
+</IfModule>
#
# Allow server status reports, with the URL of
http://servername/server-status
1.490 +5 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -r1.489 -r1.490
--- http_main.c 2000/01/12 15:54:58 1.489
+++ http_main.c 2000/01/26 20:10:38 1.490
@@ -4964,6 +4964,11 @@
child_timeouts = !ap_standalone || one_process;
+#ifdef BEOS
+ /* make sure we're running in single_process mode - Yuck! */
+ one_process = 1;
+#endif
+
#ifndef TPF
if (ap_standalone) {
ap_open_logs(server_conf, plog);
