merge

8 files changed, 319 insertions, 92 deletions

diff --git a/usr.sbin/httpd/ABOUT_APACHE b/usr.sbin/httpd/ABOUT_APACHE
index 4fbb888e142..4a9ff02cb4e 100644
--- a/usr.sbin/httpd/ABOUT_APACHE
+++ b/usr.sbin/httpd/ABOUT_APACHE
@@ -73,11 +73,10 @@ is today more widely used than all other web servers combined.
 Current Apache Group in alphabetical order as of 18 December 2001:
 
    Greg Ames              IBM Corporation, Research Triangle Park, NC, USA
-   Aaron Bannert          Covalent Technologies, California
+   Aaron Bannert          California
    Brian Behlendorf       Collab.Net, California 
-   Ryan Bloom             Covalent Technologies, California 
    Ken Coar               IBM Corporation, Research Triangle Park, NC, USA
-   Mark J. Cox            Red Hat, England
+   Mark J. Cox            Red Hat, UK
    Lars Eilebrecht        Freelance Consultant, Munich, Germany 
    Ralf S. Engelschall    Cable & Wireless Deutschland, Munich, Germany
    Justin Erenkrantz      University of California, Irvine
@@ -93,7 +92,7 @@ Current Apache Group in alphabetical order as of 18 December 2001:
    Alexei Kosut           Stanford University, California 
    Martin Kraemer         Munich, Germany
    Ben Laurie             Freelance Consultant, UK 
-   Rasmus Lerdorf         Linuxcare, California
+   Rasmus Lerdorf         Yahoo!, California
    Daniel Lopez Ridruejo  Covalent Technologies, California
    Doug MacEachern        Covalent Technologies, California
    Aram W. Mirzadeh       CableVision, New York 
@@ -114,6 +113,7 @@ Current Apache Group in alphabetical order as of 18 December 2001:
 
 Apache Emeritus (old group members now off doing other things)
 
+   Ryan Bloom             California 
    Rob Hartill            Internet Movie DB, UK 
    David Robinson         Cambridge University, UK
    Robert S. Thau         MIT, Massachusetts
diff --git a/usr.sbin/httpd/Announcement b/usr.sbin/httpd/Announcement
index 26b3b346b84..2a5adacea8a 100644
--- a/usr.sbin/httpd/Announcement
+++ b/usr.sbin/httpd/Announcement
@@ -1,42 +1,38 @@
 
-                            Apache 1.3.27 Released
+                            Apache 1.3.28 Released
 
    The Apache Software Foundation and The Apache Server Project are
-   pleased to announce the release of version 1.3.27 of the Apache HTTP
-   Server.  This Announcement notes the significant changes in 1.3.27
-   as compared to 1.3.26.
-
-   This version of Apache is principally a security and bug fix release.
-   A summary of the bug fixes is given at the end of this document.
-   Of particular note is that 1.3.27 addresses and fixes 3 security
-   vulnerabilities.
-
-   CAN-2002-0839 (cve.mitre.org): A vulnerability exists in all versions of
-   Apache prior to 1.3.27 on platforms using System V shared memory based
-   scoreboards.  This vulnerability allows an attacker who can execute under
-   the Apache UID to exploit the Apache shared memory scoreboard format and
-   send a signal to any process as root or cause a local denial of service
-   attack.  We thank iDefense for their responsible notification and 
-   disclosure of this issue.
-
-   CAN-2002-0840 (cve.mitre.org): Apache is susceptible to a cross site
-   scripting vulnerability in the default 404 page of any web server hosted
-   on a domain that allows wildcard DNS lookups.  We thank Matthew Murphy for
-   the responsible notification and disclosure of this issue.
+   pleased to announce the release of version 1.3.28 of the Apache HTTP
+   Server.  This Announcement notes the significant changes in 1.3.28
+   as compared to 1.3.27.
+
+   This version of Apache is principally a bug and security fix release.
+   A partial summary of the bug fixes is given at the end of this document.
+   A full listing of changes can be found in the CHANGES file.  Of
+   particular note is that 1.3.28 addresses and fixes 3 potential
+   security issues:
+
+    o CAN-2003-0460 (cve.mitre.org): Fix the rotatelogs support program on
+      Win32 and OS/2 to ignore special control characters received over the
+      pipe.  Previously such characters could cause it to quit logging and
+      exit.  We would like to thank the Hitachi Incident Response team for
+      their responsible disclosure of this issue.
+
+    o VU#379828 : The server could crash when going into an infinite loop
+      due to too many subsequent internal redirects and nested subrequests. 
    
-   CAN-2002-0843 (cve.mitre.org): There were some possible overflows in ab.c
-   which could be exploited by a malicious server. Note that this
-   vulnerability is not in Apache itself, but rather one of the support
-   programs bundled with Apache. We thank David Wagner for the responsible
-   notification and disclosure of this issue.
+    o Eliminated leaks of several file descriptors to child processes, such
+      as CGI scripts.
 
-   We consider Apache 1.3.27 to be the best version of Apache 1.3 available
+   We consider Apache 1.3.28 to be the best version of Apache 1.3 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.27 is available for download from
+   Apache 1.3.28 is available for download from
    
+       http://httpd.apache.org/download.cgi
+                - or -
        http://www.apache.org/dist/httpd/
 
    Please see the CHANGES_1.3 file in the same directory for a full list
@@ -90,76 +86,64 @@
    Apache 2.0 for better performance, stability and security on their
    platforms.
 
-                     Apache 1.3.27 Major changes
+                     Apache 1.3.28 Major changes
 
   Security vulnerabilities
 
-     * Fix the security vulnerability noted in CAN-2002-0839 (cve.mitre.org)
-       regarding ownership permissions of System V shared memory based
-       scoreboards.  The fix resulted in the new ShmemUIDisUser directive.
+     * CAN-2003-0460 (cve.mitre.org): Fix the rotatelogs support program on
+       Win32 and OS/2 to ignore special control characters received over the
+       pipe.  Previously such characters could cause it to quit logging and
+       exit.  We would like to thank the Hitachi Incident Response team for
+       their responsible disclosure of this issue.
 
-     * Fix the security vulnerability noted in CAN-2002-0840 (cvs.mitre.org)
-       regarding a cross-site scripting vulnerability in the default error
-       page when using wildcard DNS.
-
-     * Fix the security vulnerability noted in CAN-2002-0843 (cve.mitre.org)
-       regarding some possible overflows in ab.c which could be exploited by
-       a malicious server.
+     * VU#379828 : The server could crash when going into an infinite loop
+       due to too many subsequent internal redirects and nested subrequests. 
+   
+     * Eliminated leaks of several file descriptors to child processes, such
+       as CGI scripts.
 
   New features
 
-   The main new features in 1.3.27 (compared to 1.3.26) are:
-
-     * The new ErrorHeader directive has been added.
-
-     * Configuration file globbing can now use simple pattern
-       matching.
+   The main new features in 1.3.28 (compared to 1.3.27) are:
 
-     * The protocol version (eg: HTTP/1.1) in the request line parsing
-       is now case insensitive.
+     * Added new ap_register_cleanup_ex() API function which allows
+       for a "magic" cleanup function to be run at register time
+       rather than at cleanup time. 
 
-     * ap_snprintf() can now distinguish between an output which was
-       truncated, and an output which exactly filled the buffer.
-
-     * Add ProtocolReqCheck directive, which determines if Apache will
-       check for a valid protocol string in the request (eg: HTTP/1.1)
-       and return HTTP_BAD_REQUEST if not valid. Versions of Apache
-       prior to 1.3.26 would silently ignore bad protocol strings, but
-       1.3.26 included a more strict check. This makes it runtime
-       configurable.
-
-     * Added support for Berkeley-DB/4.x to mod_auth_db.
-
-     * httpd -V will now also print out the compile time defined
-       HARD_SERVER_LIMIT value.
+     * Improvements to mod_usertrack that allows for a regular (verbose)
+       as well as "compact" version of the tracking cookie (the new
+       'CookieFormat' directive), and the ability to prepend a string
+       to the cookie via the 'CookiePrefix' directive.
 
    New features that relate to specific platforms:
 
-     * Support Caldera OpenUNIX 8.
-     
-     * Use SysV semaphores by default on OpenBSD.
+     * Introduce Win32 .pdb diagnostic symbols into the Apache 1.3 build
+       (as created in Apache 2.0.45 and later.)  which akes debugging and
+       analysis of crash dumps and Dr. Watson logs trivial.
 
-     * Implemented file locking in mod_rewrite for the NetWare
-       CLib platform.
+     * AIX: Change the default accept mechanism from pthread back to
+       fcntl.
 
   Bugs fixed
 
-   The following bugs were found in Apache 1.3.26 (or earlier) and have
-   been fixed in Apache 1.3.27:
+   The following noteworthy bugs were found in Apache 1.3.27 (or earlier)
+   and have been fixed in Apache 1.3.28:
+
+     * Make sure the accept mutex is released before calling child exit
+       hooks and cleanups.
 
-     * mod_proxy fixes:
-        - The cache in mod_proxy was incorrectly updating the Content-Length
-          value from 304 responses when doing validation.
-        - Fix a problem in proxy where headers from other modules were
-          added to the response headers when this was already done in the
-          core already.
+     * Fix mod_rewrite's handling of absolute URIs.  The escaping routines
+       now work scheme dependent and the query string will only be
+       appended if supported by the particular scheme.
 
-     * In 1.3.26, a null or all blank Content-Length field would be
-       triggered as an error; previous versions would silently ignore
-       this and assume 0.  1.3.27 restores this previous behavior.
+     * Prevent obscenely large values of precision in ap_vformatter
+       from clobbering a buffer.
 
-     * Win32: Fix one byte buffer overflow in ap_get_win32_interpreter
-       when a CGI script's #! line does not contain a \r or \n (i.e.
-       a line feed character) in the first 1023 bytes. The overflow
-       is always a '\0' (string termination) character.
+     * Update timeout algorithm in free_proc_chain. If a subprocess
+       did not exit immediately, the thread would sleep for 3 seconds
+       before checking the subprocess exit status again. In a very
+       common case when the subprocess was an HTTP server CGI script,
+       the CGI script actually exited a fraction of a second into the 3
+       second sleep, which effectively limited the server to serving one 
+       CGI request every 3 seconds across a persistent connection.
 
diff --git a/usr.sbin/httpd/CHANGES b/usr.sbin/httpd/CHANGES
new file mode 100644
index 00000000000..4f36295a07b
--- /dev/null
+++ b/usr.sbin/httpd/CHANGES
@@ -0,0 +1,128 @@
+                   OVERVIEW OF NEW FEATURES IN APACHE 1.2
+
+New features with this release, as extensions of the Apache functionality
+For more information, see the documentation included with this release
+(htdocs/manual/) or http://www.apache.org/docs/
+
+In addition to a number of bug fixes and internal performance
+enhancements, Apache 1.2 has the following specific new user
+features:
+
+
+  *) HTTP/1.1 Compliance
+       Aside from the optional proxy module (which operates as HTTP/1.0),
+       Apache is conditionally compliant with the HTTP/1.1 proposed standard,
+       as approved by the IESG and the IETF HTTP working group.
+       HTTP/1.1 provides a much-improved protocol, and should allow for
+       greater performance and efficiency when transferring files. Apache
+       does, however, still work great with HTTP/1.0 browsers.  We are very
+       close to being unconditionally compliant; if you note any deviance
+       from the proposed standard, please report it as a bug.
+
+  *) eXtended Server Side Includes (XSSI)
+       A new set of server-side include directives allows the user to
+       better create WWW pages. This includes number of powerful new
+       features, such as the ability to set variables and use conditional
+       HTML.
+
+  *) File-based and Regex-enabled Directive Sections
+       The new <Files> section allows directives to be enabled based on
+       full filename, not just directory and URL. In addition, <Files>
+       sections can appear in .htaccess files. <Files>, along with
+       <Directory> and <Location>, can also now be based on regular
+       expressions, not just simple prefix matching.
+
+  *) Browser-based Environment Variables
+       Environment variables can now be set based on the User-Agent
+       string of the browser. Combined with XSSI, this allows you to
+       write browser-based conditional HTML documents.
+
+  *) SetUID CGI Execution 
+       Apache now supports the execution of CGI scripts as users other
+       than the server user. A number of security checks are built in to
+       try and make this as safe as possible.
+
+  *) URL Rewriting Module
+       The optional mod_rewrite module is now included. This module can
+       provide powerful URL mapping, using regular expressions. There's
+       nothing this module can't do!
+
+  *) Enhanced, Configurable Logging
+       The optional mod_log_config included with earlier versions of
+       Apache is now standard, and has been enhanced to allow logging of
+       much more detail about the transaction, and can be used to open
+       more than one log at once (each of which can have a different log
+       format).
+
+  *) User Tracking (Cookies) Revisions
+       The mod_cookies included with previous versions of Apache has been
+       renamed mod_usertrack, to more accurately reflect its function
+       (some people inadvertently thought it enabled cookie support in
+       Apache, which is not true - Apache supports the use of cookies
+       directly). It is also now possible to disable the generation of
+       cookies, even when the cookie module is compiled in. Also, an
+       expiry time can be set on the cookies.
+
+  *) Multiple IPs in <VirtualHost>
+       The <VirtualHost> directive can now take more than one IP address
+       or hostname. This lets a single vhost handles requests for
+       multiple IPs or hostnames.
+
+  *) CGI Debugging Environment
+       ScriptLog allows you to now set up a log that records all input
+       and output to failed CGI scripts. This includes environment
+       variables, input headers, POST data, output, and more. This makes
+       CGI scripts much easier to debug.
+
+  *) Resource Limits for CGI Scripts
+       New directives allow the limiting of resources used by CGI scripts
+       (e.g. max CPU time). This is helpful in preventing 'runaway' CGI
+       processes.
+
+  *) Redirect Directive Can Return Alternate Status
+       The Redirect directive can return permanent or temporary redirects,
+       "Gone" or "See Other" HTTP status. For NCSA-compatibility,
+       RedirectTemp and RedirectPermanent are also implemented.
+
+  *) Graceful Restarts
+       Apache can re-read the config files and re-open log files without
+       terminating transactions in progress.
+
+  *) Simplified Compilation
+       The process of configuring Apache for compilation has been
+       simplified.
+
+  *) Add or Remove Options
+       The Options directive can now add or remove options from those
+       currently in force, rather than always replacing them.
+
+  *) Command-line Help
+       The -h command-line option now lists all the available directives.
+
+  *) Optional Headers Module to Set or Remove HTTP Headers
+       The optional mod_headers module can be used to set custom headers
+       in the HTTP response. It can append to existing headers, replace
+       them, or remove headers from the response.
+
+  *) Conditional Config Directives
+       A new <IfModule> section allows directives to be enabled only if a
+       given module is loaded into the server.
+
+  *) Authorization Directives Now Use NCSA-style Syntax
+       The AuthUserFile, AuthGroupFile and AuthDigestFile commands now
+       have a syntax compatible with the NCSA server.
+
+  *) Optional Proxy Module
+       An improved FTP, HTTP, and CONNECT mode SSL proxy is included with
+       Apache 1.2. Some of the changes visible to users:
+       
+              - Improved FTP proxy supporting PASV mode
+              - CONNECT mode ports are configurable from a list
+              - NoCache * directive for disabling proxy caching
+              - Numerous bug fixes
+
+  *) Optional Example Module
+       An example module that demonstrates many of the aspects of the
+       API is now included with Apache as of version 1.2.  It can be
+       used as a base for those who wish to write their own Apache
+       modules.
diff --git a/usr.sbin/httpd/INSTALL b/usr.sbin/httpd/INSTALL
index 410e7497342..a02df5c15f7 100644
--- a/usr.sbin/httpd/INSTALL
+++ b/usr.sbin/httpd/INSTALL
@@ -97,7 +97,7 @@
         For more in-depth information about DSO support in Apache 1.3 please
         read the document htdocs/manual/dso.html carefully. Especially the
         section entitled "Advantages & Disadvantages" because using the DSO
-        mechanism can have strange side-effects if you are not carefully. BE
+        mechanism can have strange side-effects if you are not careful. BE
         WARNED!
 
   3. Configuring the source tree
diff --git a/usr.sbin/httpd/LICENSE b/usr.sbin/httpd/LICENSE
index 504f5560ce5..886dacf5191 100644
--- a/usr.sbin/httpd/LICENSE
+++ b/usr.sbin/httpd/LICENSE
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.sbin/httpd/Makefile b/usr.sbin/httpd/Makefile
new file mode 100644
index 00000000000..b2895c9fe25
--- /dev/null
+++ b/usr.sbin/httpd/Makefile
@@ -0,0 +1,113 @@
+SUBDIR+=src
+WWWROOT=/var/www
+CONFFILES= \
+	conf/srm.conf-dist conf/access.conf-dist conf/httpd.conf-dist \
+	conf/mime.types conf/access.conf conf/httpd.conf conf/srm.conf 
+HTDOCS= \
+	htdocs/apache_pb.gif htdocs/index.html htdocs/openbsdpower.gif
+CGIFILES= \
+	cgi-bin/printenv cgi-bin/test-cgi	
+MANUALFILES= \
+	manual/images/home.gif manual/images/index.gif			\
+	manual/images/sub.gif manual/misc/API.html			\
+	manual/misc/known_bugs.html manual/misc/FAQ.html		\
+	manual/misc/known_client_problems.html				\
+	manual/misc/client_block_api.html manual/misc/nopgp.html	\
+	manual/misc/compat_notes.html manual/misc/perf-bsd44.html	\
+	manual/misc/descriptors.html manual/misc/perf-dec.html		\
+	manual/misc/fin_wait_2.html manual/misc/perf.html		\
+	manual/misc/footer.html manual/misc/security_tips.html		\
+	manual/misc/header.html manual/misc/vif-info.html		\
+	manual/misc/howto.html manual/misc/windoz_keepalive.html	\
+	manual/LICENSE manual/host.html manual/multilogs.html		\
+	manual/TODO  manual/new_features_1_0.html		\
+	manual/bind.html manual/index.html				\
+	manual/new_features_1_1.html manual/cgi_path.html		\
+	manual/install.html manual/new_features_1_2.html		\
+	manual/content-negotiation.html manual/install_1_1.html		\
+	manual/process-model.html manual/custom-error.html		\
+	manual/invoking.html manual/stopping.html			\
+	manual/dns-caveats.html manual/keepalive.html			\
+	manual/suexec.html manual/env.html manual/location.html		\
+	manual/unixware.html manual/footer.html				\
+	manual/man-template.html manual/vhosts-in-depth.html		\
+	manual/handler.html manual/virtual-host.html	\
+	manual/header.html manual/mod/core.html		\
+	manual/mod/mod_auth_msql.html manual/mod/mod_include.html	\
+	manual/mod/directives.html manual/mod/mod_browser.html		\
+	manual/mod/mod_info.html manual/mod/footer.html			\
+	manual/mod/mod_cern_meta.html manual/mod/mod_log_agent.html	\
+	manual/mod/header.html manual/mod/mod_cgi.html			\
+	manual/mod/mod_log_common.html manual/mod/index.html		\
+	manual/mod/mod_cookies.html manual/mod/mod_log_config.html	\
+	manual/mod/mod_access.html manual/mod/mod_digest.html		\
+	manual/mod/mod_log_referer.html manual/mod/mod_actions.html	\
+	manual/mod/mod_dir.html manual/mod/mod_mime.html		\
+	manual/mod/mod_alias.html manual/mod/mod_dld.html		\
+	manual/mod/mod_negotiation.html manual/mod/mod_asis.html	\
+	manual/mod/mod_env.html manual/mod/mod_proxy.html		\
+	manual/mod/mod_auth.html manual/mod/mod_example.html		\
+	manual/mod/mod_rewrite.html manual/mod/mod_auth_anon.html	\
+	manual/mod/mod_expires.html manual/mod/mod_status.html		\
+	manual/mod/mod_auth_db.html manual/mod/mod_headers.html		\
+	manual/mod/mod_userdir.html manual/mod/mod_auth_dbm.html	\
+	manual/mod/mod_imap.html manual/mod/mod_usertrack.html
+ICONFILES= \
+	icons/README icons/c.gif icons/hand.right.gif icons/pie2.gif	\
+	icons/sphere1.gif icons/a.gif icons/comp.blue.gif		\
+	icons/hand.up.gif icons/pie3.gif icons/sphere2.gif		\
+	icons/alert.black.gif icons/comp.gray.gif icons/icon.sheet.gif	\
+	icons/pie4.gif icons/tar.gif icons/alert.red.gif		\
+	icons/compressed.gif icons/image1.gif icons/pie5.gif		\
+	icons/tex.gif icons/apache_pb.gif icons/continued.gif		\
+	icons/image2.gif icons/pie6.gif icons/text.gif icons/back.gif	\
+	icons/dir.gif icons/image3.gif icons/pie7.gif			\
+	icons/transfer.gif icons/ball.gray.gif icons/down.gif		\
+	icons/index.gif icons/pie8.gif icons/unknown.gif		\
+	icons/ball.red.gif icons/dvi.gif icons/layout.gif		\
+	icons/portal.gif icons/up.gif icons/binary.gif icons/f.gif	\
+	icons/left.gif icons/ps.gif icons/uu.gif icons/binhex.gif	\
+	icons/folder.gif icons/link.gif icons/quill.gif			\
+	icons/uuencoded.gif icons/blank.gif icons/folder.open.gif	\
+	icons/movie.gif icons/right.gif icons/world1.gif		\
+	icons/bomb.gif icons/folder.sec.gif icons/p.gif			\
+	icons/screw1.gif icons/world2.gif icons/box1.gif		\
+	icons/forward.gif icons/patch.gif icons/screw2.gif		\
+	icons/box2.gif icons/generic.gif icons/pdf.gif			\
+	icons/script.gif icons/broken.gif icons/generic.red.gif		\
+	icons/pie0.gif icons/sound1.gif icons/burst.gif			\
+	icons/generic.sec.gif icons/pie1.gif icons/sound2.gif
+
+distribution:
+	@-for i in ${CONFFILES}; do \
+		j=`dirname $$i`; \
+		echo "Installing ${DESTDIR}${WWWROOT}/$$i"; \
+		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
+		${.CURDIR}/$$i ${DESTDIR}${WWWROOT}/$$j/; \
+	done
+	@-for i in ${HTDOCS}; do \
+		j=`dirname $$i`; \
+		echo "Installing ${DESTDIR}${WWWROOT}/$$i"; \
+		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
+		${.CURDIR}/$$i ${DESTDIR}${WWWROOT}/$$j/; \
+	done
+	@-for i in ${MANUALFILES}; do \
+		j=`dirname $$i`; \
+		echo "Installing ${DESTDIR}${WWWROOT}/$$i"; \
+		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
+		${.CURDIR}/htdocs/$$i ${DESTDIR}${WWWROOT}/htdocs/$$j/; \
+	done
+	@-for i in ${CGIFILES}; do \
+		j=`dirname $$i`; \
+		echo "Installing ${DESTDIR}${WWWROOT}/$$i"; \
+		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 555 \
+		${.CURDIR}/$$i ${DESTDIR}${WWWROOT}/$$j/; \
+	done
+	@-for i in ${ICONFILES}; do \
+		j=`dirname $$i`; \
+		echo "Installing ${DESTDIR}${WWWROOT}/$$i"; \
+		${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 444 \
+		${.CURDIR}/$$i ${DESTDIR}${WWWROOT}/$$j/; \
+	done
+
+.include<bsd.subdir.mk>
diff --git a/usr.sbin/httpd/Makefile.tmpl b/usr.sbin/httpd/Makefile.tmpl
index e696df7d5ac..dd8cbbb2b9c 100644
--- a/usr.sbin/httpd/Makefile.tmpl
+++ b/usr.sbin/httpd/Makefile.tmpl
@@ -1,7 +1,7 @@
 ## ====================================================================
 ## The Apache Software License, Version 1.1
 ##
-## Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+## Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
 ## reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -612,10 +612,12 @@ install-config:
 			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
 			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
 			-e 's;conf/magic;$(sysconfdir)/magic;' \
+			-e 's;conf/srm.conf;$(sysconfdir)/srm.conf;' \
+			-e 's;conf/access.conf;$(sysconfdir)/access.conf;' \
 			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
 			-e 's;User nobody;User $(conf_user);' \
 			-e 's;Group #-1;Group $(conf_group);' \
-			-e 's;Group "#-1";Group $(conf_group);' \
+			-e 's;^Group "#-1";Group $(conf_group);' \
 			-e 's;Port 80;Port $(conf_port);' \
 			-e 's;Listen 80;Listen $(conf_port);' \
 			-e 's;Listen 443;Listen $(conf_port_ssl);' \
diff --git a/usr.sbin/httpd/configure b/usr.sbin/httpd/configure
index c8681547fca..07d97301293 100644
--- a/usr.sbin/httpd/configure
+++ b/usr.sbin/httpd/configure
@@ -2,7 +2,7 @@
 ## ====================================================================
 ## The Apache Software License, Version 1.1
 ##
-## Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+## Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
 ## reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -1007,7 +1007,7 @@ do
             ;;
         --suexec-umask=*)
             suexec_umask_val="$apc_optarg"
-            suexec_umask="-DSUEXEC_UMASK=$apc_optarg"
+            suexec_umask="-DSUEXEC_UMASK=0$apc_optarg"
             suexec_ok=1
             ;;
         --server-uid=*)