Author: jfrederic.clere(a)jboss.com Date: 2014-01-27 05:44:40 -0500 (Mon, 27 Jan 2014) New Revision: 3201 Added: trunk/httpd/httpd-2.4/ trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/ trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 Removed: trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 Log: Add 2.4.x (just copy). Deleted: trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/config5.m4 2014-01-26 09:31:42 UTC (rev 3193) +++ trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201) @@ -1,17 +0,0 @@ -dnl modules enabled in this directory by default - -APACHE_MODPATH_INIT(mod_cluster_slotmem) - -if test "$enable_mod_cluster_slotmem" = "shared"; then - mod_slotmem_mods_enable=shared -elif test "$enable_mod_cluster_slotmem" = "yes"; then - mod_slotmem_mods_enable=yes -else - mod_slotmem_mods_enable=no -fi - -slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" - -APACHE_MODULE(cluster_slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) - -APACHE_MODPATH_FINISH Copied: trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 (from rev 3197, trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/config5.m4) =================================================================== --- trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 (rev 0) +++ trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201) @@ -0,0 +1,15 @@ +dnl modules enabled in this directory by default + +APACHE_MODPATH_INIT(mod_cluster_slotmem) + +if test "$enable_mod_cluster_slotmem" = "no"; then + mod_cluster_slotmem_mods_enable=no +else + mod_cluster_slotmem_mods_enable=yes +fi + +slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" + +APACHE_MODULE(cluster_slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_cluster_slotmem_mods_enable) + +APACHE_MODPATH_FINISH Deleted: trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 2014-01-16 02:39:06 UTC (rev 3168) +++ trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 2014-01-27 10:44:40 UTC (rev 3201) @@ -1,13 +0,0 @@ -dnl modules enabled in this directory by default - -APACHE_MODPATH_INIT(mod_manager) - -manager_objects="mod_manager.lo balancer.lo context.lo host.lo node.lo sessionid.lo domain.lo jgroupsid.lo" - -APACHE_MODULE(manager, Manager for mod_cluster, $manager_objects, , no) - -if test "$manager_enable" != "no"; then - APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/../proxy/]) -fi - -APACHE_MODPATH_FINISH Copied: trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 (from rev 3196, trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4) =================================================================== --- trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 (rev 0) +++ trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 2014-01-27 10:44:40 UTC (rev 3201) @@ -0,0 +1,19 @@ +dnl modules enabled in this directory by default + +APACHE_MODPATH_INIT(mod_manager) + +if test "$enable_mod_manager" = "no"; then + mod_manager_mods_enable=no +else + mod_manager_mods_enable=yes +fi + +manager_objects="mod_manager.lo balancer.lo context.lo host.lo node.lo sessionid.lo domain.lo jgroupsid.lo" + +APACHE_MODULE(manager, Manager for mod_cluster, $manager_objects, , $mod_manager_mods_enable) + +if test "$manager_enable" != "no"; then + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/../proxy/]) +fi + +APACHE_MODPATH_FINISH Deleted: trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEslotmem 2014-01-16 02:39:06 UTC (rev 3168) +++ trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem 2014-01-27 10:44:40 UTC (rev 3201) @@ -1,69 +0,0 @@ -# Copyright 2001-2007 The Apache Software Foundation or its licensors, as -# applicable. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ==================================================================== -# -# NMAKEmakefile mod_sharedmem module makefile. -# -# Originally contributed by Mladen Turk <mturk redhat.com> -# -# ==================================================================== -# - -TARGET=DLL -PROJECT = mod_slotmem - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -!include <..\..\NMAKEcommon.inc> -!include <..\..\NMAKEhttpd.inc> - -LDIRS = /libpath:"$(BUILDLIB)" -LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) -CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT - -INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy -PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src - -BUILDBIN = $(WORKDIR)\$(PROJECT).so -BUILDPDB = $(WORKDIR)\$(PROJECT).pdb -BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMFT = $(BUILDBIN).manifest - -RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_slotmem module for Apache" - -OBJECTS = \ - $(WORKDIR)\sharedmem_util.obj \ - $(WORKDIR)\mod_sharedmem.obj - -{$(SRCDIR)}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -$(BUILDRES): ..\..\build\win32\httpd.rc - $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc - -$(BUILDBIN): $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMFT) \ - mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 - -!IF EXIST($(SRCDIR)\mod_sharedmem.c) -install: $(BUILDBIN) -!ELSE -install: - @echo Skipping $(PROJECT) build. -!ENDIF Copied: trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem (from rev 3190, trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEslotmem) =================================================================== --- trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem (rev 0) +++ trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem 2014-01-27 10:44:40 UTC (rev 3201) @@ -0,0 +1,69 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_sharedmem module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_cluster_slotmem + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_cluster_slotmem module for Apache" + +OBJECTS = \ + $(WORKDIR)\sharedmem_util.obj \ + $(WORKDIR)\mod_sharedmem.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_sharedmem.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Deleted: trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-16 02:39:06 UTC (rev 3168) +++ trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201) @@ -1,9 +0,0 @@ -dnl modules enabled in this directory by default - -APACHE_MODPATH_INIT(mod_slotmem) - -slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" - -APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , no) - -APACHE_MODPATH_FINISH Copied: trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 (from rev 3192, trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4) =================================================================== --- trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 (rev 0) +++ trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201) @@ -0,0 +1,17 @@ +dnl modules enabled in this directory by default + +APACHE_MODPATH_INIT(mod_slotmem) + +if test "$enable_mod_slotmem" = "shared"; then + mod_slotmem_mods_enable=shared +elif test "$enable_mod_slotmem" = "yes"; then + mod_slotmem_mods_enable=yes +else + mod_slotmem_mods_enable=no +fi + +slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" + +APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) + +APACHE_MODPATH_FINISH