You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2007/03/22 14:46:14 UTC
svn commit: r521264 [3/3] - in /httpd/httpd/trunk/modules: aaa/ cache/
database/ dav/fs/ dav/lock/ dav/main/ debugging/ echo/ experimental/
filters/ generators/ ldap/ loggers/ mappers/ metadata/ proxy/ ssl/
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxy
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxy?view=diff&rev=521264&r1=521263&r2=521264
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxy Thu Mar 22 06:45:54 2007
@@ -31,7 +31,6 @@
# These flags will come after CFLAGS
#
XCFLAGS += \
- -prefix pre_nw.h \
$(EOLIST)
#
@@ -61,7 +60,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "noopt"
@@ -75,7 +74,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -97,10 +96,10 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = proxy
+NLM_NAME = proxy
#
-# This is used by the link '-desc ' directive.
+# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy Module
@@ -112,10 +111,10 @@
NLM_THREAD_NAME = Proxy Module
#
-# If this is specified, it will override VERSION value in
+# If this is specified, it will override VERSION value in
# $(AP_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -141,14 +140,14 @@
#
# If these are specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
-# If this is specified it will be linked in with the XDCData option in the def
+# 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 =
+XDCDATA =
#
# If there is an NLM target, put it here
@@ -178,7 +177,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ libcpre.o \
$(EOLIST)
#
@@ -194,7 +193,7 @@
# 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
#
@@ -213,14 +212,14 @@
@$(NWOS)/httpd.imp \
@libc.imp \
$(EOLIST)
-
+
# Don't link with Winsock if standard sockets are being used
ifndef USE_STDSOCKETS
FILES_nlm_Ximports += @ws2nlm.imp \
- $(EOLIST)
+ $(EOLIST)
endif
-
-#
+
+#
# Any symbols exported to here
#
FILES_nlm_exports = \
@@ -235,13 +234,13 @@
ap_proxy_ssl_val \
proxy_run_fixups \
$(EOLIST)
-
-#
+
+#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
FILES_lib_objs = \
- $(EOLIST)
+ $(EOLIST)
#
# implement targets and dependancies (leave this section alone)
@@ -252,7 +251,7 @@
nlms :: libs $(TARGET_nlm)
#
-# Updated this target to create necessary directories and copy files to the
+# 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
@@ -269,4 +268,5 @@
#
include $(AP_WORK)\build\NWGNUtail.inc
+
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyajp?view=diff&rev=521264&r1=521263&r2=521264
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyajp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyajp Thu Mar 22 06:45:54 2007
@@ -29,7 +29,6 @@
# These flags will come after CFLAGS
#
XCFLAGS += \
- -relax_pointers \
$(EOLIST)
#
@@ -95,7 +94,7 @@
# 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
+NLM_NAME = proxyajp
#
# This is used by the link '-desc ' directive.
@@ -271,4 +270,5 @@
#
include $(AP_WORK)\build\NWGNUtail.inc
+
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer?view=diff&rev=521264&r1=521263&r2=521264
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer Thu Mar 22 06:45:54 2007
@@ -29,7 +29,6 @@
# These flags will come after CFLAGS
#
XCFLAGS += \
- -prefix pre_nw.h \
$(EOLIST)
#
@@ -59,7 +58,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -95,10 +94,10 @@
# 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
+NLM_NAME = proxybalancer
#
-# This is used by the link '-desc ' directive.
+# 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
@@ -110,10 +109,10 @@
NLM_THREAD_NAME = Prxy Blncr Module
#
-# If this is specified, it will override VERSION value in
+# If this is specified, it will override VERSION value in
# $(AP_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -139,14 +138,14 @@
#
# If these are specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
-# If this is specified it will be linked in with the XDCData option in the def
+# 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 =
+XDCDATA =
#
# If there is an NLM target, put it here
@@ -176,7 +175,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ libcpre.o \
$(EOLIST)
#
@@ -193,7 +192,7 @@
# 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
#
@@ -221,26 +220,26 @@
ap_proxy_ssl_enable \
ap_proxy_ssl_disable \
$(EOLIST)
-
+
# Don't link with Winsock if standard sockets are being used
ifndef USE_STDSOCKETS
FILES_nlm_Ximports += @ws2nlm.imp \
- $(EOLIST)
+ $(EOLIST)
endif
-
-#
+
+#
# 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)
+ $(EOLIST)
#
# implement targets and dependancies (leave this section alone)
@@ -251,7 +250,7 @@
nlms :: libs $(TARGET_nlm)
#
-# Updated this target to create necessary directories and copy files to the
+# 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
@@ -268,4 +267,5 @@
#
include $(AP_WORK)\build\NWGNUtail.inc
+
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxycon
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxycon?view=diff&rev=521264&r1=521263&r2=521264
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxycon (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxycon Thu Mar 22 06:45:54 2007
@@ -29,7 +29,6 @@
# These flags will come after CFLAGS
#
XCFLAGS += \
- -prefix pre_nw.h \
$(EOLIST)
#
@@ -59,7 +58,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -95,10 +94,10 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = proxycon
+NLM_NAME = proxycon
#
-# This is used by the link '-desc ' directive.
+# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy Connection Sub-Module
@@ -110,10 +109,10 @@
NLM_THREAD_NAME = Proxy Conn Module
#
-# If this is specified, it will override VERSION value in
+# If this is specified, it will override VERSION value in
# $(AP_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -139,14 +138,14 @@
#
# If these are specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
-# If this is specified it will be linked in with the XDCData option in the def
+# 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 =
+XDCDATA =
#
# If there is an NLM target, put it here
@@ -175,7 +174,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ libcpre.o \
$(EOLIST)
#
@@ -192,7 +191,7 @@
# 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
#
@@ -214,20 +213,20 @@
proxy_hook_scheme_handler \
proxy_hook_canon_handler \
$(EOLIST)
-
-#
+
+#
# Any symbols exported to here
#
FILES_nlm_exports = \
proxy_connect_module \
$(EOLIST)
-
-#
+
+#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
FILES_lib_objs = \
- $(EOLIST)
+ $(EOLIST)
#
# implement targets and dependancies (leave this section alone)
@@ -238,7 +237,7 @@
nlms :: libs $(TARGET_nlm)
#
-# Updated this target to create necessary directories and copy files to the
+# 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
@@ -253,4 +252,5 @@
#
include $(AP_WORK)\build\NWGNUtail.inc
+
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyftp?view=diff&rev=521264&r1=521263&r2=521264
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyftp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyftp Thu Mar 22 06:45:54 2007
@@ -29,7 +29,6 @@
# These flags will come after CFLAGS
#
XCFLAGS += \
- -prefix pre_nw.h \
$(EOLIST)
#
@@ -59,7 +58,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -95,10 +94,10 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = proxyftp
+NLM_NAME = proxyftp
#
-# This is used by the link '-desc ' directive.
+# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy FTP Sub-Module
@@ -110,10 +109,10 @@
NLM_THREAD_NAME = Proxy FTP Module
#
-# If this is specified, it will override VERSION value in
+# If this is specified, it will override VERSION value in
# $(AP_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -139,14 +138,14 @@
#
# If these are specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
-# If this is specified it will be linked in with the XDCData option in the def
+# 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 =
+XDCDATA =
#
# If there is an NLM target, put it here
@@ -176,7 +175,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ libcpre.o \
$(EOLIST)
#
@@ -193,7 +192,7 @@
# 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
#
@@ -217,26 +216,26 @@
ap_proxy_ssl_enable \
ap_proxy_ssl_disable \
$(EOLIST)
-
+
# Don't link with Winsock if standard sockets are being used
ifndef USE_STDSOCKETS
FILES_nlm_Ximports += @ws2nlm.imp \
- $(EOLIST)
+ $(EOLIST)
endif
-
-#
+
+#
# Any symbols exported to here
#
FILES_nlm_exports = \
proxy_ftp_module \
$(EOLIST)
-
-#
+
+#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
FILES_lib_objs = \
- $(EOLIST)
+ $(EOLIST)
#
# implement targets and dependancies (leave this section alone)
@@ -247,7 +246,7 @@
nlms :: libs $(TARGET_nlm)
#
-# Updated this target to create necessary directories and copy files to the
+# 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
@@ -264,4 +263,5 @@
#
include $(AP_WORK)\build\NWGNUtail.inc
+
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp?view=diff&rev=521264&r1=521263&r2=521264
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp Thu Mar 22 06:45:54 2007
@@ -29,7 +29,6 @@
# These flags will come after CFLAGS
#
XCFLAGS += \
- -prefix pre_nw.h \
$(EOLIST)
#
@@ -59,7 +58,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -95,10 +94,10 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = proxyhtp
+NLM_NAME = proxyhtp
#
-# This is used by the link '-desc ' directive.
+# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy HTTP Sub-Module
@@ -110,10 +109,10 @@
NLM_THREAD_NAME = Proxy HTTP Module
#
-# If this is specified, it will override VERSION value in
+# If this is specified, it will override VERSION value in
# $(AP_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -139,14 +138,14 @@
#
# If these are specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
-# If this is specified it will be linked in with the XDCData option in the def
+# 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 =
+XDCDATA =
#
# If there is an NLM target, put it here
@@ -176,7 +175,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ libcpre.o \
$(EOLIST)
#
@@ -193,7 +192,7 @@
# 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
#
@@ -218,26 +217,26 @@
ap_proxy_ssl_enable \
ap_proxy_ssl_disable \
$(EOLIST)
-
+
# Don't link with Winsock if standard sockets are being used
ifndef USE_STDSOCKETS
FILES_nlm_Ximports += @ws2nlm.imp \
- $(EOLIST)
+ $(EOLIST)
endif
-
-#
+
+#
# Any symbols exported to here
#
FILES_nlm_exports = \
proxy_http_module \
$(EOLIST)
-
-#
+
+#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
FILES_lib_objs = \
- $(EOLIST)
+ $(EOLIST)
#
# implement targets and dependancies (leave this section alone)
@@ -248,7 +247,7 @@
nlms :: libs $(TARGET_nlm)
#
-# Updated this target to create necessary directories and copy files to the
+# 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
@@ -265,4 +264,5 @@
#
include $(AP_WORK)\build\NWGNUtail.inc
+
Modified: httpd/httpd/trunk/modules/ssl/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/NWGNUmakefile?view=diff&rev=521264&r1=521263&r2=521264
==============================================================================
--- httpd/httpd/trunk/modules/ssl/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/ssl/NWGNUmakefile Thu Mar 22 06:45:54 2007
@@ -1,5 +1,5 @@
#
-# This Makefile requires the environment var OSSLSDK
+# This Makefile requires the environment var OSSLSDK
# pointing to the base directory of your OpenSSL SDK.
#
@@ -8,7 +8,7 @@
#
SUBDIRS = \
- $(EOLIST)
+ $(EOLIST)
#
# Get the 'head' of the build environment. This includes default targets and
@@ -118,7 +118,7 @@
NLM_NAME = mod_ssl
#
-# This is used by the link '-desc ' directive.
+# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
NLM_DESCRIPTION = Apache $(VERSION_STR) SSL module
@@ -130,16 +130,16 @@
NLM_THREAD_NAME = $(NLM_NAME)
#
-# If this is specified, it will override VERSION value in
+# If this is specified, it will override VERSION value in
# $(AP_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+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
@@ -160,13 +160,13 @@
# If this is 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
+# 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 =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -215,7 +215,7 @@
# 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
#
@@ -237,21 +237,21 @@
RunningProcess \
GetSuperHighResolutionTimer \
$(EOLIST)
-
+
# Don't link with Winsock if standard sockets are being used
ifndef USE_STDSOCKETS
FILES_nlm_Ximports += @ws2nlm.imp \
- $(EOLIST)
+ $(EOLIST)
endif
-
-#
+
+#
# Any symbols exported to here
#
FILES_nlm_exports = \
ssl_module \
$(EOLIST)
-#
+#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
@@ -267,12 +267,12 @@
nlms :: libs $(TARGET_nlm)
#
-# Updated this target to create necessary directories and copy files to the
+# 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
copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
-
+
#
# Any specialized rules here
#
@@ -294,6 +294,5 @@
#
include $(AP_WORK)\build\NWGNUtail.inc
-