You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2004/08/14 01:13:47 UTC
cvs commit: httpd-2.0/modules/proxy NWGNUproxyajp NWGNUproxybalancer NWGNUmakefile NWGNUproxy NWGNUproxyftp
bnicholes 2004/08/13 16:13:47
Modified: modules/proxy NWGNUmakefile NWGNUproxy NWGNUproxyftp
Added: modules/proxy NWGNUproxyajp NWGNUproxybalancer
Log:
Add the new proxy protocol modules to the NetWare build
Revision Changes Path
1.3 +2 -0 httpd-2.0/modules/proxy/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUmakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NWGNUmakefile 19 Apr 2002 21:01:16 -0000 1.2
+++ NWGNUmakefile 13 Aug 2004 23:13:46 -0000 1.3
@@ -156,6 +156,8 @@
$(OBJDIR)/proxycon.nlm \
$(OBJDIR)/proxyftp.nlm \
$(OBJDIR)/proxyhtp.nlm \
+ $(OBJDIR)/proxybalancer.nlm \
+# $(OBJDIR)/proxyajp.nlm \
$(EOLIST)
#
1.8 +3 -0 httpd-2.0/modules/proxy/NWGNUproxy
Index: NWGNUproxy
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxy,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NWGNUproxy 1 Jun 2004 17:48:21 -0000 1.7
+++ NWGNUproxy 13 Aug 2004 23:13:46 -0000 1.8
@@ -21,6 +21,7 @@
$(AP_WORK)/modules/http \
$(AP_WORK)/modules/arch/netware \
$(AP_WORK)/modules/ssl \
+ $(AP_WORK)/modules/generators \
$(AP_WORK)/srclib/apr/include \
$(AP_WORK)/srclib/apr-util/include \
$(AP_WORK)/srclib/apr \
@@ -221,6 +222,8 @@
proxy_module \
proxy_hook_scheme_handler \
proxy_hook_canon_handler \
+ proxy_hook_pre_request \
+ proxy_hook_post_request \
ap_proxy_ssl_enable \
ap_proxy_ssl_disable \
proxy_run_fixups \
1.8 +2 -0 httpd-2.0/modules/proxy/NWGNUproxyftp
Index: NWGNUproxyftp
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/NWGNUproxyftp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NWGNUproxyftp 1 Jun 2004 17:48:21 -0000 1.7
+++ NWGNUproxyftp 13 Aug 2004 23:13:46 -0000 1.8
@@ -215,6 +215,8 @@
proxy_module \
proxy_hook_scheme_handler \
proxy_hook_canon_handler \
+ ap_proxy_ssl_enable \
+ ap_proxy_ssl_disable \
$(EOLIST)
#
1.1 httpd-2.0/modules/proxy/NWGNUproxyajp
Index: NWGNUproxyajp
===================================================================
#
# Make sure all needed macro's are defined
#
#
# Get the 'head' of the build environment if necessary. This includes default
# targets and paths to tools
#
ifndef EnvironmentDefined
include $(AP_WORK)\build\NWGNUhead.inc
endif
#
# These directories will be at the beginning of the include list, followed by
# INCDIRS
#
XINCDIRS += \
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/http \
$(AP_WORK)/modules/arch/netware \
$(AP_WORK)/srclib/apr/include \
$(AP_WORK)/srclib/apr-util/include \
$(AP_WORK)/srclib/apr \
$(EOLIST)
#
# These flags will come after CFLAGS
#
XCFLAGS += \
-prefix pre_nw.h \
$(EOLIST)
#
# These defines will come after DEFINES
#
XDEFINES += \
$(EOLIST)
#
# These flags will be added to the link.opt file
#
XLFLAGS += \
$(EOLIST)
#
# These values will be appended to the correct variables based on the value of
# RELEASE
#
ifeq "$(RELEASE)" "debug"
XINCDIRS += \
$(EOLIST)
XCFLAGS += \
$(EOLIST)
XDEFINES += \
$(EOLIST)
XLFLAGS += \
$(EOLIST)
endif
ifeq "$(RELEASE)" "noopt"
XINCDIRS += \
$(EOLIST)
XCFLAGS += \
$(EOLIST)
XDEFINES += \
$(EOLIST)
XLFLAGS += \
$(EOLIST)
endif
ifeq "$(RELEASE)" "release"
XINCDIRS += \
$(EOLIST)
XCFLAGS += \
$(EOLIST)
XDEFINES += \
$(EOLIST)
XLFLAGS += \
$(EOLIST)
endif
#
# These are used by the link target if an NLM is being generated
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
NLM_NAME = proxyajp
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy AJP Sub-Module
#
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
NLM_THREAD_NAME = Proxy AJP Module
#
# If this is specified, it will override VERSION value in
# $(AP_WORK)\build\NWGNUenvironment.inc
#
NLM_VERSION =
#
# If this is specified, it will override the default of 64K
#
NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
NLM_ENTRY_SYM = _LibCPrelude
#
# If this is specified it will be used by the link '-exit' directive
#
NLM_EXIT_SYM = _LibCPostlude
#
# If this is specified it will be used by the link '-check' directive
#
NLM_CHECK_SYM =
#
# If these are specified it will be used by the link '-flags' directive
#
NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
# If this is specified it will be linked in with the XDCData option in the def
# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
# by setting APACHE_UNIPROC in the environment
#
XDCDATA =
#
# If there is an NLM target, put it here
#
TARGET_nlm = \
$(OBJDIR)/proxyajp.nlm \
$(EOLIST)
#
# If there is an LIB target, put it here
#
TARGET_lib = \
$(EOLIST)
#
# These are the OBJ files needed to create the NLM target above.
# Paths must all use the '/' character
#
FILES_nlm_objs = \
$(OBJDIR)/proxy_ajp.o \
$(OBJDIR)/proxy_util.o \
$(OBJDIR)/libprews.o \
$(EOLIST)
#
# These are the LIB files needed to create the NLM target above.
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
libcpre.o \
$(EOLIST)
#
# These are the modules that the above NLM target depends on to load.
# These will be added as a module command in the link.opt file.
#
FILES_nlm_modules = \
aprlib \
libc \
proxy \
$(EOLIST)
#
# If the nlm has a msg file, put it's path here
#
FILE_nlm_msg =
#
# If the nlm has a hlp file put it's path here
#
FILE_nlm_hlp =
#
# If this is specified, it will override $(NWOS)\copyright.txt.
#
FILE_nlm_copyright =
#
# Any additional imports go here
#
FILES_nlm_Ximports = \
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
@libc.imp \
@ws2nlm.imp \
proxy_module \
proxy_hook_scheme_handler \
proxy_hook_canon_handler \
proxy_run_fixups \
ap_proxy_ssl_enable \
ap_proxy_ssl_disable \
$(EOLIST)
#
# Any symbols exported to here
#
FILES_nlm_exports = \
proxy_ajp_module \
$(EOLIST)
#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
FILES_lib_objs = \
$(EOLIST)
#
# implement targets and dependancies (leave this section alone)
#
libs :: $(OBJDIR) $(TARGET_lib)
nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
#
install :: nlms FORCE
#
# Any specialized rules here
#
vpath %.c ../arch/netware
#
# Include the 'tail' makefile that has targets that depend on variables defined
# in this makefile
#
include $(AP_WORK)\build\NWGNUtail.inc
1.1 httpd-2.0/modules/proxy/NWGNUproxybalancer
Index: NWGNUproxybalancer
===================================================================
#
# Make sure all needed macro's are defined
#
#
# Get the 'head' of the build environment if necessary. This includes default
# targets and paths to tools
#
ifndef EnvironmentDefined
include $(AP_WORK)\build\NWGNUhead.inc
endif
#
# These directories will be at the beginning of the include list, followed by
# INCDIRS
#
XINCDIRS += \
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/http \
$(AP_WORK)/modules/arch/netware \
$(AP_WORK)/srclib/apr/include \
$(AP_WORK)/srclib/apr-util/include \
$(AP_WORK)/srclib/apr \
$(EOLIST)
#
# These flags will come after CFLAGS
#
XCFLAGS += \
-prefix pre_nw.h \
$(EOLIST)
#
# These defines will come after DEFINES
#
XDEFINES += \
$(EOLIST)
#
# These flags will be added to the link.opt file
#
XLFLAGS += \
$(EOLIST)
#
# These values will be appended to the correct variables based on the value of
# RELEASE
#
ifeq "$(RELEASE)" "debug"
XINCDIRS += \
$(EOLIST)
XCFLAGS += \
$(EOLIST)
XDEFINES += \
$(EOLIST)
XLFLAGS += \
$(EOLIST)
endif
ifeq "$(RELEASE)" "noopt"
XINCDIRS += \
$(EOLIST)
XCFLAGS += \
$(EOLIST)
XDEFINES += \
$(EOLIST)
XLFLAGS += \
$(EOLIST)
endif
ifeq "$(RELEASE)" "release"
XINCDIRS += \
$(EOLIST)
XCFLAGS += \
$(EOLIST)
XDEFINES += \
$(EOLIST)
XLFLAGS += \
$(EOLIST)
endif
#
# These are used by the link target if an NLM is being generated
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
NLM_NAME = proxybalancer
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy Balancer Sub-Module
#
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
NLM_THREAD_NAME = Prxy Blncr Module
#
# If this is specified, it will override VERSION value in
# $(AP_WORK)\build\NWGNUenvironment.inc
#
NLM_VERSION =
#
# If this is specified, it will override the default of 64K
#
NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
NLM_ENTRY_SYM = _LibCPrelude
#
# If this is specified it will be used by the link '-exit' directive
#
NLM_EXIT_SYM = _LibCPostlude
#
# If this is specified it will be used by the link '-check' directive
#
NLM_CHECK_SYM =
#
# If these are specified it will be used by the link '-flags' directive
#
NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
# If this is specified it will be linked in with the XDCData option in the def
# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
# by setting APACHE_UNIPROC in the environment
#
XDCDATA =
#
# If there is an NLM target, put it here
#
TARGET_nlm = \
$(OBJDIR)/proxybalancer.nlm \
$(EOLIST)
#
# If there is an LIB target, put it here
#
TARGET_lib = \
$(EOLIST)
#
# These are the OBJ files needed to create the NLM target above.
# Paths must all use the '/' character
#
FILES_nlm_objs = \
$(OBJDIR)/proxy_balancer.o \
$(OBJDIR)/proxy_util.o \
$(OBJDIR)/libprews.o \
$(EOLIST)
#
# These are the LIB files needed to create the NLM target above.
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
libcpre.o \
$(EOLIST)
#
# These are the modules that the above NLM target depends on to load.
# These will be added as a module command in the link.opt file.
#
FILES_nlm_modules = \
aprlib \
libc \
proxy \
$(EOLIST)
#
# If the nlm has a msg file, put it's path here
#
FILE_nlm_msg =
#
# If the nlm has a hlp file put it's path here
#
FILE_nlm_hlp =
#
# If this is specified, it will override $(NWOS)\copyright.txt.
#
FILE_nlm_copyright =
#
# Any additional imports go here
#
FILES_nlm_Ximports = \
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
@libc.imp \
@ws2nlm.imp \
proxy_module \
proxy_hook_scheme_handler \
proxy_hook_canon_handler \
proxy_hook_pre_request \
proxy_hook_post_request \
proxy_run_fixups \
ap_proxy_ssl_enable \
ap_proxy_ssl_disable \
$(EOLIST)
#
# Any symbols exported to here
#
FILES_nlm_exports = \
proxy_balancer_module \
$(EOLIST)
#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
FILES_lib_objs = \
$(EOLIST)
#
# implement targets and dependancies (leave this section alone)
#
libs :: $(OBJDIR) $(TARGET_lib)
nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
#
install :: nlms FORCE
#
# Any specialized rules here
#
vpath %.c ../arch/netware
#
# Include the 'tail' makefile that has targets that depend on variables defined
# in this makefile
#
include $(AP_WORK)\build\NWGNUtail.inc