httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1201210 - in /httpd/httpd/branches/2.4.x: ./ docs/ modules/proxy/ os/win32/
Date Sat, 12 Nov 2011 06:35:59 GMT
Author: rjung
Date: Sat Nov 12 06:35:58 2011
New Revision: 1201210

URL: http://svn.apache.org/viewvc?rev=1201210&view=rev
Log:
Pre GA removal ob components that will not be included:
Part 2: Remove mod_serf.

Removed:
    httpd/httpd/branches/2.4.x/modules/proxy/NWGNUserf
    httpd/httpd/branches/2.4.x/modules/proxy/mod_serf.c
    httpd/httpd/branches/2.4.x/modules/proxy/mod_serf.dsp
    httpd/httpd/branches/2.4.x/modules/proxy/mod_serf.h
Modified:
    httpd/httpd/branches/2.4.x/Apache-apr2.dsw
    httpd/httpd/branches/2.4.x/Apache.dsw
    httpd/httpd/branches/2.4.x/BuildBin.dsp
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/Makefile.in
    httpd/httpd/branches/2.4.x/Makefile.win
    httpd/httpd/branches/2.4.x/NWGNUmakefile
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/acinclude.m4
    httpd/httpd/branches/2.4.x/docs/STATUS
    httpd/httpd/branches/2.4.x/modules/proxy/NWGNUmakefile
    httpd/httpd/branches/2.4.x/modules/proxy/config.m4
    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=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache-apr2.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache-apr2.dsw Sat Nov 12 06:35:58 2011
@@ -2394,27 +2394,6 @@ Package=<4>
 
 ###############################################################################
 
-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 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>

Modified: httpd/httpd/branches/2.4.x/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Apache.dsw?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache.dsw Sat Nov 12 06:35:58 2011
@@ -2813,30 +2813,6 @@ Package=<4>
 
 ###############################################################################
 
-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>

Modified: httpd/httpd/branches/2.4.x/BuildBin.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/BuildBin.dsp?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/BuildBin.dsp (original)
+++ httpd/httpd/branches/2.4.x/BuildBin.dsp Sat Nov 12 06:35:58 2011
@@ -39,7 +39,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml
_tryssl _tryzlib _tryserf _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml
_tryssl _tryzlib _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"
@@ -58,7 +58,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml
_tryssl _tryzlib _tryserf _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml
_tryssl _tryzlib _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Nov 12 06:35:58 2011
@@ -3,6 +3,7 @@ Changes with Apache 2.4.0
 
   *) Pre GA removal ob components that will not be included:
      - mod_noloris was superseded by mod_reqtimeout.
+     - mod_serf
      [Rainer Jung]
 
   *) core: Set MaxMemFree 2048 by default. [Stefan Fritsch]

Modified: httpd/httpd/branches/2.4.x/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.in?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.in (original)
+++ httpd/httpd/branches/2.4.x/Makefile.in Sat Nov 12 06:35:58 2011
@@ -202,7 +202,6 @@ INSTALL_HEADERS = \
 	$(srcdir)/modules/loggers/mod_log_config.h \
 	$(srcdir)/modules/mappers/mod_rewrite.h \
 	$(srcdir)/modules/proxy/mod_proxy.h \
-	$(srcdir)/modules/proxy/mod_serf.h \
         $(srcdir)/modules/session/mod_session.h \
 	$(srcdir)/modules/ssl/mod_ssl.h \
 	$(srcdir)/os/$(OS_DIR)/*.h

Modified: httpd/httpd/branches/2.4.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.win?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.win (original)
+++ httpd/httpd/branches/2.4.x/Makefile.win Sat Nov 12 06:35:58 2011
@@ -136,32 +136,6 @@ _tryssl:
 !ENDIF
 #     NOT EXIST("srclib\openssl")
 
-!IF EXIST("srclib\serf")
-
-_tryserf:
-!IF $(USEMAK) == 1
-	cd modules\proxy
-	$(MAKE) $(MAKEOPT) -f mod_serf.mak CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	cd ..\..
-!ELSEIF $(USESLN) == 1
-	devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_serf
-!ELSE
-	@msdev $(TLP).dsw /USEENV /MAKE \
-		"mod_serf - Win32 $(LONG)" /NORECURSE $(CTARGET)
-!ENDIF
-
-!ELSE
-#     NOT EXIST("srclib\serf")
-
-_tryserf:
-	@echo -----
-	@echo mod_serf will not build unless libserf.dll is built in srclib\serf
-	@echo For purposes of alpha, libserf release 0.3.0 works, but only with
-	@echo http://people.apache.org/~wrowe/fixserf-win32-0.3.0.patch
-
-!ENDIF
-#     NOT EXIST("srclib\serf")
-
 !IF EXIST("srclib\zlib")
 
 _tryzlib:
@@ -548,9 +522,6 @@ _build:
 	 $(MAKE) $(MAKEOPT) -f mod_proxy_ftp.mak   CFG="mod_proxy_ftp - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_proxy_http.mak  CFG="mod_proxy_http - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_proxy_scgi.mak  CFG="mod_proxy_scgi - Win32 $(LONG)" RECURSE=0
$(CTARGET)
-!IF EXIST("srclib\serf")
-	 $(MAKE) $(MAKEOPT) -f mod_serf.mak        CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-!ENDIF
 	cd ..\..
 	cd modules\proxy\balancers
 	 $(MAKE) $(MAKEOPT) -f mod_lbmethod_bybusyness.mak CFG="mod_lbmethod_bybusyness - Win32
$(LONG)" RECURSE=0 $(CTARGET)
@@ -692,9 +663,6 @@ _copybin:
 	for %d in ($(DBM_LIST) x) do if not %d == x ( \
 	  copy srclib\$(UTILDIR)\dbm\$(LONG)\apr_dbm_%d-1.$(src_dll) "$(inst_dll)" <.y \
 	)
-!IF EXIST("srclib\serf")
-	copy srclib\serf\$(LONG)\libserf.$(src_dll) 		"$(inst_dll)" <.y
-!ENDIF
 	copy srclib\pcre\pcre.$(src_dll)			"$(inst_dll)" <.y
 	copy modules\aaa\$(LONG)\mod_access_compat.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) 	"$(inst_so)" <.y
@@ -811,9 +779,6 @@ _copybin:
 	copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) 	"$(inst_so)" <.y
 	copy modules\proxy\$(LONG)\mod_proxy_http.$(src_so) 	"$(inst_so)" <.y
 	copy modules\proxy\$(LONG)\mod_proxy_scgi.$(src_so) 	"$(inst_so)" <.y
-!IF EXIST("srclib\serf")
-	copy modules\proxy\$(LONG)\mod_serf.$(src_so)		"$(inst_so)" <.y
-!ENDIF
 	copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bybusyness.$(src_so) "$(inst_so)" <.y
 	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
@@ -1059,9 +1024,6 @@ BEGIN {
 		srclib\apr-util\xml\expat\lib\expat.h \
 		srclib\apr\include\*.h \
 		srclib\apr-util\include\*.h \
-!IF EXIST("srclib\serf")
-		srclib\serf\*.h \
-!ENDIF
 		include\*.h \
 		os\win32\os.h \
 		modules\cache\mod_cache.h \
@@ -1075,7 +1037,6 @@ BEGIN {
 		modules\loggers\mod_log_config.h \
 		modules\mappers\mod_rewrite.h \
 		modules\proxy\mod_proxy.h \
-		modules\proxy\mod_serf.h \
 		modules\ssl\mod_ssl.h \
           ) do \
 	    @copy %f "$(INSTDIR)\include" < .y > nul
@@ -1099,10 +1060,6 @@ BEGIN {
 	copy srclib\expat\win32\$(LONG)\libexpat.exp    "$(INSTDIR)\lib" <.y
 	copy srclib\expat\win32\$(LONG)\libexpat.dll    "$(INSTDIR)\bin" <.y
 !ENDIF
-!IF EXIST("srclib\serf")
-	copy srclib\serf\$(LONG)\libserf.lib 		"$(INSTDIR)\lib" <.y
-	copy srclib\serf\$(LONG)\libserf.exp 		"$(INSTDIR)\lib" <.y
-!ENDIF
 	copy $(LONG)\libhttpd.exp 			"$(INSTDIR)\lib" <.y
 	copy $(LONG)\libhttpd.lib 			"$(INSTDIR)\lib" <.y
 	copy modules\dav\main\$(LONG)\mod_dav.exp 	"$(INSTDIR)\lib" <.y

Modified: httpd/httpd/branches/2.4.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/NWGNUmakefile?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.4.x/NWGNUmakefile Sat Nov 12 06:35:58 2011
@@ -439,7 +439,6 @@ installdev :: FORCE
 	$(call COPY,$(STDMOD)/loggers/mod_log_config.h,                $(INSTALLBASE)/include/)
 	$(call COPY,$(STDMOD)/mappers/mod_rewrite.h,                   $(INSTALLBASE)/include/)
 	$(call COPY,$(STDMOD)/proxy/mod_proxy.h,                       $(INSTALLBASE)/include/)
-	$(call COPY,$(STDMOD)/proxy/mod_serf.h,                        $(INSTALLBASE)/include/)
 	$(call COPY,$(STDMOD)/session/mod_session.h,                   $(INSTALLBASE)/include/)
 	$(call COPY,$(STDMOD)/ssl/mod_ssl.h,                           $(INSTALLBASE)/include/)
 	$(call COPY,$(APR)/*.imp,                                      $(INSTALLBASE)/lib/)

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Nov 12 06:35:58 2011
@@ -80,9 +80,7 @@ RELEASE SHOWSTOPPERS:
     If anyone disagrees, please comment.
 
     - MPM simple (unfinished; buggy)
-    - mod_serf (which is optimal for async httpd anyways; didn't work
-      with MPM event last time sf tested it)
-    
+
     See https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/STATUS 
     under 'modules docs' for a more comprehensive list of undocumented modules. 
 

Modified: httpd/httpd/branches/2.4.x/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/acinclude.m4?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/acinclude.m4 (original)
+++ httpd/httpd/branches/2.4.x/acinclude.m4 Sat Nov 12 06:35:58 2011
@@ -553,48 +553,6 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[
 ])
 
 dnl
-dnl APACHE_CHECK_SERF
-dnl
-dnl Configure for the detected libserf, giving preference to
-dnl "--with-serf=<path>" if it was specified.
-dnl
-AC_DEFUN([APACHE_CHECK_SERF], [
-  AC_CACHE_CHECK([for libserf], [ac_cv_serf], [
-    ac_cv_serf=no
-    serf_prefix=/usr
-    SERF_LIBS=""
-    AC_ARG_WITH(serf, APACHE_HELP_STRING([--with-serf=PREFIX],
-                                    [Serf client library]),
-    [
-        if test "$withval" = "yes" ; then
-          serf_prefix=/usr
-        else
-          serf_prefix=$withval
-        fi
-    ])
-
-    if test "$serf_prefix" != "no" ; then
-      save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES -I$serf_prefix/include/serf-0"
-      AC_CHECK_HEADERS(serf.h,[
-        save_ldflags="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
-        AC_CHECK_LIB(serf-0, serf_context_create,[ac_cv_serf="yes"])
-        LDFLAGS="$save_ldflags"])
-      CPPFLAGS="$save_cppflags"
-    fi
-  ])
-
-  APACHE_SUBST(SERF_LIBS)
-  if test "$ac_cv_serf" = "yes"; then
-    AC_DEFINE(HAVE_SERF, 1, [Define if libserf is available])
-    APR_SETVAR(SERF_LIBS, [-L$serf_prefix/lib -lserf-0])
-    APR_ADDTO(INCLUDES, [-I$serf_prefix/include/serf-0])
-  fi
-])
-
-
-dnl
 dnl APACHE_EXPORT_ARGUMENTS
 dnl Export (via APACHE_SUBST) the various path-related variables that
 dnl apache will use while generating scripts like autoconf and apxs and

Modified: httpd/httpd/branches/2.4.x/docs/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/STATUS?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/STATUS (original)
+++ httpd/httpd/branches/2.4.x/docs/STATUS Sat Nov 12 06:35:58 2011
@@ -57,7 +57,6 @@ To Do List
 
 - modules docs
     - the follwing modules added since 2.2 lack documentation
-        - mod_serf
         - mod_watchdog
         - mod_heartbeat
         - mod_heartmonitor

Modified: httpd/httpd/branches/2.4.x/modules/proxy/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/NWGNUmakefile?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/NWGNUmakefile Sat Nov 12 06:35:58 2011
@@ -167,17 +167,6 @@ TARGET_nlm = \
 	$(OBJDIR)/proxylbm_traf.nlm \
 	$(EOLIST)
 
-# If WITH_MOD_SERF and SERFSRC have been defined then build the mod_serf module
-ifdef WITH_MOD_SERF
-ifneq "$(SERFSRC)" ""
-ifneq "$(ZLIBSDK)" ""
-TARGET_nlm += \
-	$(OBJDIR)/serf.nlm \
-	$(EOLIST)
-endif
-endif
-endif
-
 #
 # If there is an LIB target, put it here
 #

Modified: httpd/httpd/branches/2.4.x/modules/proxy/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/config.m4?rev=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/config.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/config.m4 Sat Nov 12 06:35:58 2011
@@ -55,15 +55,6 @@ APACHE_MODULE(proxy_fdpass, Apache proxy
 APACHE_MODULE(proxy_ajp, Apache proxy AJP module.  Requires and is enabled by --enable-proxy.,
$proxy_ajp_objs, , $proxy_mods_enable)
 APACHE_MODULE(proxy_balancer, Apache proxy BALANCER module.  Requires and is enabled by --enable-proxy.,
$proxy_balancer_objs, , $proxy_mods_enable)
 
-APACHE_MODULE(serf, [Reverse proxy module using Serf], , , no, [
-    APACHE_CHECK_SERF
-    if test "$ac_cv_serf" = "yes" ; then
-      APR_ADDTO(MOD_SERF_LDADD, [\$(SERF_LIBS)])
-    else
-      enable_serf=no
-    fi
-])
-
 APACHE_MODULE(proxy_express, mass reverse-proxy module. Requires --enable-proxy., , , $proxy_mods_enable)
 
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])

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=1201210&r1=1201209&r2=1201210&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref Sat Nov 12 06:35:58 2011
@@ -107,13 +107,12 @@ mod_heartbeat.so            0x6F7F0000  
 mod_heartmonitor.so         0x6F7E0000    0x00010000
 mod_watchdog.so             0x6F7D0000    0x00010000
 mod_proxy_scgi.so           0x6F7C0000    0x00010000
-mod_serf.so                 0x6F7B0000    0x00010000
-mod_reqtimeout.so           0x6F7A0000    0x00010000
-mod_reflector.so            0x6F790000    0x00010000
-mod_slotmem_plain.so        0x6F780000    0x00010000
-mod_slotmem_shm.so          0x6F770000    0x00010000
-mod_authn_socache.so        0x6F760000    0x00010000
-mod_proxy_express.so        0x6F750000    0x00010000
-mod_log_debug.so            0x6F740000    0x00010000
-mod_proxy_html.so           0x6F730000    0x00010000
-mod_xml2enc.so              0x6F720000    0x00010000
\ No newline at end of file
+mod_reqtimeout.so           0x6F7B0000    0x00010000
+mod_reflector.so            0x6F7A0000    0x00010000
+mod_slotmem_plain.so        0x6F790000    0x00010000
+mod_slotmem_shm.so          0x6F780000    0x00010000
+mod_authn_socache.so        0x6F770000    0x00010000
+mod_proxy_express.so        0x6F760000    0x00010000
+mod_log_debug.so            0x6F750000    0x00010000
+mod_proxy_html.so           0x6F740000    0x00010000
+mod_xml2enc.so              0x6F730000    0x00010000



Mime
View raw message