httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1736269 - in /httpd/httpd/branches/2.4.x: Apache-apr2.dsw Apache.dsw Makefile.win README.cmake modules/proxy/examples/ os/win32/BaseAddr.ref
Date Wed, 23 Mar 2016 03:45:27 GMT
Author: wrowe
Date: Wed Mar 23 03:45:27 2016
New Revision: 1736269

URL: http://svn.apache.org/viewvc?rev=1736269&view=rev
Log:
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

Removed:
    httpd/httpd/branches/2.4.x/modules/proxy/examples/
Modified:
    httpd/httpd/branches/2.4.x/Apache-apr2.dsw
    httpd/httpd/branches/2.4.x/Apache.dsw
    httpd/httpd/branches/2.4.x/Makefile.win
    httpd/httpd/branches/2.4.x/README.cmake
    httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref

Modified: httpd/httpd/branches/2.4.x/Apache-apr2.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Apache-apr2.dsw?rev=1736269&r1=1736268&r2=1736269&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache-apr2.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache-apr2.dsw Wed Mar 23 03:45:27 2016
@@ -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
 }}}
 
 ###############################################################################
@@ -1967,30 +1964,6 @@ Project: "mod_lbmethod_heartbeat"=.\modu
 
 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_lbmethod_rr"=.\modules\proxy\examples\mod_lbmethod_rr.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
 }}}
 
 Package=<4>

Modified: httpd/httpd/branches/2.4.x/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Apache.dsw?rev=1736269&r1=1736268&r2=1736269&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache.dsw Wed Mar 23 03:45:27 2016
@@ -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
 }}}
 
 ###############################################################################
@@ -2321,33 +2318,6 @@ Project: "mod_lbmethod_heartbeat"=.\modu
 
 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>
-{{{
 }}}
 
 Package=<4>

Modified: httpd/httpd/branches/2.4.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.win?rev=1736269&r1=1736268&r2=1736269&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.win (original)
+++ httpd/httpd/branches/2.4.x/Makefile.win Wed Mar 23 03:45:27 2016
@@ -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)
@@ -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

Modified: httpd/httpd/branches/2.4.x/README.cmake
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/README.cmake?rev=1736269&r1=1736268&r2=1736269&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/README.cmake (original)
+++ httpd/httpd/branches/2.4.x/README.cmake Wed Mar 23 03:45:27 2016
@@ -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

Modified: httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref?rev=1736269&r1=1736268&r2=1736269&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref Wed Mar 23 03:45:27 2016
@@ -86,7 +86,6 @@ mod_dav_lock.so             0x707C0000
 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



Mime
View raw message