Merge r1705217 from trunk:

[apache] / Apache.dsw

diff --git a/Apache.dsw b/Apache.dsw
index ebe937cbbb5e9e5c29c30fe5984d30536d6f935f..a77b870a611f081648288b461b7371542f50513f 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -71,9 +71,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name mod_example_ipc
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_lbmethod_rr
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -111,6 +108,9 @@ Package=<4>
     Project_Dep_Name mod_alias
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_allowmethods
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_asis
     End Project Dependency
     Begin Project Dependency
@@ -138,6 +138,12 @@ Package=<4>
     Project_Dep_Name mod_authn_file
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_authn_socache
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_authnz_fcgi
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_authnz_ldap
     End Project Dependency
     Begin Project Dependency
@@ -168,6 +174,12 @@ Package=<4>
     Project_Dep_Name mod_buffer
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_cache_disk
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_cache_socache
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
@@ -177,6 +189,9 @@ Package=<4>
     Project_Dep_Name mod_charset_lite
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_data
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_dav_fs
     End Project Dependency
     Begin Project Dependency
@@ -186,9 +201,6 @@ Package=<4>
     Project_Dep_Name mod_dir
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_disk_cache
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name mod_dumpio
     End Project Dependency
     Begin Project Dependency
@@ -246,12 +258,18 @@ Package=<4>
     Project_Dep_Name mod_log_config
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_log_debug
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_log_forensic
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name mod_logio
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_macro
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_mime
     End Project Dependency
     Begin Project Dependency
@@ -270,6 +288,9 @@ Package=<4>
     Project_Dep_Name mod_proxy_connect
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_proxy_express
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_proxy_fcgi
     End Project Dependency
     Begin Project Dependency
@@ -279,12 +300,24 @@ Package=<4>
     Project_Dep_Name mod_proxy_http
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_proxy_scgi
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy_wstunnel
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_ratelimit
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_reflector
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_remoteip
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_reqtimeout
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_request
     End Project Dependency
     Begin Project Dependency
@@ -303,6 +336,12 @@ Package=<4>
     Project_Dep_Name mod_setenvif
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_slotmem_plain
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_slotmem_shm
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_socache_dbm
     End Project Dependency
     Begin Project Dependency
@@ -336,9 +375,6 @@ Package=<4>
     Project_Dep_Name mod_vhost_alias
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_watchdog
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name ab
     End Project Dependency
     Begin Project Dependency
@@ -588,6 +624,42 @@ Package=<4>
 
 ###############################################################################
 
+Project: "apr_dbm_db"=".\srclib\apr-util\dbm\apr_dbm_db.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
+}}}
+
+###############################################################################
+
+Project: "apr_dbm_gdbm"=".\srclib\apr-util\dbm\apr_dbm_gdbm.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
+}}}
+
+###############################################################################
+
 Project: "apr_ldap"=".\srclib\apr-util\ldap\apr_ldap.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -900,6 +972,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_allowmethods"=.\modules\aaa\mod_allowmethods.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>
@@ -1002,9 +1095,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_session
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -1132,6 +1222,48 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_authn_socache"=.\modules\aaa\mod_authn_socache.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_authnz_fcgi"=.\modules\aaa\mod_authnz_fcgi.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_authnz_ldap"=.\modules\aaa\mod_authnz_ldap.dsp - Package Owner=<4>
 
 Package=<5>
@@ -1516,6 +1648,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_data"=.\modules\filters\mod_data.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_dav"=.\modules\dav\main\mod_dav.dsp - Package Owner=<4>
 
 Package=<5>
@@ -1648,7 +1801,31 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_disk_cache"=.\modules\cache\mod_disk_cache.dsp - Package Owner=<4>
+Project: "mod_cache_disk"=.\modules\cache\mod_cache_disk.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
+    Begin Project Dependency
+    Project_Dep_Name mod_cache
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_cache_socache"=.\modules\cache\mod_cache_socache.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1861,6 +2038,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_http2"=.\modules\http2\mod_http2.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>
 
 Package=<5>
@@ -1899,6 +2097,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_watchdog
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -1920,6 +2121,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_watchdog
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -2137,7 +2341,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_lbmethod_rr"=.\modules\proxy\examples\mod_lbmethod_rr.dsp - Package Owner=<4>
+Project: "mod_ldap"=.\modules\ldap\mod_ldap.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -2154,17 +2358,32 @@ Package=<4>
     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 mod_proxy
+    Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_proxy_balancer
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_ldap"=.\modules\ldap\mod_ldap.dsp - Package Owner=<4>
+Project: "mod_log_debug"=.\modules\loggers\mod_log_debug.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -2176,16 +2395,13 @@ 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_log_config"=.\modules\loggers\mod_log_config.dsp - Package Owner=<4>
+Project: "mod_log_forensic"=.\modules\loggers\mod_log_forensic.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -2206,7 +2422,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_log_forensic"=.\modules\loggers\mod_log_forensic.dsp - Package Owner=<4>
+Project: "mod_logio"=.\modules\loggers\mod_logio.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -2227,7 +2443,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_logio"=.\modules\loggers\mod_logio.dsp - Package Owner=<4>
+Project: "mod_lua"=.\modules\lua\mod_lua.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -2248,7 +2464,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_lua"=.\modules\lua\mod_lua.dsp - Package Owner=<4>
+Project: "mod_macro"=.\modules\core\mod_macro.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -2425,6 +2641,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_proxy_express"=.\modules\proxy\mod_proxy_express.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
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_proxy_fcgi"=.\modules\proxy\mod_proxy_fcgi.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2474,6 +2714,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_proxy_html"=.\modules\filters\mod_proxy_html.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_http"=.\modules\proxy\mod_proxy_http.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2498,6 +2759,54 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_proxy_scgi"=.\modules\proxy\mod_proxy_scgi.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
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_proxy_wstunnel"=.\modules\proxy\mod_proxy_wstunnel.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
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_ratelimit"=.\modules\filters\mod_ratelimit.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2519,6 +2828,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_reflector"=.\modules\filters\mod_reflector.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_remoteip"=.\modules\metadata\mod_remoteip.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2540,6 +2870,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_reqtimeout"=.\modules\filters\mod_reqtimeout.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_request"=.\modules\filters\mod_request.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2720,6 +3071,48 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_slotmem_plain"=.\modules\slotmem\mod_slotmem_plain.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_slotmem_shm"=.\modules\slotmem\mod_slotmem_shm.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_socache_dbm"=.\modules\cache\mod_socache_dbm.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2993,7 +3386,28 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_watchdog"=.\modules\mappers\mod_watchdog.dsp - Package Owner=<4>
+Project: "mod_watchdog"=.\modules\core\mod_watchdog.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_xml2enc"=.\modules\filters\mod_xml2enc.dsp - Package Owner=<4>
 
 Package=<5>
 {{{