Argh. this commit didn't make it when I did it earlier - apache 1.3.14 + mod_ssl 2.7.1 merge

12 files changed, 415 insertions, 328 deletions

diff --git a/usr.sbin/httpd/ABOUT_APACHE b/usr.sbin/httpd/ABOUT_APACHE
index 0a3e114be83..d7638715c62 100644
--- a/usr.sbin/httpd/ABOUT_APACHE
+++ b/usr.sbin/httpd/ABOUT_APACHE
@@ -1,9 +1,9 @@
 
                      The Apache HTTP Server Project
 
-                         http://www.apache.org/
+                       http://www.apache.org/httpd
 
-                              February 1999
+                               July 2000
 
 The Apache Project is a collaborative software development effort aimed
 at creating a robust, commercial-grade, featureful, and freely-available
@@ -70,34 +70,44 @@ is today more widely used than all other web servers combined.
 
  ============================================================================
 
-Current Apache Group in alphabetical order as of 14 February 1999:
+Current Apache Group in alphabetical order as of 27 July 2000:
 
-   Brian Behlendorf       O'Reilly and Associates, California 
+   Brian Behlendorf       Collab.Net, California 
+   Ryan Bloom             Covalent Technologies, California 
    Ken Coar               IBM Corporation, Research Triangle Park, NC, USA
-   Mark J. Cox            C2Net Europe, UK 
-   Lars Eilebrecht        Cable & Wireless ECRC, Munich, Germany 
+   Mark J. Cox            Red Hat, England
+   Lars Eilebrecht        CyberSolutions, Munich, Germany 
    Ralf S. Engelschall    Munich, Germany.
-   Roy T. Fielding        UC Irvine, California 
+   Roy T. Fielding        eBuilt, California 
+   Tony Finch             Covalent Technologies, UK
    Dean Gaudet            Critical Path, California 
-   Rob Hartill            Internet Movie DB, UK 
+   Dirk-Willem van Gulik  Covalent Technologies, California 
+   Brian Havard           Australia
    Ben Hyde               Gensym, Massachusetts
-   Jim Jagielski          jaguNET ISP, Maryland 
+   Jim Jagielski          jaguNET Access Services, Maryland 
+   Manoj Kasichainula     Collab.Net, California
    Alexei Kosut           Stanford University, California 
    Martin Kraemer         Munich, Germany
    Ben Laurie             Freelance Consultant, UK 
-   Doug MacEachern        Critical Path, California
-   Aram W. Mirzadeh       Qosina Corporation, New York 
-   Sameer Parekh          C2Net, California 
-   Cliff Skolnick         Freelance, California
+   Rasmus Lerdorf         Linuxcare, California
+   Daniel Lopez Ridruejo  Covalent Technologies, California
+   Doug MacEachern        Covalent Technologies, California
+   Aram W. Mirzadeh       CableVision, New York 
+   Chuck Murcko           The Topsail Group, Pennsylvania 
+   Sameer Parekh          California 
+   David Reid             UK
+   William A. Rowe, Jr.   Freelance Consultant, Chicago area
+   Wilfredo Sanchez       Apple Computer, California
+   Cliff Skolnick         California
    Marc Slemko            Canada 
-   Bill Stoddard          IBM Corp., Research Triangle Park, NC
-   Paul Sutton            C2Net Europe, UK 
-   Randy Terbush          Covalent Technologies, Nebraska 
-   Dirk-Willem van Gulik  Freelance Consultant, Italy 
+   Greg Stein             California
+   Bill Stoddard          IBM Corporation, Research Triangle Park, NC
+   Paul Sutton            Seattle
+   Randy Terbush          Covalent Technologies, California 
 
-Apache Emeritae (old group members now off doing other things)
+Apache Emeritus (old group members now off doing other things)
 
-   Chuck Murcko           The Topsail Group, Pennsylvania 
+   Rob Hartill            Internet Movie DB, UK 
    David Robinson         Cambridge University, UK
    Robert S. Thau         MIT, Massachusetts
    Andrew Wilson          Freelance Consultant, UK 
@@ -107,7 +117,6 @@ Other major contributors
    Howard Fear (mod_include), Florent Guillaume (language negotiation),
    Koen Holtman (rewrite of mod_negotiation),
    Kevin Hughes (creator of all those nifty icons),
-   Rasmus Lerdorf (mod_info, mod_php, mod_php3),
    Brandon Long and Beth Frank (NCSA Server Development Team, post-1.3),
    Ambarish Malpani (Beginning of the NT port),
    Rob McCool (original author of the NCSA httpd 1.3),
@@ -117,8 +126,7 @@ Other major contributors
 Many 3rd-party modules, frequently used and recommended, are also
 freely-available and linked from the related projects page:
 <http://modules.apache.org/>, and their authors frequently
-contribute ideas, patches, and testing.  In particular, Doug MacEachern
-(mod_perl) and Rasmus Lerdorf (mod_php).
+contribute ideas, patches, and testing.
 
 Hundreds of people have made individual contributions to the Apache
 project.  Patch contributors are listed in the src/CHANGES file.
@@ -164,7 +172,7 @@ technically refers to this core of project contributors.
 The Apache project is a meritocracy -- the more work you have done, the more
 you are allowed to do.  The group founders set the original rules, but
 they can be changed by vote of the active members.  There is a group
-of people who have logins on our server (hyperreal.com) and access to the
+of people who have logins on our server (apache.org) and access to the
 CVS repository.  Everyone has access to the CVS snapshots.  Changes to
 the code are proposed on the mailing list and usually voted on by active
 members -- three +1 (yes votes) and no -1 (no votes, or vetoes) are needed
@@ -188,12 +196,32 @@ nominated by one member and unanimously approved by the voting members.
 In most cases, this "new" member has been actively contributing to the
 group's work for over six months, so it's usually an easy decision.
 
-The above describes our past and current (as of April 1998) guidelines,
+The above describes our past and current (as of July 2000) guidelines,
 which will probably change over time as the membership of the group
 changes and our development/coordination tools improve.
 
  ============================================================================
 
+The Apache Software Foundation (www.apache.org)
+
+The Apache Software Foundation exists to provide organizational, legal,
+and financial support for the Apache open-source software projects.
+Founded in June 1999 by the Apache Group, the Foundation has been
+incorporated as a membership-based, not-for-profit corporation in order
+to ensure that the Apache projects continue to exist beyond the participation
+of individual volunteers, to enable contributions of intellectual property
+and funds on a sound basis, and to provide a vehicle for limiting legal
+exposure while participating in open-source software projects. 
+
+You are invited to participate in The Apache Software Foundation. We welcome
+contributions in many forms.  Our membership consists of those individuals
+who have demonstrated a commitment to collaborative open-source software
+development through sustained participation and contributions within the
+Foundation's projects.  Many people and companies have contributed towards
+the success of the Apache projects. 
+
+ ============================================================================
+
 Why Apache Is Free
 
 Apache exists to provide a robust and commercial-grade reference
@@ -236,5 +264,3 @@ as described in the LICENSE file.
 
 Thanks for using Apache!
 
- ============================================================================
-Roy Fielding, June 1997
diff --git a/usr.sbin/httpd/Announcement b/usr.sbin/httpd/Announcement
index dfd664deac3..ed2663f13d5 100644
--- a/usr.sbin/httpd/Announcement
+++ b/usr.sbin/httpd/Announcement
@@ -1,78 +1,122 @@
-Apache 1.3.12 Released
-======================
-
-The Apache Software Foundation and The Apache Server Project are
-pleased to announce the release of version 1.3.12 of the Apache HTTP server.
-
-The primary changes in this version of Apache are those related to
-the ``cross site scripting'' security alerts described at
-
-   http://www.cert.org/advisories/CA-2000-02.html
-      - and -
-   http://www.apache.org/info/css-security/index.html
-
-Specifically, charset handling has been improved and reinforced
-(including a new directive: AddDefaultCharset) and server generated
-pages properly escape ``userland'' input.
-
-A complete listing with detailed descriptions is provided in the
-src/CHANGES file.
-
-We consider Apache 1.3.12 to be the best version of Apache available and
-we strongly recommend that users of older versions, especially of the
-1.1.x and 1.2.x family, upgrade as soon as possible.  No further releases
-will be made in the 1.2.x family.
-
-
-Apache 1.3.12 is available for download from
-
-    http://www.apache.org/dist/
-
-Please see the CHANGES_1.3 file in the same directory for a full
-list of changes.
-
-Binary distributions are available from
-
-   http://www.apache.org/dist/binaries/
-
-As of Apache 1.3.12 binary distributions contain all standard Apache
-modules as shared objects (if supported by the platform) and include
-full source code.  Installation is easily done by executing the
-included install script.  See the README.bindist and INSTALL.bindist
-files for a complete explanation.  Please note that the binary
-distributions are only provided for your convenience and current
-distributions for specific platforms are not always available.
-
-The source and binary distributions are also available via any of the
-mirrors listed at
-
-    http://www.apache.org/mirrors/
-
-For an overview of new features in 1.3 please see
-
-    http://www.apache.org/docs/new_features_1_3.html
-
-In general, Apache 1.3 offers several substantial improvements
-over version 1.2, including better performance, reliability and a
-wider range of supported platforms, including Windows 95/98 and NT
-(which fall under the "Win32" label).
-
-Apache is the most popular web server in the known universe; over
-half of the servers on the Internet are running Apache or one of
-its variants.
-
-IMPORTANT NOTE FOR WIN32 USERS: Over the years, many users have
-come to trust Apache as a secure and stable server.  It must
-be realized that the current Win32 code has not yet reached the
-levels of the Unix version, but is of acceptable quality. Any
-Win32 stability or security problems do not impact, in any way,
-Apache on other platforms.  With the continued donation of time
-and resources by individuals and companies, we hope that the Win32
-version of Apache will grow stronger through the 1.3.x release cycle.
-
-
-Thank you for using Apache.
---
-See you at ApacheCon 2000 in Orlanda, Florida, March 8-10, 2000.
-                http://www.Apachecon.com/
 
+                            Apache 1.3.14 Released
+                                       
+   The Apache Software Foundation and The Apache Server Project are
+   pleased to announce the release of version 1.3.14 of the Apache HTTP
+   server.  Version 1.3.13 was never released.
+   
+   This version of Apache is primarily a security fix and bug fix
+   release, but there are a few new features and improvements. A summary
+   of the new features is given at the end of this document.
+   
+   We consider Apache 1.3.14 to be the best version of Apache available
+   and we strongly recommend that users of older versions, especially of
+   the 1.1.x and 1.2.x family, upgrade as soon as possible. No further
+   releases will be made in the 1.2.x family.
+   
+   Apache 1.3.14 is available for download from
+   
+     http://httpd.apache.org/dist/
+     
+   Please see the CHANGES_1.3 file in the same directory for a full list
+   of changes.
+   
+   Binary distributions are available from
+   
+     http://httpd.apache.org/dist/binaries/
+     
+   As of Apache 1.3.12 binary distributions contain all standard Apache
+   modules as shared objects (if supported by the platform) and include
+   full source code. Installation is easily done by executing the
+   included install script. See the README.bindist and INSTALL.bindist
+   files for a complete explanation. Please note that the binary
+   distributions are only provided for your convenience and current
+   distributions for specific platforms are not always available.
+   
+   The source and binary distributions are also available via any of the
+   mirrors listed at
+   
+     http://www.apache.org/mirrors/
+     
+   For an overview of new features in 1.3 please see
+   
+     http://httpd.apache.org/docs/new_features_1_3.html
+     
+   In general, Apache 1.3 offers several substantial improvements over
+   version 1.2, including better performance, reliability and a wider
+   range of supported platforms, including Windows 95/98 and NT (which
+   fall under the "Win32" label).
+   
+   Apache is the most popular web server in the known universe; over half
+   of the servers on the Internet are running Apache or one of its
+   variants.
+   
+   IMPORTANT NOTE FOR WIN32 USERS: Over the years, many users have come
+   to trust Apache as a secure and stable server. It must be realized
+   that the current Win32 code has not yet reached the levels of the Unix
+   version, but is of acceptable quality. Any Win32 stability or security
+   problems do not impact, in any way, Apache on other platforms.
+   
+                          Apache 1.3.14 Major changes
+                                       
+   The security fixes are:
+     * A problem with the Rewrite module, mod_rewrite, allowed access to
+       any file on the web server under certain circumstances
+     * The handling of Host: headers in mass virtual hosting
+       configurations, mod_vhost_alias, could allow access to any file on
+       the server
+     * If a cgi-bin directory is under the document root, the source to
+       the scripts inside it could be sent if using mass virtual hosting
+       
+   The main new features include:
+     * Support for a directory-based configuration system. If any of the
+       configuration directives point to directories instead of files,
+       all files in that directory (and in subdirectories) will be also
+       parsed as configuration files
+     * Support name-based virtual hosting without needing to specify an
+       IP address in the Apache configuration file. This enables sites
+       that use dynamic IP addresses to support name-based virtual
+       hosting as well as allowing identical machines to share a
+       configuration file, say in a load-balanced cluster
+     * The SetEnvIf and BrowserMatch range of directives are now able to
+       be used in .htaccess files.
+     * Administrators who are nervous about their full server version
+       details being public can use the new keyword 'ProductOnly' in the
+       ServerTokens directive. This keyword forces the server to only
+       return the string "Apache" as the server version.
+     * The new digest authentication module, mod_auth_digest has had a
+       number of fixes and upgrades applied
+       
+   Selected new features that relate to windows platforms:
+     * The project files have been converted to work with Microsoft
+       Visual C 6.0
+     * The DBM package "sdbm" is now bundled with Apache
+     * Windows 95 and 98 can now benefit from an emulation of the NT
+       services, including install and uninstall options. The Apache
+       server therefore can start when the OS loads and will not stop if
+       the current user logs off for example
+     * A comprehensive review of the Windows documentation has been
+       performed.
+     * Preparations for allowing Apache to be built using the free
+       Borland bcc 5.5 compiler
+       
+   Selected new features relating to other platforms:
+     * Support for the new FreeBSD accept filters feature. This feature
+       postpones the requirement for a child process to handle a new
+       connection until a HTTP request has arrived, therefore increasing
+       the number of connections that a given number of child processes
+       can handle
+     * A number of alterations for the MPE platform including fixing
+       error reporting, updating the DSO code to be compatible with a
+       recent OS patch, refining user and group management, and initial
+       support for the proxy module
+     * The default serialised accept has been changed for AIX 4.3 to
+       provide a substantial performance improvement on multiple CPU
+       machines serving large numbers of concurrent clients
+     * DSO support added for BS2000 and OS/390 USS platforms
+     * A directory layout for Solaris 8 has been added to the
+       configuration system
+     * The proxy module mod_proxy has been patched so that it can be
+       built on BeOS 4.5.2
+     * Updated configuration script to allow building on IBM's IA-64
+       version of AIX
diff --git a/usr.sbin/httpd/INSTALL b/usr.sbin/httpd/INSTALL
index b485c7d4f99..db32a868d1b 100644
--- a/usr.sbin/httpd/INSTALL
+++ b/usr.sbin/httpd/INSTALL
@@ -79,10 +79,10 @@
         platform-dependent. The current state is this:
 
         o Out-of-the-box supported platforms are:
-           - Linux     - SunOS         - UnixWare     - Mac OS X Server
-           - FreeBSD   - Solaris       - AIX          - Mac OS
-           - OpenBSD   - IRIX          - SCO          - OpenStep/Mach
-           - NetBSD    - HPUX          - ReliantUNIX  - DYNIX/ptx
+           - Linux     - SunOS         - UnixWare     - Darwin/Mac OS
+           - FreeBSD   - Solaris       - AIX          - OpenStep/Mach
+           - OpenBSD   - IRIX          - SCO          - DYNIX/ptx
+           - NetBSD    - HPUX          - ReliantUNIX
            - BSDI      - Digital Unix  - DGUX
 
         o Entirely unsupported platforms are:
diff --git a/usr.sbin/httpd/INSTALL.SSL b/usr.sbin/httpd/INSTALL.SSL
index 17b84c8b195..7b025fc9579 100644
--- a/usr.sbin/httpd/INSTALL.SSL
+++ b/usr.sbin/httpd/INSTALL.SSL
@@ -30,19 +30,19 @@
       Description:  The Apache Group HTTP Server
       Reason:       The webserver base package on which all is based
       Homepage:     http://www.apache.org/
-      Distribution: ftp://ftp.apache.org/apache/dist/
+      Distribution: http://www.apache.org/dist/
       Tarball:      apache_1.3.x.tar.gz
       Location:     SF, USA
       Author(s):    The Apache Group <apache@apache.org>
       Type:         MANDATORY
 
    o  Package:      mod_ssl
-      Version:      2.6.x
+      Version:      2.7.x
       Description:  The Apache Interface to OpenSSL
       Reason:       The interface module for Apache
       Homepage:     http://www.modssl.org/
       Distribution: ftp://ftp.modssl.org/source/
-      Tarball:      mod_ssl-2.6.x-1.3.x.tar.gz
+      Tarball:      mod_ssl-2.7.x-1.3.x.tar.gz
       Location:     Zurich, Switzerland, Europe
       Author(s):    Ralf S. Engelschall <rse@engelschall.com>
       Type:         MANDATORY
@@ -58,17 +58,6 @@
       Author(s):    The OpenSSL Project <openssl@openssl.org>
       Type:         MANDATORY 
 
-   o  Package:      RSAref
-      Version:      2.0
-      Description:  RSA Reference Implementation
-      Reason:       Deprecated RSA library for US citizens
-      Homepage:     -
-      Distribution: Search on http://ftpsearch.lycos.com/ for "rsaref20.tar.Z" !!
-      Tarball:      rsaref20.tar.Z
-      Location:     Netherlands (because no longer distributed by RSA DSI)
-      Author(s):    RSA DSI
-      Type:         OPTIONAL (only mandatory for US-citizens)
-
    o  Package:      MM
       Version:      1.1.x
       Description:  Shared Memory Library
@@ -92,12 +81,12 @@
       Type:         MANDATORY
  
    o  Package:      Perl
-      Version:      5.004 or 5.005
+      Version:      5.6.0
       Description:  The Practical Extraction and Reporting Language
       Reason:       To configure OpenSSL and for APXS tool in Apache
       Homepage:     http://www.perl.com/
-      Distribution: http://www.perl.com/CPAN/src/
-      Tarball:      perl5.00x.tar.gz
+      Distribution: http://www.cpan.org/src/5.0/
+      Tarball:      perl-5.6.0.tar.gz
       Location:     USA
       Author(s):    Larry Wall
       Type:         MANDATORY
@@ -110,7 +99,6 @@
   your webserver stay.  So the commands are marked at the right-side with the
   following tags:
   
-  US ........ Command has to be run by citizens of the United States ONLY
   EU ........ Command has to be run by citizens of a European state ONLY
   ALL ....... Command has to be run by ANYONE, independent of location
   OPTIONAL .. Command is optional and not really needed
@@ -127,47 +115,15 @@
   2. Extract the required packages:
 
      $ gzip -d -c apache_1.3.x.tar.gz | tar xvf -                          ALL
-     $ gzip -d -c mod_ssl-2.6.x-1.3.x.tar.gz | tar xvf -                   ALL
+     $ gzip -d -c mod_ssl-2.7.x-1.3.x.tar.gz | tar xvf -                   ALL
      $ gzip -d -c openssl-0.9.x.tar.gz | tar xvf -                         ALL
      $ gzip -d -c mm-1.1.x.tar.gz | tar xvf -                         OPTIONAL
-     $ mkdir rsaref-2.0                                                     US
-     $ (cd rsaref-2.0; gzip -d -c ../rsaref20.tar.Z | tar xvf -)            US
 
   3. Configure and build the OpenSSL library: 
-     (When you're an US-citizen you have to build OpenSSL in conjunction with
-     the RSAref library. Others can ignore the first six commands, of course)
-
-     $ cd rsaref-2.0
-     $ cp -rp install/unix local                                            US
-     $ cd local                                                             US
-     $ make                                                                 US
-     $ mv rsaref.a librsaref.a                                              US
-     $ cd ../..                                                             US
-
-     NOTE: RSAref has some portability problems and nasty restrictions.
-           Especially it assumes that an `unsigned long int' represents a four
-           byte word. One result of this bad assumption is that it fails under
-           run-time (not compile-time) on platforms/CPUs, like Alphas, where
-           larger integer sizes are used by the compiler. For instance when
-           mod_ssl's `make certificate' command hangs, you get memory faults
-           or Apache hangs when connecting to it through HTTPS, this all
-           indicates that you ran into this portability problem.  
-
-           The solution is to replace the `typedef unsigned long int UINT4' in
-           rsaref-2.0/source/global.h, line 26. The best is to use `typedef
-           u_int32_t UINT4' when `u_int32_t' is defined by your vendor include
-           files. If not try to use a standard type which is four bytes in
-           length on your platform, e.g. on Alphas `typedef unsigned int
-           UINT4' works.
-
-           Additionally with RSAref not all RSA functionality in OpenSSL will
-           be available. It'll still work for the requirements of mod_ssl, but
-           for instance the RSA OEAP functionality isn't supported by RSAref.
 
      $ cd openssl-0.9.x                                                    ALL
      $ sh config \                                                         ALL
             no-idea \                                                       EU
-            -L`pwd`/../rsaref-2.0/local/rsaref \                            US
             -fPIC                                                     OPTIONAL
      $ make                                                                ALL
      $ make test                                                      OPTIONAL
@@ -187,11 +143,6 @@
            and mod_ssl will search for OpenSSL's binary, header and library
            files in $PATH and system locations.
 
-     NOTE: When your system already has RSAref installed in system locations
-           you can ignore the RSAref-related steps above and then use
-           `RSAREF_BASE=SYSTEM' instead of `RSAREF_BASE=../rsaref-2.0/local/'
-           below.
-
      NOTE: The -fPIC option builds OpenSSL with Position Independent Code
            (PIC) which is only important when building mod_ssl as a
            Dynamic Shared Object (DSO). Please notice, that you really
@@ -227,15 +178,14 @@
      a) The All-In-One mod_ssl+APACI way [FOR JOE AVERAGE]:
 
         You configure Apache semi-automatically from within mod_ssl's
-        `configure' script. You don't have to fiddle with the SSL_BASE and
-        RSA_BASE variables but get no intermediate chance to add more
-        third-party Apache modules (e.g. mod_perl, PHP3, etc).
+        `configure' script. You don't have to fiddle with the SSL_BASE
+        variable but get no intermediate chance to add more third-party
+        Apache modules (e.g. mod_perl, PHP3, etc).
 
-        $ cd mod_ssl-2.6.x-1.3.x                                           ALL
+        $ cd mod_ssl-2.7.x-1.3.x                                           ALL
         $ ./configure \                                                    ALL
               --with-apache=../apache_1.3.x \                              ALL
               --with-ssl=../openssl-0.9.x \                                ALL
-              --with-rsa=../rsaref-2.0/local \                              US
               --with-mm=../mm-1.1.x \                                 OPTIONAL
               --with-crt=/path/to/your/server.crt \                   OPTIONAL
               --with-key=/path/to/your/server.key \                   OPTIONAL
@@ -298,13 +248,14 @@
 
      b) The flexible APACI-only way [FOR REAL HACKERS]:
 
-        You configure Apache manually and have the chance to configure and add
-        third-party Apache modules like mod_perl, mod_php, mod_frontpage,
-        mod_dav, etc. But you have to provide the SSL_BASE, RSA_BASE and
-        EAPI_MM variables manually and either copy your existing certificate
-        manually to conf/ssl.crt/server.crt or use `make certificate':
+        You configure Apache manually and have the chance to configure
+        and add third-party Apache modules like mod_perl, mod_php,
+        mod_frontpage, mod_dav, etc. But you have to provide the
+        SSL_BASE and EAPI_MM variables manually and either copy your
+        existing certificate manually to conf/ssl.crt/server.crt or use
+        `make certificate':
 
-        $ cd mod_ssl-2.6.x-1.3.x                                           ALL
+        $ cd mod_ssl-2.7.x-1.3.x                                           ALL
         $ ./configure \                                                    ALL
               --with-apache=../apache_1.3.x \                              ALL
               --with-crt=/path/to/your/server.crt \                   OPTIONAL
@@ -315,7 +266,6 @@
 
         $ cd apache_1.3.x                                                  ALL
         $ SSL_BASE=../openssl-0.9.x \                                      ALL
-          RSA_BASE=../rsaref-2.0/local \                                    US
           EAPI_MM=../mm-1.1.x \                                       OPTIONAL
           ./configure \                                                    ALL
               --enable-module=ssl \                                        ALL
@@ -369,16 +319,17 @@
 
      c) The poor mans way known from Apache 1.2 [FOR COMPATIBILITY]:
 
-        You configure Apache manually by editing the src/Configuration file
-        and running the deep-level src/Configure script. The advantage here is
-        that this directly follows the steps you might be familiar with from
-        Apache 1.2 and additionally you also have a chance to add more
-        third-party Apache modules like mod_perl or mod_php because anything
-        is done manually. But you have to edit the SSL_BASE, RSA_BASE and
-        EAPI_MM variables manually and more important: you have to install the
-        Apache package manually, too. But feel free to be masochistic ;-)
-
-        $ cd mod_ssl-2.6.x-1.3.x                                           ALL
+        You configure Apache manually by editing the src/Configuration
+        file and running the deep-level src/Configure script. The
+        advantage here is that this directly follows the steps you might
+        be familiar with from Apache 1.2 and additionally you also have
+        a chance to add more third-party Apache modules like mod_perl or
+        mod_php because anything is done manually. But you have to edit
+        the SSL_BASE and EAPI_MM variables manually and more important:
+        you have to install the Apache package manually, too. But feel
+        free to be masochistic ;-)
+
+        $ cd mod_ssl-2.7.x-1.3.x                                           ALL
         $ ./configure \                                                    ALL
               --with-apache=../apache_1.3.x \                              ALL
               --with-crt=/path/to/your/server.crt \                   OPTIONAL
@@ -391,8 +342,7 @@
         $ cp Configuration.tmpl Configuration                              ALL
         $ vi Configuration                                                 ALL
         [...edit the SSL_BASE variable...]                                 ALL
-        [...edit the RSA_BASE variable...]                                  US
-        [...edit the EAPI_MM variable...]                                   US
+        [...edit the EAPI_MM variable...]                             OPTIONAL
         [...edit the `AddModule' line of libssl.a...]                      ALL
         $ ./Configure                                                      ALL
         $ make                                                             ALL
@@ -449,7 +399,7 @@
      o Read the mod_ssl user manual very carefully to
        understand the SSL-part of your Apache configuration:
 
-       $ netscape http://www.modssl.org/docs/2.6/                 (official)
+       $ netscape http://www.modssl.org/docs/2.7/                 (official)
        $ netscape http://localhost/manual/mod/mod_ssl/            (local copy)
        
      o Adjust your Apache configuration to your personal requirements.
@@ -476,11 +426,10 @@
   long as the Extended API (EAPI) didn't change and you've OpenSSL installed
   somewhere. For this you can use the following procedure:
 
-    $ cd mod_ssl-2.6.x-1.3.x                                               ALL
+    $ cd mod_ssl-2.7.x-1.3.x                                               ALL
     $ ./configure \                                                        ALL
           --with-apxs[=/path/to/apache/bin/apxs] \                         ALL
-          --with-ssl=/path/to/openssl \                                    ALL
-          --with-rsa=/path/to/rsaref                                        US
+          --with-ssl=/path/to/openssl                                      ALL
     $ make                                                                 ALL
     $ make install                                                         ALL
     $ make distclean                                                       ALL
@@ -510,17 +459,16 @@
     o Apache should be installed to /path/to/apache
     o Perl is installed and `perl' is in $PATH
     o OpenSSL is installed under /path/to/openssl
-    o RSAref is not used in this example
 
     Steps:
 
     #   extract the packages
     $ gzip -d -c apache_1.3.x.tar.gz | tar xvf -
-    $ gzip -d -c mod_ssl-2.6.x-1.3.x.tar.gz | tar xvf -
+    $ gzip -d -c mod_ssl-2.7.x-1.3.x.tar.gz | tar xvf -
     $ gzip -d -c mod_perl-1.xx.tar.gz | tar xvf -
 
     #   apply mod_ssl to Apache source tree
-    $ cd mod_ssl-2.6.x-1.3.x
+    $ cd mod_ssl-2.7.x-1.3.x
     $ ./configure \
           --with-apache=../apache_1.3.x
     $ cd ..
@@ -553,7 +501,7 @@
 
     #   cleanup after work
     $ rm -rf mod_perl-1.xx
-    $ rm -rf mod_ssl-2.6.x-1.3.x
+    $ rm -rf mod_ssl-2.7.x-1.3.x
     $ rm -rf apache_1.3.x
 
   o Apache + mod_ssl/OpenSSL + PHP3/MySQL
@@ -564,18 +512,17 @@
     o Apache should be installed to /path/to/apache
     o MySQL is installed under /path/to/mysql
     o OpenSSL is installed under /path/to/openssl
-    o RSAref have not to be used
     o GNU Make is available as `gmake' in $PATH
    
     Steps:
 
     #   extract the packages
     $ gzip -d -c apache_1.3.x.tar.gz | tar xvf -
-    $ gzip -d -c mod_ssl-2.6.x-1.3.x.tar.gz | tar xvf -
+    $ gzip -d -c mod_ssl-2.7.x-1.3.x.tar.gz | tar xvf -
     $ gzip -d -c php-3.0.x.tar.gz | tar xvf -
 
     #   apply mod_ssl to Apache source tree
-    $ cd /mod_ssl-2.6.x-1.3.x
+    $ cd /mod_ssl-2.7.x-1.3.x
     $ ./configure \
           --with-apache=../apache_1.3.x
     $ cd ..
@@ -613,6 +560,6 @@
     
     #   cleanup after work
     $ rm -rf php-3.0.x
-    $ rm -rf mod_ssl-2.6.x-1.3.x
+    $ rm -rf mod_ssl-2.7.x-1.3.x
     $ rm -rf apache_1.3.x
 
diff --git a/usr.sbin/httpd/KEYS b/usr.sbin/httpd/KEYS
index 5482538d688..29e2052120e 100644
--- a/usr.sbin/httpd/KEYS
+++ b/usr.sbin/httpd/KEYS
@@ -662,3 +662,105 @@ G5Sp9yIT0Ds5AXWJAEUCBRAuvsWtldOLUWZxqVUBAU4tAX9YK5N9ywRzvPVYrkEx
 CW0KCc2+7PSGKY0/YXE+XiDmure7yLTd2o9u5XB+vFLPL6Y=
 =Duku
 -----END PGP PUBLIC KEY BLOCK-----
+
+
+Type Bits/KeyID    Date       User ID
+pub  1024/28AA55C5 2000/03/02 Daniel Lopez Ridruejo <ridruejo@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: 2.6.2
+
+mQCNAzi+5mgAAAEEAKRyfbHaGoNuWwHVSa/5mRbWdhDTkR26z3Uwq4KdCZ2Wp+b0
+VF4Tfh6d4IoK2jXKBUlUfq+v7FYzSzYdPCmwB9L9cHlaU/ItfcWD2G7rIHyO/lGn
+VXK/BGUPoOhT2yeO8tf6oe81hmN5VzqqhG/SWEkwlJASRX3ApyanqCooqlXFAAUR
+tCtEYW5pZWwgTG9wZXogUmlkcnVlam8gPHJpZHJ1ZWpvQGFwYWNoZS5vcmc+iQCV
+AwUQOMAjHyanqCooqlXFAQF9swQAnVrUersSbO/SrT+nnwgRPL/xRMjGCQe93gUe
+JPcOOYU2be1tFGynJl842SIDPTHcJVg1hHReO93K4jvQKsbmT5zrzIlQ7hVB2u48
+WNcgsIKWIxcGaMp4+qsDOhN7Fh7vIEZdRRYhL7YcGKZ2WnXOZnGsKSD8VZenycwQ
+cAA4xkA=
+=3hIM
+-----END PGP PUBLIC KEY BLOCK-----  
+
+Type Bits KeyID      Created    Expires    Algorithm       Use
+sec+ 2048 0xC808A7BF 2000-03-09 ---------- RSA             Sign & Encrypt
+uid  rbb@apache.org   
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: PGPfreeware 5.0i for non-commercial use
+
+mQENAzjHNiMAAAEIAK+iTnKRHymuUYmRRe6JlH3oN4GfpakM6CITpS0aM/piJBX8
+MNgcCUK2tz8MSCqAlfF+2r0hGRMSQ+UpXqLXcJaCkGIvXtlKmxCcCX6R+LDCnzoa
+QvOar3+rKFFJyiauyV7VPucZZhFKesReG6o53uoOAd0jyzcV9TdpAIn4Xl8W617T
+L98GdODY9jK0zfgGo2bSgPpo2YswlDCGbYzRX6bfEGmAbP4t4UnP1ikVCE3NTIyz
+gT4kywMb5AT1Tm3FbwTx7rXc/nL20t22VTJMjyCxqPrOTs91PxdXyTAQUKY82x+U
+ZgW39f6aKrJHDEJtxOyym+B5NpYgeP5QQsgIp78ABRG0DnJiYkBhcGFjaGUub3Jn
+iQEVAwUQOMc2I3j+UELICKe/AQE4yAgAkNXkalNn8Xi+v3BFCmHLlB7PKlItzlS2
+PnMcTJPgzO8w+PyXc5lzS3dnqLEBoCwRazEZh8ncVbeBJz1LjQU67gvCBqyFl+3n
+r+Z8k6cJYw1AzSK9FLAgOEtG8IdE+jsPq39xORpu6Dhsuln++G1xaK6fePeAEgR3
+qH7gog/SFCa9QXQd85wsGRlQlmMwe/HDyoRd/iHg3X7mr4yB+zYkxYKDD+TKlSqq
+V23n0H4n3oTI10PfaB8LDYVuPiQvIRn08XKUv0Att1KPH6iJTIJ/KRbZyGb2J+1r
+RO1nBGw+qaOAw4wUQXOpJyXVUeanIt1tSe8Gczlf/uxJZdCNSpgeqIkAPwMFEDjH
+OY/9b4jGIdCnGxECdl8AnAvSwMQ2v2ryh2NLL4FgfVLCjb40AJoDu0jaEqUinZnp
+oMBmjFgtsDYp+w==
+=5ByY
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+Type Bits KeyID      Created    Expires    Algorithm       Use
+sec+ 1024 0x00ADEBF5 2000-01-25 ---------- RSA             Sign & Encrypt 
+uid  Marc Slemko <marcs@znep.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: PGPfreeware 5.0i for non-commercial use
+
+mQCNAziM6n8AAAEEAODTLW2h2homp9NCjlsNdQQQACaUgrEm0sO0Lr1BVSp35fFQ
+a6XtrIxQXwcvBqM0py1ea2zcmYqnv6vY+7i6sBnxiNNugH3ShBnOYeCaO6AzQNaN
+2OvLkB7+1AoDmbU4a/+APtLrhzYzUj4DmwSmr7wTwdO06PsdM1Qv/g4Arev1AAUR
+tBxNYXJjIFNsZW1rbyA8bWFyY3NAem5lcC5jb20+iQCVAwUQOIzqf1Qv/g4Arev1
+AQFTZgP/Q+/pcNsCncKr4x39f/N5zXine0zQaKY46ek+PCUrhDm5N8cFTyijE7V0
+huRDVENAFkwtznz/H7BN0vtMRlvUQJOPFa2UaN8zIbcMIzSbiNEx5nvfFeT/Gr52
+GtnrQ+BvczfaauJ0Zw4p5uq6na/+0iyEf17d4qrhIBftlO3Ti+M=
+=+laC
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+Type bits      keyID      Date       User ID
+RSA  1024      0x62C48B29 1996/01/22 *** DEFAULT SIGNING KEY ***
+                                     Ask Bjoern Hansen <ask@netcetera.dk>
+                                     Ask Bjoern Hansen <ask@plys.net>
+                                     Ask Bjoern Hansen <ask@perl.org>
+                                     Ask Bjoern Hansen <ask@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: PGP 6.5.1
+
+mQCNAjEC6XcAAAEEALdrW5rH+2XOKX2zAPQmgomvHGADJedG4Dxf3Ci3HpGmKazV
+Uoo/f7Vf21ldvBBYC2CMpJU5uiMstNdrJ8Rx0KDBH2pLXsfE4XvVm8cGLbHcJycj
+cZsYl4yppOufL/76kmpP7q0Jni/pXrkYg2mLG3lCN3JoZqX9tvkoKP1ixIspAAUR
+tCRBc2sgQmpvZXJuIEhhbnNlbiA8YXNrQG5ldGNldGVyYS5kaz6JAJUDBRA1eczx
++Sgo/WLEiykBAZIjA/4+uCJi5WD0p3EFzOnmkZRxf8egjQlFdBDVR7sixVToZCze
+oZZ9EVianFbwv8XU0McA7FLSUala0FIxRtmOs8/yN96rhBqJnYfLxu3b/ZRpBf4Z
+UExXQbussUX7AsPUmFim9Xp8mTy7xDEpcfiBnGY9Dtx+nmSvyLO38W5VvKP1qYkA
+PwMFEDV7CdYJPTjw/8ByixECHSsAoKUySg0ht56Rjsct6ViXjWfVEF1xAKCldK5x
+LXMjefgsiuW3n5seRVogQokARgQQEQIABgUCNgEYdgAKCRBoqAGJariS5S72AJ9N
+JsXpts88tCq7uZiirWlL54vTUwCg4A2urEUCEPuSz5deMyMX4lpjN5GJAJUDBRA5
+Ix6ndTAZgHu8twkBAZDHA/0fiaJSxGAxIdgYQY1KqYJGWg/E7Gwn87kZyiRHKUaJ
+gP4IA4PVnh0rMtTTo+CWyzcqMPjRAZNDW4ECWymrqqNrYgqy/NrcN4h7LZC5wmnW
+hXF3HdgAgxIn7m2YQOLluNqIrhVKga5G9/xytZLsF15qZbvjyX4mqToOsRqAtUBI
+ALQgQXNrIEJqb2VybiBIYW5zZW4gPGFza0BwbHlzLm5ldD6JAJUDBRAz6gMS+Sgo
+/WLEiykBAd9fA/9YdBn26x/7DE0by/Zzelfxu8o4AgZOV0AuWqZJebXKjeFmkJ0B
+lZRaC+NUcvpXOcANP6berJknvAMjNfTD1wi89XUVlbisDSW3UMR7Op8EpYjqLTo5
+u+KmyS+ehhQjA3somcJc8fBdnGJZ17cKWEbzJK+oJBvnzpjtgtvw6/oH/okAlQMF
+EDV5zQX5KCj9YsSLKQEBbk0EAJ+CwSbR4QQ2pgyXV7U4P4+1xSXa8U6IuI7AX9Fm
+LNlDu7a8DnJt8trZxjBcEMZcfoSNmbjIzMotzl0vvtDpqYgKfJ5Dd3eUTRCDYYS7
+8DoYcuB0cunBoGijkHS/2IkucAZGgcnNjPdhm7EnDJ/4F5VR9ZByqXiAIhZ746bs
+Z+nrtCBBc2sgQmpvZXJuIEhhbnNlbiA8YXNrQHBlcmwub3JnPokAlQMFEDkjD+v5
+KCj9YsSLKQEBEK0EAJBYAopnB9/dun1G0t+TKWVwGQUi56sWd5bwLypHklf/fy2V
+QPjCz9QoI0L/jAguBrqCfwtlIHRHMwzvvNWLRtuA8oiTDl4w2gO2vjy7V3Y4qneA
+3U5CYRT/ekvK42d+aHA6yMeHSPlNEQg09Idmee5Lub7kV8ejjtRZ8s3jcZ0utCJB
+c2sgQmpvZXJuIEhhbnNlbiA8YXNrQGFwYWNoZS5vcmc+iQCVAwUQOSMQB/koKP1i
+xIspAQGtCwP9FFWCZN2540lomDAY6tXt7Q3AhP/CkAec5i/lsv21sUl09jlZQnr/
+Kc8hL1lPOuAlLFGqso3zL7KMVlrOIng+R/E5fcYpE60QhhIoHdvlxFKTJ5GZq7DG
+stCrR34q2A4OWtoC7tF0Uu+Ew2ontVgvqsrgq4qt0h3yh/kABp/8mRw=
+=GGxP
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index bdf89e339aa..24e2049a191 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for Apache 
-# $OpenBSD: Makefile.bsd-wrapper,v 1.15 2000/10/16 21:25:23 brad Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.16 2000/12/18 20:49:12 beck Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -387,8 +387,15 @@ MANUALFILES= \
 	manual/vhosts/mass.html \
 	manual/vhosts/name-based.html \
 	manual/vhosts/vhosts-in-depth.html \
-	manual/vhosts/virtual-host.html
-		
+	manual/vhosts/virtual-host.html \
+	manual/configuring.html \
+	manual/mpeix.html \
+	manual/new_features_2_0.html \
+	manual/win_compiling.html \
+	manual/win_service.html \
+	manual/misc/tutorials.html \
+	manual/mod/index-bytype.html \
+	manual/mod/module-dict.html
 		
 ICONFILES= \
 	icons/README icons/a.gif icons/alert.black.gif \
diff --git a/usr.sbin/httpd/Makefile.tmpl b/usr.sbin/httpd/Makefile.tmpl
index ab57a227e56..5b4f6bb5c25 100644
--- a/usr.sbin/httpd/Makefile.tmpl
+++ b/usr.sbin/httpd/Makefile.tmpl
@@ -207,14 +207,14 @@ build-support:
 	if [ ".$(suexec)" = .1 ]; then \
 	    $(MAKE) $(MFLAGS) \
 		EXTRA_CFLAGS='\
+			$(suexec_umask) \
 			-DHTTPD_USER=\"$(suexec_caller)\" \
 			-DUID_MIN=$(suexec_uidmin) \
 			-DGID_MIN=$(suexec_gidmin) \
 			-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
 			-DLOG_EXEC=\"$(suexec_logexec)\" \
 			-DDOC_ROOT=\"$(suexec_docroot)\" \
-			-DSAFE_PATH=\"$(suexec_safepath)\" \
-			$(suexec_umask)' \
+			-DSAFE_PATH=\"$(suexec_safepath)\"' \
 		suexec; \
 	fi
 	@echo "<=== $(SRC)/support"
diff --git a/usr.sbin/httpd/README.NT b/usr.sbin/httpd/README.NT
index b398a8deef2..e69de29bb2d 100644
--- a/usr.sbin/httpd/README.NT
+++ b/usr.sbin/httpd/README.NT
@@ -1,91 +0,0 @@
-
-                                 Apache
-                             Version 1.3 (and up)
-
-  What is it?
-  -----------
-
-  Apache is an HTTP server, originally designed for Unix systems. This
-  is the version of Apache for Microsoft Windows NT, 98, and 95
-  systems.  Like the Unix version, it includes many frequently
-  requested new features, and has an API that allows it to be extended
-  to meet users' needs more easily. It also allows ISAPI extensions.
-
-
-  The Latest Version
-  ------------------
-
-  Details of the latest version can be found on the Apache HTTP
-  server project page under http://www.apache.org/.
-
-  Documentation
-  -------------
-
-  The documentation available as of the date of this release is
-  also included, in HTML format, in the htdocs/manual/ directory.
-  For the most up-to-date documentation can be found on
-  http://www.apache.org/docs/. For Windows specific information, see
-  http://www.apache.org/docs/windows.html.
-
-  WARNING
-  -------
-
-  Apache on Win32 has not yet been optimized for performance.  Apache
-  still performs best, and is most reliable on Unix platforms.  Over
-  time we will improve performance for Windows NT. Folks doing
-  comparative reviews of webserver performance are asked to compare
-  against Apache on a Unix platform such as Solaris, FreeBSD, or
-  Linux.
-
-  Apache on Win32 should still be considered beta quality code.  It
-  does not meet the normal standards of stability and security that
-  Unix releases do.
-
-  Installation
-  ------------
-
-  If you have installed Apache as a pre-compiled binary, you can
-  now run the server by selecting "Start Apache as console app"
-  from the Start menu. You can configure Apache for your system
-  by editing the file conf/httpd.conf in the directory where you
-  installed Apache.
-
-  See the http://www.apache.org/docs/windows.html for details of how
-  to run and configure Apache, or select the "Apache Documentation"
-  icon read the local copy installed with Apache.
-
-  Known Problems
-  --------------
-
-  To get information about the current set of known problems, see the
-  online bug reporting database at
-  http://www.apache.org/bug_report.html.  Bugs which affect Apache on
-  Windows and not Apache on Unix can be found under the category
-  "os-windows".
-
-  Licensing
-  ---------
-
-  Please see the file called LICENSE.
-
-  Acknowledgments
-  ----------------
-
-  We wish to acknowledge the following copyrighted works that
-  make up portions of the Apache software:
-
-  Portions of this software were developed at the National Center
-  for Supercomputing Applications (NCSA) at the University of
-  Illinois at Urbana-Champaign.
-
-  This software contains code derived from the RSA Data Security
-  Inc. MD5 Message-Digest Algorithm, including various
-  modifications by Spyglass Inc., Carnegie Mellon University, and
-  Bell Communications Research, Inc (Bellcore).
-
-  This package contains software written and copyrighted by Henry
-  Spencer.  Please see the file called src/regex/COPYRIGHT. 
-
-  The NT port was started with code provided to the Apache Group
-  by Ambarish Malpani of ValiCert, Inc. (http://www.valicert.com/).
-
diff --git a/usr.sbin/httpd/README.SSL b/usr.sbin/httpd/README.SSL
index e9522ba7899..1256b4ea734 100644
--- a/usr.sbin/httpd/README.SSL
+++ b/usr.sbin/httpd/README.SSL
@@ -44,7 +44,6 @@
    o  Clean Apache module architecture
    o  Integrates seamlessly into Apache through an Extended API (EAPI)
    o  Full Dynamic Shared Object (DSO) support
-   o  Support for the OpenSSL+RSAref US-situation
    o  Advanced pass-phrase handling for private keys
    o  X.509 certificate based authentication for both client and server
    o  X.509 certificate revocation list (CRL) support
@@ -58,6 +57,7 @@
    o  Fully integrated into the Apache 1.3 configuration mechanism
    o  Additional integration into the Apache Autoconf-style Interface (APACI)
    o  Assistance in X.509v3 certificate generation (both RSA and DSA)
+   o  Experimental support for external Crypto Devices (OpenSSL ENGINE)
 
   Disclaimer
   __________
@@ -125,10 +125,10 @@
   Compatibility
   _____________
 
-  This module was developed and tested with Netscape Communicator 4.0x, Lynx
-  2.7.x and cURL 5.x under FreeBSD 2.2.x and 3.1 as the clients only. But it
-  should work with other Navigator/Communicator variants, too. Even Internet
-  Explorer users should be able to use this software.
+  This module was developed and tested with Netscape Communicator 4.x,
+  Lynx 2.x and cURL 7.x under FreeBSD 2.2.x, 3.x and 4.x as the clients
+  only. But it should work with other Navigator/Communicator variants,
+  too. Even Internet Explorer users should be able to use this software.
 
   Resources
   _________
@@ -141,8 +141,8 @@
   _______
 
   Special thanks to The Apache Group and the NCSA for Apache, to the OpenSSL
-  project for the SSL/TLS toolkit and especially to Eric A. Young and Tim J.
-  Hudson for SSLeay on which OpenSSL is based.  And thanks also go to Ben
-  Laurie for the original Apache-SSL on which mod_ssl is based. Without the
-  effort of these people mod_ssl would not be possible.
+  project for the SSL/TLS toolkit and especially to Eric A.  Young and Tim J.
+  Hudson for SSLeay on which OpenSSL is based. And thanks also go to Ben
+  Laurie for the original Apache-SSL on which mod_ssl was originally based.
+  Without the effort of these people mod_ssl would not be possible.
 
diff --git a/usr.sbin/httpd/WARNING-NT.TXT b/usr.sbin/httpd/WARNING-NT.TXT
index 94320d3f376..e69de29bb2d 100644
--- a/usr.sbin/httpd/WARNING-NT.TXT
+++ b/usr.sbin/httpd/WARNING-NT.TXT
@@ -1,8 +0,0 @@
-WARNING: The Win32 release of Apache should 
-still be considered beta quality code.  
-It does not meet the normal standards of 
-stability and security that Unix releases do.  
-There are numerous known bugs and 
-inconsistencies.  There is also a much 
-greater chance of security holes being 
-present in the Win32 version of Apache.
diff --git a/usr.sbin/httpd/config.layout b/usr.sbin/httpd/config.layout
index aa0948fc74d..68b9ed06615 100644
--- a/usr.sbin/httpd/config.layout
+++ b/usr.sbin/httpd/config.layout
@@ -70,20 +70,40 @@
     proxycachedir: proxy
 </Layout>
 
-#   Apple's Mac OS X Server Layout
+#   Mac OS X Server (Rhapsody)
 <Layout Mac OS X Server>
     prefix:        /Local/Library/WebServer
-    exec_prefix:   /usr/local
+    exec_prefix:   /usr
     bindir:        $exec_prefix/bin
     sbindir:       $exec_prefix/sbin
-    libexecdir:    /Local/Library/Apache/Modules
+    libexecdir:    /System/Library/Apache/Modules
     mandir:        $exec_prefix/share/man
     sysconfdir:    $prefix/Configuration
     datadir:       $prefix
-    iconsdir:      /Local/Library/Apache/Icons
+    iconsdir:      /System/Library/Apache/Icons
     htdocsdir:     $datadir/Documents
     cgidir:        $datadir/CGI-Executables
-    includedir:    /Local/Library/Frameworks/Apache.framework/Versions/1.3/Headers
+    includedir:    /System/Library/Frameworks/Apache.framework/Versions/1.3/Headers
+    localstatedir: /var
+    runtimedir:    $prefix/Logs
+    logfiledir:    $prefix/Logs
+    proxycachedir: $prefix/ProxyCache
+</Layout>
+
+#   Mac OS Layout
+<Layout Darwin>
+    prefix:        /Library/WebServer
+    exec_prefix:   /usr
+    bindir:        $exec_prefix/bin
+    sbindir:       $exec_prefix/sbin
+    libexecdir:    /System/Library/Apache/Modules
+    mandir:        $exec_prefix/share/man
+    sysconfdir:    $prefix/Configuration
+    datadir:       $prefix
+    iconsdir:      /System/Library/Apache/Icons
+    htdocsdir:     $datadir/Documents
+    cgidir:        $datadir/CGI-Executables
+    includedir:    /System/Library/Frameworks/Apache.framework/Versions/1.3/Headers
     localstatedir: /var
     runtimedir:    $prefix/Logs
     logfiledir:    $prefix/Logs
@@ -190,6 +210,45 @@
     proxycachedir: $localstatedir/proxy
 </Layout>
 
+#   Solaris 8 Layout
+<Layout Solaris>
+    prefix:        /usr/apache
+    exec_prefix:   $prefix
+    bindir:        $exec_prefix/bin
+    sbindir:       $exec_prefix/bin
+    libexecdir:    $exec_prefix/libexec
+    mandir:        $exec_prefix/man
+    sysconfdir:    /etc/apache
+    datadir:       /var/apache
+    iconsdir:      $datadir/icons
+    htdocsdir:     $datadir/htdocs
+    cgidir:        $datadir/cgi-bin
+    includedir:    $exec_prefix/include
+    localstatedir: $prefix
+    runtimedir:    /var/run
+    logfiledir:    $datadir/logs
+    proxycachedir: $datadir/proxy
+</Layout>
+
+#   OpenBSD Layout
+<Layout OpenBSD>
+    prefix:        /var/www
+    exec_prefix:   /usr
+    bindir:        $exec_prefix/bin
+    sbindir:       $exec_prefix/sbin
+    libexecdir:    $exec_prefix/lib/apache/modules
+    mandir:        $exec_prefix/share/man
+    sysconfdir:    $prefix/conf
+    datadir:       $prefix
+    iconsdir:      $prefix/icons
+    htdocsdir:     $prefix/htdocs
+    cgidir:        $prefix/cgi-bin
+    includedir:    $exec_prefix/lib/apache/include
+    localstatedir: $prefix
+    runtimedir:    $prefix/logs
+    logfiledir:    $prefix/logs
+    proxycachedir: $prefix/proxy
+</Layout>
 #   OpenBSD apache path layout.
 <Layout OpenBSD>
     prefix:        /var/www
@@ -208,4 +267,4 @@
     runtimedir:    /var/www/logs
     logfiledir:    /var/www/logs
     proxycachedir: /var/www/proxy
-</Layout>
\ No newline at end of file
+</Layout>
diff --git a/usr.sbin/httpd/configure b/usr.sbin/httpd/configure
index 9e019641128..0c9099622ef 100644
--- a/usr.sbin/httpd/configure
+++ b/usr.sbin/httpd/configure
@@ -127,8 +127,8 @@ PLATFORM="`sh $aux/GuessOS`"
 ##
 if [ "x$quiet" = "xno" ]; then
     APV=`cat $src/include/httpd.h |\
-         grep "#define SERVER_BASEVERSION" |\
-         sed -e 's/^[^"]*"//' -e 's/".*$//' -e 's/^Apache\///'`
+         grep "#define SERVER_BASEREVISION" |\
+         sed -e 's/^[^"]*"//' -e 's/".*$//' -e 's/^\///'`
     echo "Configuring for Apache, Version $APV"
 fi
 
@@ -342,8 +342,8 @@ case $PLATFORM in
 	iflags_core="${iflags_core} -S \"-S\""
 	iflags_dso="${iflags_dso} -S \"-S\""
 	;;
-    *-apple-macos*)
-	default_layout="Mac OS X Server"
+    *-apple-darwin*)
+	default_layout="Darwin"
 	iflags_core="${iflags_core} -S \"-S\"" 
 	iflags_dso="${iflags_dso} -S \"-S\""
 	;;
@@ -353,9 +353,9 @@ case $PLATFORM in
         iflags_core="${iflags_core} -e .exe" 
         ;;
     *MPE/iX* )
-       default_layout="Apache"
-       iflags_program="-m 755"
-       ;;
+	default_layout="Apache"
+	iflags_program="-m 755"
+	;;
     *)
 	default_layout="Apache"
 	;;
@@ -493,12 +493,13 @@ do
                 echo "configure:Error: Path layout definition file $file not found" 1>&2
                 exit 1
             fi
+            (echo ''; cat $file; echo '') |\
             sed -e "1,/[ 	]*<[Ll]ayout[ 	]*$name[ 	]*>[ 	]*/d" \
                 -e '/[ 	]*<\/Layout>[ 	]*/,$d' \
                 -e "s/^[ 	]*//g" \
                 -e "s/:[ 	]*/=\'/g" \
                 -e "s/[ 	]*$/'/g" \
-                $file >$pldconf
+                >$pldconf
             . $pldconf
             OOIFS="$IFS"  # most likely not needed: jmj
             IFS="$DIFS"   # ditto
@@ -1047,7 +1048,7 @@ echo "##  restoring your configuration. Additional parameters can be supplied."
 echo "##" >>$configstatus
 echo "" >>$configstatus
 for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
-           LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET EAPI_MM SSL_BASE RSA_BASE; do
+           LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET EAPI_MM SSL_BASE; do
     eval "val=\"\$$var\""
     if [ "x$val" != "x" ]; then
         echo "$var=$val" |\
@@ -1382,7 +1383,7 @@ touch $sedsubst
 OIFS="$IFS"
 IFS="$DIFS"
 for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
-           LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET EAPI_MM SSL_BASE RSA_BASE; do
+           LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET EAPI_MM SSL_BASE; do
     eval "val=\"\$$var\"";
     if [ "x$val" != "x" ]; then
         case $var in