? .modules_list
? accepttrace.patch
? foo
? httpd-2.1.patch
? patches
? sigaction.patch
? ssl_upgrade.patch
? wrowe-build.patch
? build/subst_conf.awk.txt
? modules/foo
? modules/arch/win32/isapi_fixes.patch
? modules/arch/win32/ooh
Index: Makefile.win
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.win,v
retrieving revision 1.133
diff -u -r1.133 Makefile.win
--- Makefile.win	8 Sep 2003 21:08:33 -0000	1.133
+++ Makefile.win	20 Nov 2003 17:57:52 -0000
@@ -474,6 +474,53 @@
 	copy INSTALL      "$(INSTDIR)\INSTALL.txt" <.y
 	copy LICENSE      "$(INSTDIR)\LICENSE.txt" <.y
 	copy README       "$(INSTDIR)\README.txt" <.y
+### Pregenerate the module list
+	copy << .modules_list
+LoadModule actions_module		modules/mod_actions.so
+LoadModule alias_module			modules/mod_alias.so
+LoadModule asis_module			modules/mod_asis.so
+LoadModule auth_basic_module		modules/mod_auth_basic.so
+#LoadModule auth_digest_module		modules/mod_auth_digest.so
+#LoadModule authn_anon_module		modules/mod_authn_anon.so
+#LoadModule authn_dbm_module		modules/mod_authn_dbm.so
+LoadModule authn_default_module		modules/mod_authn_default.so
+LoadModule authn_file_module		modules/mod_authn_file.so
+#LoadModule authz_dbm_module		modules/mod_authz_dbm.so
+LoadModule authz_default_module		modules/mod_authz_default.so
+LoadModule authz_groupfile_module	modules/mod_authz_groupfile.so
+LoadModule authz_host_module		modules/mod_authz_host.so
+LoadModule authz_user_module		modules/mod_authz_user.so
+LoadModule autoindex_module		modules/mod_autoindex.so
+#LoadModule cern_meta_module		modules/mod_cern_meta.so
+LoadModule cgi_module			modules/mod_cgi.so
+#LoadModule dav_module			modules/mod_dav.so
+#LoadModule dav_fs_module		modules/mod_dav_fs.so
+LoadModule dir_module			modules/mod_dir.so
+LoadModule env_module			modules/mod_env.so
+#LoadModule expires_module		modules/mod_expires.so
+#LoadModule file_cache_module		modules/mod_file_cache.so
+#LoadModule headers_module		modules/mod_headers.so
+LoadModule imap_module			modules/mod_imap.so
+LoadModule include_module		modules/mod_include.so
+#LoadModule info_module			modules/mod_info.so
+LoadModule isapi_module			modules/mod_isapi.so
+LoadModule log_config_module		modules/mod_log_config.so
+LoadModule mime_module			modules/mod_mime.so
+#LoadModule mime_magic_module		modules/mod_mime_magic.so
+#LoadModule proxy_module		modules/mod_proxy.so
+#LoadModule proxy_connect_module	modules/mod_proxy_connect.so
+#LoadModule proxy_http_module		modules/mod_proxy_http.so
+#LoadModule proxy_ftp_module		modules/mod_proxy_ftp.so
+LoadModule negotiation_module		modules/mod_negotiation.so
+#LoadModule rewrite_module		modules/mod_rewrite.so
+LoadModule setenvif_module		modules/mod_setenvif.so
+#LoadModule speling_module		modules/mod_speling.so
+#LoadModule status_module		modules/mod_status.so
+#LoadModule unique_id_module		modules/mod_unique_id.so
+LoadModule userdir_module		modules/mod_userdir.so
+#LoadModule usertrack_module		modules/mod_usertrack.so
+#LoadModule vhost_alias_module		modules/mod_vhost_alias.so
+<<
 !IF EXIST("srclib\openssl")
 	type << >> "$(INSTDIR)\README.txt"
 
@@ -538,6 +585,8 @@
 
 --------------------------------------------------------------------------------
 <<
+	echo "#LoadModule ssl_module			modules/mod_ssl.so" \
+		>> .modules_list

 !ENDIF
 !IF EXIST("srclib\zlib")
 	type << >> "$(INSTDIR)\README.txt"
@@ -561,6 +610,8 @@
     exit 1;
 }
 <<
+	echo "#LoadModule deflate_module		modules/mod_deflate.so" \
+		>> .modules_list

 !ENDIF
 	$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=$(SHORT) LONG=$(LONG) \
 		_copybin src_exe=exe src_dll=dll src_so=so             \
@@ -626,8 +677,9 @@
 	copy docs\conf\mime.types "$(INSTDIR)\conf\mime.types.default" <.y
 	if not exist "$(INSTDIR)\conf\mime.types" \
 	    copy "$(INSTDIR)\conf\mime.types.default" "$(INSTDIR)\conf\mime.types"
+### Fallback command, in case awk is not installed.  Users will need to manually edit:
 	copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\httpd.default.conf" <.y
-	-awk -f <<script.awk "docs/conf/httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\httpd.default.conf"
+	-awk -f <<script.awk "docs/conf/httpd-std.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\httpd.default.conf"
     BEGIN { 
 	serverroot = ARGV[2];
 	delete ARGV[2];
@@ -637,15 +689,31 @@
     }
     {
 	gsub( /@@ServerRoot@@/, serverroot );
+	gsub( /@rel_logfiledir@/, "logs" );
+	gsub( /@rel_runtimedir@/, "logs" );
+	gsub( /@rel_sysconfdir@/, "conf" );
+	gsub( /@exp_cgidir@/, serverroot "/cgi-bin" );
+	gsub( /@exp_errordir@/, serverroot "/error" );
+	gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
+	gsub( /@exp_iconsdir@/, serverroot "/icons" );
+	gsub( /@exp_logfiledir@/, serverroot "/logs" );
+	gsub( /@exp_manualdir@/, serverroot "/manual" );
+	gsub( /@exp_runtimedir@/, serverroot "/logs" );
+	gsub( /@exp_sysconfdir@/, serverroot "/conf" );
 	gsub( /@@ServerName@@/, "$(SERVERNAME)" );
 	gsub( /@@Port@@/, "$(PORT)" );
-	print $$0;
+	if ( /^@@LoadModule@@/ ) {
+
+	} else {
+	    print $$0;
+	}
     }
 <<
 	if not exist "$(INSTDIR)\conf\httpd.conf" \
 	    copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
+### Fallback command, in case awk is not installed.  Users will need to manually edit:
 	copy docs\conf\ssl-std.conf.in "$(INSTDIR)\conf\ssl.default.conf" <.y
-	-awk -f <<script.awk "docs/conf/ssl-std.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
+	-awk -f <<ssl-script.awk "docs/conf/ssl-std.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
     BEGIN { 
 	serverroot = ARGV[2];
 	delete ARGV[2];
@@ -655,6 +723,18 @@
     }
     {
 	gsub( /@@ServerRoot@@/, serverroot );
+	gsub( /@rel_logfiledir@/, "logs" );
+	gsub( /@rel_runtimedir@/, "logs" );
+	gsub( /@rel_sysconfdir@/, "conf" );
+	gsub( /@exp_cgidir@/, serverroot "/cgi-bin" );
+	gsub( /@exp_errordir@/, serverroot "/error" );
+	gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
+	gsub( /@exp_iconsdir@/, serverroot "/icons" );
+	gsub( /@exp_logfiledir@/, serverroot "/logs" );
+	gsub( /@exp_manualdir@/, serverroot "/manual" );
+	gsub( /@exp_runtimedir@/, serverroot "/logs" );
+	gsub( /@exp_sysconfdir@/, serverroot "/conf" );
+	gsub( /@@ServerName@@/, "$(SERVERNAME)" );
 	print $$0;
     }
 <<
Index: modules/arch/win32/mod_isapi.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_isapi.c,v
retrieving revision 1.92
diff -u -r1.92 mod_isapi.c
--- modules/arch/win32/mod_isapi.c	3 Sep 2003 19:27:01 -0000	1.92
+++ modules/arch/win32/mod_isapi.c	20 Nov 2003 17:57:54 -0000
@@ -851,6 +851,133 @@
     return (rv == OK);
 }
 
+/* If info is passed, the results are returned through the *info buffer,
+ * otherwise the path alone is returned via the original name_buf.
+ */
+static int map_url_to_path_internal(request_rec  *r, 
+                                    char         *name_buf, 
+                                    apr_uint32_t *buf_size,
+                                    HSE_URL_MAPEX_INFO *info) 
+{
+    char *file = memchr(name_buf, '\0', *buf_size);
+    apr_uint32_t fixed_size = sizeof(info->lpszPath);
+    request_rec *subreq;
+
+    apr_uint32_t len;
+    int trailslash;
+
+    if (file) {
+        len = name_buf - file;
+        file = name_buf;
+    }
+    else {
+        /* No trailing nul was found within buf_size bytes, so we must
+         * strndup the string to make the name safe to handle below . 
+         */
+        len = *buf_size;
+        file = apr_pstrndup(r->pool, name_buf, len);
+    }
+
+    if (info) {
+        /* We have grabbed the input file name; to make things simple we will 
+         * discard the input values of name_buf and buf_size and used fixed
+         * values to make using the name_buf and buf_size really trivial below
+         */
+        name_buf = info->lpszPath;
+        buf_size = &fixed_size;
+    }
+    
+    /* If len > 0, then look at the prior character for a trailing
+     * URI slash, and note that trailing slash to confirm it later 
+     */
+    trailslash = (len && (file[len-1] == '/'));
+    
+    /* Perform a sub_req to determine the path mapping. */
+    subreq = ap_sub_req_lookup_uri(file, r, NULL);
+    apr_filepath_merge(&file, NULL, subreq->filename, 
+                       APR_FILEPATH_NATIVE, subreq->pool);
+
+    /* Mapping started with assuming both strings matched.
+     * Treat the path_info component as a mismatch and handle
+     * terminating slashes for directory matches.
+     */
+    if (info) {
+        info->cchMatchingURL = len;
+        info->cchMatchingPath = strlen(file);
+        if (subreq->path_info && *subreq->path_info) {
+            info->cchMatchingURL -= strlen(subreq->path_info);
+        }
+        /* If the matched isn't a file, roll match back to the prior slash */
+        if (subreq->finfo.filetype == APR_NOFILE) {
+            while (info->cchMatchingPath && info->cchMatchingURL
+                       && file[info->cchMatchingPath - 1] != '/'
+                       && file[info->cchMatchingPath - 1] != '\\') { 
+                --info->cchMatchingPath;
+                --info->cchMatchingURL;
+            }
+        }
+    }
+
+    /* Now we need to merge the path info... */
+    if (subreq->path_info && *subreq->path_info) {
+        apr_filepath_merge(&file, subreq->filename, subreq->path_info,
+                           APR_FILEPATH_NATIVE, subreq->pool);
+    }
+    len = strlen(file);
+
+    /* IIS puts a trailing slash on directories, Apache doesn't */
+    if (subreq->finfo.filetype == APR_DIR) {
+        trailslash = 1;
+    }
+    /* If the trailing slash is already provided, we are good,
+     * forget about appending one later */
+    if (len && (file[len-1] == '/' || file[len-1] == '\\')) {
+        trailslash = 0;
+    }
+
+    if (info) {
+        /* is a combination of:
+         * HSE_URL_FLAGS_READ         0x001 Allow read
+         * HSE_URL_FLAGS_WRITE        0x002 Allow write
+         * HSE_URL_FLAGS_EXECUTE      0x004 Allow execute
+         * HSE_URL_FLAGS_SSL          0x008 Require SSL
+         * HSE_URL_FLAGS_DONT_CACHE   0x010 Don't cache (VRoot only)
+         * HSE_URL_FLAGS_NEGO_CERT    0x020 Allow client SSL cert
+         * HSE_URL_FLAGS_REQUIRE_CERT 0x040 Require client SSL cert
+         * HSE_URL_FLAGS_MAP_CERT     0x080 Map client SSL cert to account
+         * HSE_URL_FLAGS_SSL128       0x100 Require 128-bit SSL cert
+         * HSE_URL_FLAGS_SCRIPT       0x200 Allow script execution
+         *
+         * XxX: As everywhere, EXEC flags could use some work...
+         *      and this could go further with more flags, as desired.
+         */ 
+        info->dwFlags = (subreq->finfo.protection & APR_UREAD    ? 0x001 : 0)
+                      | (subreq->finfo.protection & APR_UWRITE   ? 0x002 : 0)
+                      | (subreq->finfo.protection & APR_UEXECUTE ? 0x204 : 0);
+
+    }
+
+    if (len + trailslash >= *buf_size) {
+        apr_cpystrn(name_buf, file, *buf_size);
+        *buf_size = len + trailslash + 1;
+        SetLastError(ERROR_INSUFFICIENT_BUFFER);
+        ap_destroy_sub_req(subreq);
+        return 0;
+    }
+    memcpy(name_buf, file, len + 1);
+    if (trailslash) {
+#ifdef WIN32
+        name_buf[++len] = '\\';
+#else
+        name_buf[++len] = '/';
+#endif
+        name_buf[len] = '\0';
+    }
+    *buf_size = len;
+    ap_destroy_sub_req(subreq);
+    return 1;
+}
+
 int APR_THREAD_FUNC ServerSupportFunction(isapi_cid    *cid, 
                                           apr_uint32_t  HSE_code,
                                           void         *buf_data, 
@@ -859,7 +986,6 @@
 {
     request_rec *r = cid->r;
     conn_rec *c = r->connection;
-    request_rec *subreq;
 
     switch (HSE_code) {
     case HSE_REQ_SEND_URL_REDIRECT_RESP:
@@ -943,26 +1069,8 @@
         return 0;
 
     case HSE_REQ_MAP_URL_TO_PATH:
-    {
         /* Map a URL to a filename */
-        char *file = (char *)buf_data;
-        apr_uint32_t len;
-        subreq = ap_sub_req_lookup_uri(apr_pstrndup(r->pool, file, *buf_size),
-                                       r, NULL);
-
-        len = apr_cpystrn(file, subreq->filename, *buf_size) - file;
-
-
-        /* IIS puts a trailing slash on directories, Apache doesn't */
-        if (subreq->finfo.filetype == APR_DIR) {
-            if (len < *buf_size - 1) {
-                file[len++] = '\\';
-                file[len] = '\0';
-            }
-        }
-        *buf_size = len;
-        return 1;
-    }
+        return map_url_to_path_internal(r, buf_data, buf_size, NULL);
 
     case HSE_REQ_GET_SSPI_INFO:
         if (cid->dconf.log_unsupported)
@@ -1210,74 +1318,8 @@
         return 0;
 
     case HSE_REQ_MAP_URL_TO_PATH_EX:
-    {
         /* Map a URL to a filename */
-        HSE_URL_MAPEX_INFO *info = (HSE_URL_MAPEX_INFO*)data_type;
-        char* test_uri = apr_pstrndup(r->pool, (char *)buf_data, *buf_size);
-
-        subreq = ap_sub_req_lookup_uri(test_uri, r, NULL);
-        info->cchMatchingURL = strlen(test_uri);        
-        info->cchMatchingPath = apr_cpystrn(info->lpszPath, subreq->filename, 
-                                      sizeof(info->lpszPath)) - info->lpszPath;
-
-        /* Mapping started with assuming both strings matched.
-         * Now roll on the path_info as a mismatch and handle
-         * terminating slashes for directory matches.
-         */
-        if (subreq->path_info && *subreq->path_info) {
-            apr_cpystrn(info->lpszPath + info->cchMatchingPath, 
-                        subreq->path_info, 
-                        sizeof(info->lpszPath) - info->cchMatchingPath);
-            info->cchMatchingURL -= strlen(subreq->path_info);
-            if (subreq->finfo.filetype == APR_DIR
-                 && info->cchMatchingPath < sizeof(info->lpszPath) - 1) {
-                /* roll forward over path_info's first slash */
-                ++info->cchMatchingPath;
-                ++info->cchMatchingURL;
-            }
-        }
-        else if (subreq->finfo.filetype == APR_DIR
-                 && info->cchMatchingPath < sizeof(info->lpszPath) - 1) {
-            /* Add a trailing slash for directory */
-            info->lpszPath[info->cchMatchingPath++] = '/';
-            info->lpszPath[info->cchMatchingPath] = '\0';
-        }
-
-        /* If the matched isn't a file, roll match back to the prior slash */
-        if (subreq->finfo.filetype == APR_NOFILE) {
-            while (info->cchMatchingPath && info->cchMatchingURL) {
-                if (info->lpszPath[info->cchMatchingPath - 1] == '/') 
-                    break;
-                --info->cchMatchingPath;
-                --info->cchMatchingURL;
-            }
-        }
-        
-        /* Paths returned with back slashes */
-        for (test_uri = info->lpszPath; *test_uri; ++test_uri)
-            if (*test_uri == '/')
-                *test_uri = '\\';
-        
-        /* is a combination of:
-         * HSE_URL_FLAGS_READ         0x001 Allow read
-         * HSE_URL_FLAGS_WRITE        0x002 Allow write
-         * HSE_URL_FLAGS_EXECUTE      0x004 Allow execute
-         * HSE_URL_FLAGS_SSL          0x008 Require SSL
-         * HSE_URL_FLAGS_DONT_CACHE   0x010 Don't cache (VRoot only)
-         * HSE_URL_FLAGS_NEGO_CERT    0x020 Allow client SSL cert
-         * HSE_URL_FLAGS_REQUIRE_CERT 0x040 Require client SSL cert
-         * HSE_URL_FLAGS_MAP_CERT     0x080 Map client SSL cert to account
-         * HSE_URL_FLAGS_SSL128       0x100 Require 128-bit SSL cert
-         * HSE_URL_FLAGS_SCRIPT       0x200 Allow script execution
-         *
-         * XxX: As everywhere, EXEC flags could use some work...
-         *      and this could go further with more flags, as desired.
-         */ 
-        info->dwFlags = (subreq->finfo.protection & APR_UREAD    ? 0x001 : 0)
-                      | (subreq->finfo.protection & APR_UWRITE   ? 0x002 : 0)
-                      | (subreq->finfo.protection & APR_UEXECUTE ? 0x204 : 0);
-        return 1;
-    }
+        return map_url_to_path_internal(r, buf_data, buf_size, (HSE_URL_MAPEX_INFO*)data_type);
 
     case HSE_REQ_ABORTIVE_CLOSE:
         if (cid->dconf.log_unsupported)
Index: server/mpm_common.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
retrieving revision 1.108
diff -u -r1.108 mpm_common.c
--- server/mpm_common.c	3 Sep 2003 19:27:09 -0000	1.108
+++ server/mpm_common.c	20 Nov 2003 17:57:55 -0000
@@ -953,7 +953,7 @@
 
 apr_status_t ap_fatal_signal_setup(server_rec *s, apr_pool_t *in_pconf)
 {
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     struct sigaction sa;
 
     sigemptyset(&sa.sa_mask);
@@ -986,7 +986,7 @@
         ap_log_error(APLOG_MARK, APLOG_WARNING, errno, s, "sigaction(SIGILL)");
 #endif
 
-#else /* NO_USE_SIGACTION */
+#else /* !APR_HAVE_SIGACTION */
     
     apr_signal(SIGSEGV, sig_coredump);
 #ifdef SIGBUS
@@ -1002,7 +1002,7 @@
     apr_signal(SIGILL, sig_coredump);
 #endif /* SIGILL */
 
-#endif /* NO_USE_SIGACTION */
+#endif /* !APR_HAVE_SIGACTION */
 
     pconf = in_pconf;
     parent_pid = my_pid = getpid();
Index: server/mpm/experimental/leader/leader.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/leader/leader.c,v
retrieving revision 1.32
diff -u -r1.32 leader.c
--- server/mpm/experimental/leader/leader.c	16 Nov 2003 01:51:27 -0000	1.32
+++ server/mpm/experimental/leader/leader.c	20 Nov 2003 17:57:56 -0000
@@ -535,7 +535,7 @@
 
 static void set_signals(void)
 {
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     struct sigaction sa;
 #endif
 
@@ -543,7 +543,7 @@
         ap_fatal_signal_setup(ap_server_conf, pconf);
     }
 
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
 
Index: server/mpm/experimental/perchild/perchild.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/perchild.c,v
retrieving revision 1.140
diff -u -r1.140 perchild.c
--- server/mpm/experimental/perchild/perchild.c	3 Sep 2003 19:27:11 -0000	1.140
+++ server/mpm/experimental/perchild/perchild.c	20 Nov 2003 17:57:57 -0000
@@ -401,7 +401,7 @@
 
 static void set_signals(void)
 {
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     struct sigaction sa;
 #endif
 
@@ -409,7 +409,7 @@
         ap_fatal_signal_setup(ap_server_conf, pconf);
     }
 
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
 
Index: server/mpm/experimental/threadpool/threadpool.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/threadpool/threadpool.c,v
retrieving revision 1.20
diff -u -r1.20 threadpool.c
--- server/mpm/experimental/threadpool/threadpool.c	5 Sep 2003 19:36:26 -0000	1.20
+++ server/mpm/experimental/threadpool/threadpool.c	20 Nov 2003 17:57:58 -0000
@@ -606,7 +606,7 @@
 
 static void set_signals(void)
 {
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     struct sigaction sa;
 #endif
 
@@ -614,7 +614,7 @@
         ap_fatal_signal_setup(ap_server_conf, pconf);
     }
 
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
 
Index: server/mpm/prefork/prefork.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
retrieving revision 1.282
diff -u -r1.282 prefork.c
--- server/mpm/prefork/prefork.c	16 Nov 2003 23:03:18 -0000	1.282
+++ server/mpm/prefork/prefork.c	20 Nov 2003 17:57:59 -0000
@@ -400,7 +400,7 @@
 
 static void set_signals(void)
 {
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     struct sigaction sa;
 #endif
 
@@ -408,7 +408,7 @@
         ap_fatal_signal_setup(ap_server_conf, pconf);
     }
 
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
 
Index: server/mpm/worker/worker.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
retrieving revision 1.140
diff -u -r1.140 worker.c
--- server/mpm/worker/worker.c	16 Nov 2003 23:47:07 -0000	1.140
+++ server/mpm/worker/worker.c	20 Nov 2003 17:58:00 -0000
@@ -445,7 +445,7 @@
 
 static void set_signals(void)
 {
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     struct sigaction sa;
 #endif
 
@@ -453,7 +453,7 @@
         ap_fatal_signal_setup(ap_server_conf, pconf);
     }
 
-#ifndef NO_USE_SIGACTION
+#if APR_HAVE_SIGACTION
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
 
Index: srclib/.cvsignore
===================================================================
RCS file: /home/cvs/httpd-2.0/srclib/.cvsignore,v
retrieving revision 1.8
diff -u -r1.8 .cvsignore
--- srclib/.cvsignore	17 Jun 2002 22:45:09 -0000	1.8
+++ srclib/.cvsignore	20 Nov 2003 17:58:00 -0000
@@ -3,3 +3,4 @@
 .deps
 openssl
 zlib
+apr*