*) Split all Win32 modules [excluding the core components mod_core,

     mod_so, mod_win32 and the winnt mpm] into individual loadable
     modules, so the administrator may individually disable the former
     compiled-in modules by simply commenting out their LoadModule
     directives.  [William Rowe]

  *) Saved Win32 module authors and porters many future headaches, by
     duplicating the appropriate .h files such as os.h into the include
     directory, including in the build tree.  [William Rowe]

  Also noticed that version stamp resources weren't generated for proxy
  modules, this too is now fixed.


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

1 files changed, 449 insertions, 7 deletions

diff --git a/Apache.dsw b/Apache.dsw
index 4eb5f99b05..b94f916f2e 100644
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -18,6 +18,21 @@ Package=<4>
     Project_Dep_Name ApacheMonitor
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_access
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_actions
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_alias
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_asis
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_auth
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_auth_anon
     End Project Dependency
     Begin Project Dependency
@@ -27,12 +42,24 @@ Package=<4>
     Project_Dep_Name mod_auth_digest
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_autoindex
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_cgi
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_dav_fs
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_dir
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_env
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_expires
     End Project Dependency
     Begin Project Dependency
@@ -42,15 +69,36 @@ Package=<4>
     Project_Dep_Name mod_headers
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_imap
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_include
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_info
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_isapi
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_log_config
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_mime
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_mime_magic
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_negotiation
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_rewrite
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_setenvif
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_speling
     End Project Dependency
     Begin Project Dependency
@@ -60,6 +108,9 @@ Package=<4>
     Project_Dep_Name mod_unique_id
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_userdir
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_usertrack
     End Project Dependency
     Begin Project Dependency
@@ -372,6 +423,111 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_access"=".\modules\aaa\mod_access.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_actions"=".\modules\mappers\mod_actions.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_alias"=".\modules\mappers\mod_alias.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_asis"=".\modules\generators\mod_asis.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_auth"=".\modules\aaa\mod_auth.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_auth_anon"=".\modules\aaa\mod_auth_anon.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -384,10 +540,14 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
+
 ###############################################################################
 
 Project: "mod_auth_dbm"=".\modules\aaa\mod_auth_dbm.dsp" - Package Owner=<4>
@@ -432,6 +592,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_autoindex"=".\modules\generators\mod_autoindex.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_cern_meta"=".\modules\metadata\mod_cern_meta.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -444,6 +625,30 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_cgi"=".\modules\generators\mod_cgi.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
@@ -495,6 +700,48 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_dir"=".\modules\mappers\mod_dir.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_env"=".\modules\metadata\mod_env.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_expires"=".\modules\metadata\mod_expires.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -507,6 +754,9 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
@@ -525,16 +775,58 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_headers"=".\modules\metadata\mod_headers.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libaprutil
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_headers"=".\modules\metadata\mod_headers.dsp" - Package Owner=<4>
+Project: "mod_imap"=".\modules\mappers\mod_imap.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_include"=".\modules\filters\mod_include.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -546,6 +838,9 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
@@ -564,6 +859,72 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_isapi"=".\modules\arch\win32\mod_isapi.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_log_config"=".\modules\loggers\mod_log_config.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_mime"=".\modules\http\mod_mime.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
@@ -582,6 +943,51 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_negotiation"=".\modules\mappers\mod_negotiation.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
@@ -600,13 +1006,16 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_speling"=".\modules\mappers\mod_speling.dsp" - Package Owner=<4>
+Project: "mod_setenvif"=".\modules\metadata\mod_setenvif.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -618,13 +1027,16 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_ssl"=".\modules\ssl\mod_ssl.dsp" - Package Owner=<4>
+Project: "mod_speling"=".\modules\mappers\mod_speling.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -641,8 +1053,26 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_ssl"=".\modules\ssl\mod_ssl.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name pcre
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -660,6 +1090,9 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
@@ -678,13 +1111,16 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_usertrack"=".\modules\metadata\mod_usertrack.dsp" - Package Owner=<4>
+Project: "mod_userdir"=".\modules\mappers\mod_userdir.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -696,13 +1132,16 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_vhost_alias"=".\modules\mappers\mod_vhost_alias.dsp" - Package Owner=<4>
+Project: "mod_usertrack"=".\modules\metadata\mod_usertrack.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -714,13 +1153,16 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4>
+Project: "mod_vhost_alias"=".\modules\mappers\mod_vhost_alias.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{