replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP.

[apache] / Apache.dsw

diff --git a/Apache.dsw b/Apache.dsw
index 6061a42d19fb840b848af4302282e2d41bb46d58..ed10ddd23cce6d694d88551041e109a2b04aaf3d 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -74,9 +74,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name mod_lbmethod_rr
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_socache_dc
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -138,9 +135,6 @@ Package=<4>
     Project_Dep_Name mod_authn_dbm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_authn_default
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name mod_authn_file
     End Project Dependency
     Begin Project Dependency
@@ -156,9 +150,6 @@ Package=<4>
     Project_Dep_Name mod_authz_dbm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_authz_default
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name mod_authz_groupfile
     End Project Dependency
     Begin Project Dependency
@@ -174,6 +165,9 @@ Package=<4>
     Project_Dep_Name mod_autoindex
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_buffer
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_cern_meta
     End Project Dependency
     Begin Project Dependency
@@ -192,7 +186,7 @@ Package=<4>
     Project_Dep_Name mod_dir
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_disk_cache
+    Project_Dep_Name mod_cache_disk
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name mod_dumpio
@@ -216,6 +210,12 @@ Package=<4>
     Project_Dep_Name mod_headers
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_heartbeat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_heartmonitor
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_ident
     End Project Dependency
     Begin Project Dependency
@@ -231,6 +231,18 @@ Package=<4>
     Project_Dep_Name mod_isapi
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_lbmethod_bybusyness
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_lbmethod_byrequests
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_lbmethod_bytraffic
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_lbmethod_heartbeat
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_log_config
     End Project Dependency
     Begin Project Dependency
@@ -240,9 +252,6 @@ Package=<4>
     Project_Dep_Name mod_logio
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_mem_cache
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name mod_mime
     End Project Dependency
     Begin Project Dependency
@@ -270,12 +279,30 @@ 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_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
     Project_Dep_Name mod_rewrite
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_sed
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_session_cookie
     End Project Dependency
     Begin Project Dependency
@@ -285,6 +312,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
@@ -567,7 +600,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "apr_ldap"=".\srclib\apr-util\ldap\apr_ldap.dsp" - Package Owner=<4>
+Project: "apr_dbm_db"=".\srclib\apr-util\dbm\apr_dbm_db.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -585,7 +618,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "dftables"=.\srclib\pcre\dftables.dsp - Package Owner=<4>
+Project: "apr_dbm_gdbm"=".\srclib\apr-util\dbm\apr_dbm_gdbm.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -593,6 +626,30 @@ 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>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -827,9 +884,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name gen_test_char
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pcre
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -996,9 +1050,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_session
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -1102,30 +1153,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_authn_default"=.\modules\aaa\mod_authn_default.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_auth_basic
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "mod_authn_file"=.\modules\aaa\mod_authn_file.dsp - Package Owner=<4>
 
 Package=<5>
@@ -1249,7 +1276,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_authz_default"=.\modules\aaa\mod_authz_default.dsp - Package Owner=<4>
+Project: "mod_authz_groupfile"=.\modules\aaa\mod_authz_groupfile.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1273,7 +1300,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_authz_groupfile"=.\modules\aaa\mod_authz_groupfile.dsp - Package Owner=<4>
+Project: "mod_authz_host"=.\modules\aaa\mod_authz_host.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1297,7 +1324,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_authz_host"=.\modules\aaa\mod_authz_host.dsp - Package Owner=<4>
+Project: "mod_authz_owner"=.\modules\aaa\mod_authz_owner.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1321,7 +1348,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_authz_owner"=.\modules\aaa\mod_authz_owner.dsp - Package Owner=<4>
+Project: "mod_authz_user"=.\modules\aaa\mod_authz_user.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1345,7 +1372,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_authz_user"=.\modules\aaa\mod_authz_user.dsp - Package Owner=<4>
+Project: "mod_autoindex"=.\modules\generators\mod_autoindex.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1362,14 +1389,11 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_auth_basic
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_autoindex"=.\modules\generators\mod_autoindex.dsp - Package Owner=<4>
+Project: "mod_bucketeer"=.\modules\debugging\mod_bucketeer.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1390,7 +1414,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_bucketeer"=.\modules\debugging\mod_bucketeer.dsp - Package Owner=<4>
+Project: "mod_buffer"=.\modules\filters\mod_buffer.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1669,7 +1693,7 @@ 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>
 {{{
@@ -1903,6 +1927,54 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_heartbeat"=.\modules\cluster\mod_heartbeat.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_watchdog
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_heartmonitor"=.\modules\cluster\mod_heartmonitor.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_watchdog
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_ident"=.\modules\metadata\mod_ident.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2008,6 +2080,114 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_lbmethod_bybusyness"=.\modules\proxy\balancers\mod_lbmethod_bybusyness.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
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy_balancer
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_lbmethod_byrequests"=.\modules\proxy\balancers\mod_lbmethod_byrequests.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
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy_balancer
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_lbmethod_bytraffic"=.\modules\proxy\balancers\mod_lbmethod_bytraffic.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
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy_balancer
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_lbmethod_heartbeat"=.\modules\proxy\balancers\mod_lbmethod_heartbeat.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
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy_balancer
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_lbmethod_rr"=.\modules\proxy\examples\mod_lbmethod_rr.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2119,7 +2299,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_mem_cache"=.\modules\cache\mod_mem_cache.dsp - Package Owner=<4>
+Project: "mod_lua"=.\modules\lua\mod_lua.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -2136,9 +2316,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_cache
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -2372,6 +2549,114 @@ 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_ratelimit"=.\modules\filters\mod_ratelimit.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_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>
+{{{
+}}}
+
+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_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>
@@ -2414,6 +2699,51 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_sed"=.\modules\filters\mod_sed.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_serf"=.\modules\proxy\mod_serf.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_session"=.\modules\session\mod_session.dsp - Package Owner=<4>
 
 Package=<5>
@@ -2531,6 +2861,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>
@@ -2804,7 +3176,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "pcre"=.\srclib\pcre\pcre.dsp - Package Owner=<4>
+Project: "mod_watchdog"=.\modules\core\mod_watchdog.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -2813,7 +3185,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name dftables
+    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
 }}}