This commit was manufactured by cvs2svn to create tag2.0.49

'APACHE_2_0_49'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/tags/2.0.49@103019 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 102 insertions, 874 deletions

diff --git a/docs/manual/mod/mod_log_forensic.html b/docs/manual/mod/mod_log_forensic.html
deleted file mode 100644
index 8537be041d..0000000000
--- a/docs/manual/mod/mod_log_forensic.html
+++ /dev/null
@@ -1,3 +0,0 @@
-URI: mod_log_forensic.html.en
-Content-Language: en
-Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_log_forensic.xml.meta b/docs/manual/mod/mod_log_forensic.xml.meta
deleted file mode 100644
index abb454728f..0000000000
--- a/docs/manual/mod/mod_log_forensic.xml.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<metafile>
-  <basename>mod_log_forensic</basename>
-  <path>/mod/</path>
-  <relpath>..</relpath>
-
-  <variants>
-    <variant>en</variant>
-  </variants>
-</metafile>
diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c
index 089d3d2293..6f38edf517 100644
--- a/modules/arch/netware/mod_nw_ssl.c
+++ b/modules/arch/netware/mod_nw_ssl.c
@@ -220,7 +220,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve
             (LPWSAPROTOCOL_INFO)&SecureProtoInfo, 0, 0);
             
     if (s == INVALID_SOCKET) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
+        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
                      "make_secure_socket: failed to get a socket for %s", 
                      addr);
         return -1;
@@ -231,7 +231,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve
 		    
         if (WSAIoctl(s, SO_SSL_SET_FLAGS, (char *)&optParam,
             sizeof(optParam), NULL, 0, NULL, NULL, NULL)) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
+            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
                          "make_secure_socket: for %s, WSAIoctl: "
                          "(SO_SSL_SET_FLAGS)", addr);
             return -1;
@@ -246,7 +246,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve
 
     if (WSAIoctl(s, SO_SSL_SET_SERVER, (char *)&opts, sizeof(opts),
         NULL, 0, NULL, NULL, NULL) != 0) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
+        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
                      "make_secure_socket: for %s, WSAIoctl: "
                      "(SO_SSL_SET_SERVER)", addr);
         return -1;
@@ -257,7 +257,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve
 
         if(WSAIoctl(s, SO_SSL_SET_FLAGS, (char*)&optParam,
             sizeof(optParam), NULL, 0, NULL, NULL, NULL)) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
+            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
                          "make_secure_socket: for %s, WSAIoctl: "
                          "(SO_SSL_SET_FLAGS)", addr);
             return -1;
diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic
deleted file mode 100644
index 561922eae5..0000000000
--- a/modules/loggers/NWGNUforensic
+++ /dev/null
@@ -1,261 +0,0 @@
-#
-# Declare the sub-directories to be built here
-#
-
-SUBDIRS = \
-	$(EOLIST) 
-
-#
-# Get the 'head' of the build environment.  This includes default targets and
-# paths to tools
-#
-
-include $(AP_WORK)\build\NWGNUhead.inc
-
-#
-# build this level's files
-
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS	+= \
-			$(AP_WORK)/include \
-			$(NWOS) \
-			$(AP_WORK)/modules/arch/netware \
-			$(AP_WORK)/srclib/apr/include \
-			$(AP_WORK)/srclib/apr-util/include \
-			$(AP_WORK)/srclib/apr \
-			$(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS		+= \
-			-prefix pre_nw.h \
-			$(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES	+= \
-			$(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS		+= \
-			$(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-		   	$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-		   	$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm.  If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME		= forensic
-
-#
-# This is used by the link '-desc ' directive. 
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION	= Apache $(VERSION_STR) Forensic Logging Module
-
-#
-# This is used by the '-threadname' directive.  If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME	= Forensic Module
-
-#
-# If this is specified, it will override VERSION value in 
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION		=
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE	= 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM	= _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM	= _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM	=
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS		=  AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def 
-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA         = 
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
-	$(OBJDIR)/forensic.nlm \
-	$(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
-	$(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
-	$(OBJDIR)/mod_log_forensic.o \
-	$(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
-   	libcpre.o \
-	$(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
-	aprlib \
-	libc \
-	$(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
- 
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
-	@$(NWOS)/httpd.imp \
-	@libc.imp \
-	$(EOLIST)
- 
-#   
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
-	log_forensic_module \
-	$(EOLIST)
-	
-#   
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
-		$(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-	copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.*
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
-
-	
diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio
deleted file mode 100644
index 21d68b9673..0000000000
--- a/modules/loggers/NWGNUmodlogio
+++ /dev/null
@@ -1,261 +0,0 @@
-#
-# Declare the sub-directories to be built here
-#
-
-SUBDIRS = \
-	$(EOLIST) 
-
-#
-# Get the 'head' of the build environment.  This includes default targets and
-# paths to tools
-#
-
-include $(AP_WORK)\build\NWGNUhead.inc
-
-#
-# build this level's files
-
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS	+= \
-			$(AP_WORK)/include \
-			$(NWOS) \
-			$(AP_WORK)/modules/arch/netware \
-			$(AP_WORK)/srclib/apr/include \
-			$(AP_WORK)/srclib/apr-util/include \
-			$(AP_WORK)/srclib/apr \
-			$(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS		+= \
-			-prefix pre_nw.h \
-			$(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES	+= \
-			$(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS		+= \
-			$(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-		   	$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-		   	$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm.  If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME		= logio
-
-#
-# This is used by the link '-desc ' directive. 
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION	= Apache $(VERSION_STR) IO Logging Module
-
-#
-# This is used by the '-threadname' directive.  If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME	= Logio Module
-
-#
-# If this is specified, it will override VERSION value in 
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION		=
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE	= 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM	= _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM	= _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM	=
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS		=  AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def 
-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA         = 
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
-	$(OBJDIR)/modlogio.nlm \
-	$(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
-	$(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
-	$(OBJDIR)/mod_logio.o \
-	$(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
-   	libcpre.o \
-	$(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
-	aprlib \
-	libc \
-	$(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
- 
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
-	@$(NWOS)/httpd.imp \
-	@libc.imp \
-	$(EOLIST)
- 
-#   
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
-	logio_module \
-	$(EOLIST)
-	
-#   
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
-		$(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-	copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.*
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
-
-	
diff --git a/modules/loggers/mod_log_forensic.c b/modules/loggers/mod_log_forensic.c
deleted file mode 100644
index 649d52cf11..0000000000
--- a/modules/loggers/mod_log_forensic.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/* Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * See also support/check_forensic.
- * Relate the forensic log to the transfer log by including
- * %{forensic-id}n in the custom log format, for example:
- * CustomLog logs/custom "%h %l %u %t \"%r\" %>s %b %{forensic-id}n"
- *
- * Credit is due to Tina Bird <tbird precision-guesswork.com>, whose
- * idea this module was.
- *
- *   Ben Laurie 29/12/2003
- */
-
-#include "httpd.h"
-#include "http_config.h"
-#include "http_log.h"
-#include "apr_strings.h"
-#include "apr_atomic.h"
-#include <unistd.h>
-#include "http_protocol.h"
-#include "test_char.h"
-
-module AP_MODULE_DECLARE_DATA log_forensic_module;
-
-typedef struct fcfg {
-    const char *logname;
-    apr_file_t *fd;
-} fcfg;
-
-static apr_uint32_t next_id;
-
-static void *make_forensic_log_scfg(apr_pool_t *p, server_rec *s)
-{
-    fcfg *cfg = apr_pcalloc(p, sizeof *cfg);
-
-    cfg->logname = NULL;
-    cfg->fd = NULL;
-
-    return cfg;
-}
-
-static void *merge_forensic_log_scfg(apr_pool_t *p, void *parent, void *new)
-{
-    fcfg *cfg = apr_pcalloc(p, sizeof *cfg);
-    fcfg *pc = parent;
-    fcfg *nc = new;
-
-    cfg->logname = apr_pstrdup(p, nc->logname ? nc->logname : pc->logname);
-    cfg->fd = NULL;
-
-    return cfg;
-}
-
-static int open_log(server_rec *s, apr_pool_t *p)
-{
-    fcfg *cfg = ap_get_module_config(s->module_config, &log_forensic_module);
-
-    if (!cfg->logname || cfg->fd)
-        return 1;
-
-    if (*cfg->logname == '|') {
-        piped_log *pl;
-        const char *pname = ap_server_root_relative(p, cfg->logname + 1);
-
-        pl = ap_open_piped_log(p, pname);
-        if (pl == NULL) {
-            ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
-                         "couldn't spawn forensic log pipe %s", cfg->logname);
-            return 0;
-        }
-        cfg->fd = ap_piped_log_write_fd(pl);
-    }
-    else {
-        const char *fname = ap_server_root_relative(p, cfg->logname);
-        apr_status_t rv;
-
-        if ((rv = apr_file_open(&cfg->fd, fname,
-                                APR_WRITE | APR_APPEND | APR_CREATE,
-                                APR_OS_DEFAULT, p)) != APR_SUCCESS) {
-            ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
-                         "could not open forensic log file %s.", fname);
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-static int log_init(apr_pool_t *pc, apr_pool_t *p, apr_pool_t *pt,
-                     server_rec *s)
-{
-    for ( ; s ; s = s->next) {
-        if (!open_log(s, p)) {
-            return HTTP_INTERNAL_SERVER_ERROR;
-        }
-    }
-
-    return OK;
-}
-
-  
-/* e is the first _invalid_ location in q
-   N.B. returns the terminating NUL.
- */
-static char *log_escape(char *q, const char *e, const char *p)
-{
-    for ( ; *p ; ++p) {
-        ap_assert(q < e);
-        if (test_char_table[*(unsigned char *)p]&T_ESCAPE_FORENSIC) {
-            ap_assert(q+2 < e);
-            *q++ = '%';
-            sprintf(q, "%02x", *(unsigned char *)p);
-            q += 2;
-        }
-        else
-            *q++ = *p;
-    }
-    ap_assert(q < e);
-    *q = '\0';
-
-    return q;
-}
-
-typedef struct hlog {
-    char *log;
-    char *pos;
-    char *end;
-    apr_pool_t *p;
-    apr_size_t count;
-} hlog;
-
-static int count_string(const char *p)
-{
-    int n;
-
-    for (n = 0 ; *p ; ++p, ++n)
-        if (test_char_table[*(unsigned char *)p]&T_ESCAPE_FORENSIC)
-            n += 2;
-    return n;
-}
-
-static int count_headers(void *h_, const char *key, const char *value)
-{
-    hlog *h = h_;
-
-    h->count += count_string(key)+count_string(value)+2;
-
-    return 1;
-}
-
-static int log_headers(void *h_, const char *key, const char *value)
-{
-    hlog *h = h_;
-
-    /* note that we don't have to check h->pos here, coz its been done
-       for us by log_escape */
-    *h->pos++ = '|';
-    h->pos = log_escape(h->pos, h->end, key);
-    *h->pos++ = ':';
-    h->pos = log_escape(h->pos, h->end, value);
-
-    return 1;
-}
-
-static int log_before(request_rec *r)
-{
-    fcfg *cfg = ap_get_module_config(r->server->module_config,
-                                     &log_forensic_module);
-    const char *id;
-    hlog h;
-    apr_size_t n;
-    apr_status_t rv;
-
-    if (!cfg->fd || r->prev) {
-        return DECLINED;
-    }
-
-    if (!(id = apr_table_get(r->subprocess_env, "UNIQUE_ID"))) {
-        /* we make the assumption that we can't go through all the PIDs in
-           under 1 second */
-        id = apr_psprintf(r->pool, "%x:%lx:%x", getpid(), time(NULL),
-                          apr_atomic_inc32(&next_id));
-    }
-    ap_set_module_config(r->request_config, &log_forensic_module, (char *)id);
-
-    h.p = r->pool;
-    h.count = 0;
-
-    apr_table_do(count_headers, &h, r->headers_in, NULL);
-
-    h.count += 1+strlen(id)+1+count_string(r->the_request)+1+1;
-    h.log = apr_palloc(r->pool, h.count);
-    h.pos = h.log;
-    h.end = h.log+h.count;
-
-    *h.pos++ = '+';
-    strcpy(h.pos, id);
-    h.pos += strlen(h.pos);
-    *h.pos++ = '|';
-    h.pos = log_escape(h.pos, h.end, r->the_request);
-
-    apr_table_do(log_headers, &h, r->headers_in, NULL);
-
-    ap_assert(h.pos < h.end);
-    *h.pos++ = '\n';
-
-    n = h.count-1;
-    rv = apr_file_write(cfg->fd, h.log, &n);
-    ap_assert(rv == APR_SUCCESS && n == h.count-1);
-
-    apr_table_setn(r->notes, "forensic-id", id);
-
-    return OK;
-}
-
-static int log_after(request_rec *r)
-{
-    fcfg *cfg = ap_get_module_config(r->server->module_config,
-                                     &log_forensic_module);
-    const char *id = ap_get_module_config(r->request_config,
-                                          &log_forensic_module);
-    char *s;
-    apr_size_t l, n;
-    apr_status_t rv;
-
-    if (!cfg->fd) {
-        return DECLINED;
-    }
-
-    s = apr_pstrcat(r->pool, "-", id, "\n", NULL);
-    l = n = strlen(s);
-    rv = apr_file_write(cfg->fd, s, &n);
-    ap_assert(rv == APR_SUCCESS && n == l);
-
-    return OK;
-}
-
-static const char *set_forensic_log(cmd_parms *cmd, void *dummy, const char *fn)
-{
-    fcfg *cfg = ap_get_module_config(cmd->server->module_config,
-                                     &log_forensic_module);
-
-    cfg->logname = fn;
-    return NULL;
-}
-
-static const command_rec forensic_log_cmds[] =
-{
-    AP_INIT_TAKE1("ForensicLog",  set_forensic_log,  NULL,  RSRC_CONF,
-                  "the filename of the forensic log"),
-    { NULL }
-};
-
-static void register_hooks(apr_pool_t *p)
-{
-    static const char * const pre[] = { "mod_unique_id.c", NULL };
-
-    ap_hook_open_logs(log_init,NULL,NULL,APR_HOOK_MIDDLE);
-    ap_hook_post_read_request(log_before,pre,NULL,APR_HOOK_REALLY_FIRST);
-    ap_hook_log_transaction(log_after,NULL,NULL,APR_HOOK_REALLY_LAST);
-}
-
-module AP_MODULE_DECLARE_DATA log_forensic_module =
-{
-    STANDARD20_MODULE_STUFF,
-    NULL,                       /* create per-dir config */
-    NULL,                       /* merge per-dir config */
-    make_forensic_log_scfg,     /* server config */
-    merge_forensic_log_scfg,    /* merge server config */
-    forensic_log_cmds,          /* command apr_table_t */
-    register_hooks              /* register hooks */
-};
diff --git a/modules/ssl/Makefile.in b/modules/ssl/Makefile.in
index 69b3e75d8b..14cccddc18 100644
--- a/modules/ssl/Makefile.in
+++ b/modules/ssl/Makefile.in
@@ -1,16 +1,50 @@
-# Copyright 2000-2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+## ====================================================================
+## The Apache Software License, Version 1.1
+##
+## Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+## reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+##
+## 1. Redistributions of source code must retain the above copyright
+##    notice, this list of conditions and the following disclaimer.
+##
+## 2. Redistributions in binary form must reproduce the above copyright
+##    notice, this list of conditions and the following disclaimer in
+##    the documentation and/or other materials provided with the
+##    distribution.
+##
+## 3. The end-user documentation included with the redistribution,
+##    if any, must include the following acknowledgment:
+##       "This product includes software developed by the
+##        Apache Software Foundation (http://www.apache.org/)."
+##    Alternately, this acknowledgment may appear in the software itself,
+##    if and wherever such third-party acknowledgments normally appear.
+##
+## 4. The names "Apache" and "Apache Software Foundation" must
+##    not be used to endorse or promote products derived from this
+##    software without prior written permission. For written
+##    permission, please contact apache@apache.org.
+##
+## 5. Products derived from this software may not be called "Apache",
+##    nor may "Apache" appear in their name, without prior written
+##    permission of the Apache Software Foundation.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+## DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+## ====================================================================
 
 #
 #   standard stuff
diff --git a/modules/ssl/config.m4 b/modules/ssl/config.m4
index b6454ec417..e56c48dc5c 100644
--- a/modules/ssl/config.m4
+++ b/modules/ssl/config.m4
@@ -1,15 +1,50 @@
-dnl  Copyright 2000-2004 The Apache Software Foundation
-dnl  Licensed under the Apache License, Version 2.0 (the "License");
-dnl  you may not use this file except in compliance with the License.
-dnl  You may obtain a copy of the License at
-dnl 
-dnl       http://www.apache.org/licenses/LICENSE-2.0
-dnl 
-dnl  Unless required by applicable law or agreed to in writing, software
-dnl  distributed under the License is distributed on an "AS IS" BASIS,
-dnl  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-dnl  See the License for the specific language governing permissions and
-dnl  limitations under the License.
+dnl ## ====================================================================
+dnl ## The Apache Software License, Version 1.1
+dnl ##  
+dnl ## Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
+dnl ## reserved.
+dnl ##
+dnl ## Redistribution and use in source and binary forms, with or without
+dnl ## modification, are permitted provided that the following conditions
+dnl ## are met:
+dnl ##
+dnl ## 1. Redistributions of source code must retain the above copyright
+dnl ##    notice, this list of conditions and the following disclaimer.
+dnl ##
+dnl ## 2. Redistributions in binary form must reproduce the above copyright
+dnl ##    notice, this list of conditions and the following disclaimer in
+dnl ##    the documentation and/or other materials provided with the
+dnl ##    distribution.
+dnl ##
+dnl ## 3. The end-user documentation included with the redistribution,
+dnl ##    if any, must include the following acknowledgment:
+dnl ##       "This product includes software developed by the
+dnl ##        Apache Software Foundation (http://www.apache.org/)."
+dnl ##    Alternately, this acknowledgment may appear in the software itself,
+dnl ##    if and wherever such third-party acknowledgments normally appear.
+dnl ##
+dnl ## 4. The names "Apache" and "Apache Software Foundation" must
+dnl ##    not be used to endorse or promote products derived from this
+dnl ##    software without prior written permission. For written
+dnl ##    permission, please contact apache@apache.org.
+dnl ##
+dnl ## 5. Products derived from this software may not be called "Apache",
+dnl ##    nor may "Apache" appear in their name, without prior written
+dnl ##    permission of the Apache Software Foundation.
+dnl ##
+dnl ## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+dnl ## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+dnl ## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+dnl ## DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+dnl ## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+dnl ## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+dnl ## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+dnl ## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+dnl ## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+dnl ## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+dnl ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+dnl ## SUCH DAMAGE.
+dnl ## ====================================================================
 
 dnl #  start of module specific part
 APACHE_MODPATH_INIT(ssl)
diff --git a/support/NWGNUab b/support/NWGNUab
index d0ca39d1ba..82811ad91c 100644
--- a/support/NWGNUab
+++ b/support/NWGNUab
@@ -111,8 +111,7 @@ NLM_THREAD_NAME	= ab
 # This is used by the '-screenname' directive.  If left blank,
 # 'Apache for NetWare' Thread will be used.
 #
-#NLM_SCREEN_NAME = Apache Bench
-NLM_SCREEN_NAME = DEFAULT
+NLM_SCREEN_NAME = Apache Bench
 
 #
 # If this is specified, it will override VERSION value in
diff --git a/support/ab.c b/support/ab.c
index 123f21566a..0fe0748d62 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -1551,10 +1551,7 @@ static void test(void)
     con = calloc(concurrency * sizeof(struct connection), 1);
     
     stats = calloc(requests * sizeof(struct data), 1);
-
-    if ((status = apr_pollset_create(&readbits, concurrency, cntxt, 0)) != APR_SUCCESS) {
-        apr_err("apr_pollset_create failed", status);
-    }
+    apr_pollset_create(&readbits, concurrency, cntxt, 0);
 
     /* setup request */
     if (posting <= 0) {
@@ -1766,14 +1763,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-	printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.121.2.9 $> apache-2.0");
+	printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.121.2.8 $> apache-2.0");
 	printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
 	printf("Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/\n");
 	printf("\n");
     }
     else {
 	printf("<p>\n");
-	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.121.2.9 $");
+	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.121.2.8 $");
 	printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
 	printf(" Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/<br>\n");
 	printf("</p>\n<p>\n");
diff --git a/support/check_forensic b/support/check_forensic
deleted file mode 100755
index a3b530917b..0000000000
--- a/support/check_forensic
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# check_forensic <forensic log file>
-
-# check the forensic log for requests that did not complete
-# output the request log for each one
-
-F=$1
-
-cut -f 1 -d '|' $F  > /tmp/fc-all.$$
-grep + < /tmp/fc-all.$$ | cut -c2- | sort > /tmp/fc-in.$$
-grep -- - < /tmp/fc-all.$$ | cut -c2- | sort > /tmp/fc-out.$$
-# use -i instead of -I for GNU xargs
-join -v 1 /tmp/fc-in.$$ /tmp/fc-out.$$ | xargs -I xx egrep "^\\+xx" $F
-rm /tmp/fc-all.$$ /tmp/fc-in.$$ /tmp/fc-out.$$