note that rewrite map expansions work in rewriteconds

[apache] / Apache.dsw

diff --git a/Apache.dsw b/Apache.dsw
index dddb5850aa1321ee531a000c1f381b1c4ab86330..b2b5cb202ed48c729fdc89e6555fe617c53a847a 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -3,72 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 5.00
 
 ###############################################################################
 
-Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ApacheCore"=".\ApacheCore.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gen_test_char
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gen_uri_delims
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name sdbmlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ApacheCoreDll"=".\ApacheCoreDll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pcre
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pcreposix
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name expatlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "InstallBin"=".\InstallBin.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -77,12 +11,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name Apache
     End Project Dependency
@@ -99,6 +27,9 @@ Package=<4>
     Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_dav_fs
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_expires
     End Project Dependency
     Begin Project Dependency
@@ -120,10 +51,10 @@ Package=<4>
     Project_Dep_Name mod_usertrack
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name htpasswd
+    Project_Dep_Name ab
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name rotatelogs
+    Project_Dep_Name htpasswd
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name htdigest
@@ -132,28 +63,13 @@ Package=<4>
     Project_Dep_Name logresolve
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ab
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pcreposix
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_dav
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_dav_fs
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name expatlib
+    Project_Dep_Name rotatelogs
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
+Project: "apr"=".\srclib\apr\apr.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -161,17 +77,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "aprlib"=".\srclib\apr\aprlib.dsp" - Package Owner=<4>
+Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -183,7 +93,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "aprlibdll"=".\srclib\apr\aprlibdll.dsp" - Package Owner=<4>
+Project: "libapr"=".\srclib\apr\libapr.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -192,13 +102,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "dftables"=".\srclib\pcre\dftables.dsp" - Package Owner=<4>
+Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -206,11 +116,17 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name aprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "expatlib"=".\srclib\expat-lite\expatlib.dsp" - Package Owner=<4>
+Project: "libexpat"=".\srclib\expat-lite\libexpat.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -222,7 +138,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
+Project: "dftables"=".\srclib\pcre\dftables.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -230,14 +146,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlib
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4>
+Project: "pcre"=".\srclib\pcre\pcre.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -246,13 +159,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name dftables
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
+Project: "pcreposix"=".\srclib\pcre\pcreposix.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -261,13 +174,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name pcre
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
+Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -275,17 +188,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "install"=".\os\win32\installer\installdll\install.dsp" - Package Owner=<4>
+Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -293,14 +200,35 @@ Package=<5>
 
 Package=<4>
 {{{
+}}}
+
+###############################################################################
+
+Project: "httpd"=".\httpd.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 gen_test_char
+    End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name gen_uri_delims
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
+Project: "libhttpd"=".\libhttpd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -309,7 +237,22 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libexpat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pcre
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pcreposix
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name httpd
     End Project Dependency
 }}}
 
@@ -324,10 +267,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -342,13 +285,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name sdbmlib
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -363,10 +306,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -381,10 +327,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -399,10 +345,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libaprutil
+    End Project Dependency    
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -417,20 +366,17 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name sdbmlib
+    Project_Dep_Name libhttpd
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name mod_dav
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name expatlib
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -444,10 +390,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -462,10 +408,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -480,10 +426,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -498,10 +444,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -516,10 +462,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -534,10 +480,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -552,10 +498,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -570,10 +516,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
@@ -588,16 +534,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "pcre"=".\lib\pcre\pcre.dsp" - Package Owner=<4>
+Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -606,13 +552,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name dftables
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "pcreposix"=".\lib\pcre\pcreposix.dsp" - Package Owner=<4>
+Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -621,13 +570,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name pcre
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprutil
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "rotatelogs"=".\support\rotatelogs.dsp" - Package Owner=<4>
+Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -635,11 +587,47 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprutil
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "sdbmlib"=".\lib\sdbm\sdbmlib.dsp" - Package Owner=<4>
+Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "rotatelogs"=".\support\rotatelogs.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{