Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
AFAICT, this is a Win32 platform-specific defect, as there is
no corresponding config.m4, and therefore no unix module named 
mod_lbmethod_rr.

This module was apparently abandoned prior to API changes that
preceeded 2.4.1 and therefore never belonged in the 2.4.x GA.

Remove the last references from branches/2.4.x, and we can deal
later with whether or not this subsists on trunk/...

Reviewed by: wrowe, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1736269 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
William A. Rowe Jr committed Mar 23, 2016
1 parent 37dbfc0 commit 1ab9e3b
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 313 deletions.
27 changes: 0 additions & 27 deletions Apache-apr2.dsw
Expand Up @@ -68,9 +68,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
}}}

###############################################################################
Expand Down Expand Up @@ -1987,30 +1984,6 @@ Package=<4>

###############################################################################

Project: "mod_lbmethod_rr"=.\modules\proxy\examples\mod_lbmethod_rr.dsp - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libapr
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_ldap"=.\modules\ldap\mod_ldap.dsp - Package Owner=<4>

Package=<5>
Expand Down
30 changes: 0 additions & 30 deletions Apache.dsw
Expand Up @@ -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
}}}

###############################################################################
Expand Down Expand Up @@ -2344,33 +2341,6 @@ Package=<4>

###############################################################################

Project: "mod_lbmethod_rr"=.\modules\proxy\examples\mod_lbmethod_rr.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_ldap"=.\modules\ldap\mod_ldap.dsp - Package Owner=<4>

Package=<5>
Expand Down
8 changes: 0 additions & 8 deletions Makefile.win
Expand Up @@ -564,11 +564,6 @@ _build:
$(MAKE) $(MAKEOPT) -f mod_lbmethod_bytraffic.mak CFG="mod_lbmethod_bytraffic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_lbmethod_heartbeat.mak CFG="mod_lbmethod_heartbeat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..\..
!IFDEF ALL
cd modules\proxy\examples
$(MAKE) $(MAKEOPT) -f mod_lbmethod_rr.mak CFG="mod_lbmethod_rr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..\..
!ENDIF
cd modules\session
$(MAKE) $(MAKEOPT) -f mod_session.mak CFG="mod_session - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET)
Expand Down Expand Up @@ -836,9 +831,6 @@ _copybin:
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_byrequests.$(src_so) "$(inst_so)" <.y
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bytraffic.$(src_so) "$(inst_so)" <.y
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_heartbeat.$(src_so) "$(inst_so)" <.y
!IFDEF ALL
copy modules\proxy\examples\$(LONG)\mod_lbmethod_rr.$(src_so) "$(inst_so)" <.y
!ENDIF
copy modules\session\$(LONG)\mod_session.$(src_so) "$(inst_so)" <.y
copy modules\session\$(LONG)\mod_session_cookie.$(src_so) "$(inst_so)" <.y
copy modules\session\$(LONG)\mod_session_dbd.$(src_so) "$(inst_so)" <.y
Expand Down
3 changes: 1 addition & 2 deletions README.cmake
Expand Up @@ -309,8 +309,7 @@ Known Bugs and Limitations
of httpd and support libraries in a manner suitable for typical users
* no logic to find support libraries or otherwise build these modules:
+ mod_socache_dc (requires distcache), mod_serf (requires serf)
+ additionally, mod_lbmethod_rr and mod_firehose don't compile on Windows
anyway
+ additionally, mod_firehose doesn't compile on Windows anyway
* buildmark.c isn't necessarily rebuilt when httpd.exe is regenerated
* ApacheMonitor has a build error and is disabled
* CGI examples aren't installed
Expand Down
134 changes: 0 additions & 134 deletions modules/proxy/examples/mod_lbmethod_rr.c

This file was deleted.

111 changes: 0 additions & 111 deletions modules/proxy/examples/mod_lbmethod_rr.dsp

This file was deleted.

1 change: 0 additions & 1 deletion os/win32/BaseAddr.ref
Expand Up @@ -86,7 +86,6 @@ mod_dav_lock.so 0x707C0000 0x00020000
mod_auth_form.so 0x707E0000 0x00020000
mod_example_ipc.so 0x70800000 0x00010000
mod_request.so 0x70810000 0x00010000
mod_lbmethod_rr.so 0x70820000 0x00010000
mod_session.so 0x70830000 0x00020000
mod_session_cookie.so 0x70850000 0x00010000
mod_session_crypto.so 0x70860000 0x00020000
Expand Down

0 comments on commit 1ab9e3b

Please sign in to comment.