added mod_reqtimeout to NetWare build;

fixed some NWGNU* properties.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@821595 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile
index 2873d0b6be673d317ac5addde26fc52d38e2dd89..dde92cbc81610952ec2a24ac26e4dd04eb029200 100644 (file)
--- a/modules/filters/NWGNUmakefile
+++ b/modules/filters/NWGNUmakefile
@@ -160,6 +160,7 @@ TARGET_nlm = \
        $(OBJDIR)/modsed.nlm \
        $(OBJDIR)/modbuffer.nlm \
        $(OBJDIR)/ratelimit.nlm \
+       $(OBJDIR)/reqtimeout.nlm \
        $(EOLIST)
 
 # If the zlib libraries source exists then build the mod_deflate module

diff --git a/modules/filters/NWGNUmodbuffer b/modules/filters/NWGNUmodbuffer
index 1ee29fd7b23090e4c1bcc9278a2906a73c1a126a..e82360539f322474b19f7c902661067bf06c4fe0 100644 (file)
--- a/modules/filters/NWGNUmodbuffer
+++ b/modules/filters/NWGNUmodbuffer
@@ -1,258 +1,258 @@
-#\r
-# Declare the sub-directories to be built here\r
-#\r
-\r
-SUBDIRS = \\r
-       $(EOLIST)\r
-\r
-#\r
-# Get the 'head' of the build environment.  This includes default targets and\r
-# paths to tools\r
-#\r
-\r
-include $(AP_WORK)\build\NWGNUhead.inc\r
-\r
-#\r
-# build this level's files\r
-\r
-#\r
-# Make sure all needed macro's are defined\r
-#\r
-\r
-#\r
-# These directories will be at the beginning of the include list, followed by\r
-# INCDIRS\r
-#\r
-XINCDIRS       += \\r
-                       $(AP_WORK)/include \\r
-                       $(NWOS) \\r
-                       $(AP_WORK)/modules/arch/netware \\r
-                       $(APR)/include \\r
-                       $(APRUTIL)/include \\r
-                       $(APR) \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These flags will come after CFLAGS\r
-#\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These defines will come after DEFINES\r
-#\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These flags will be added to the link.opt file\r
-#\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These values will be appended to the correct variables based on the value of\r
-# RELEASE\r
-#\r
-ifeq "$(RELEASE)" "debug"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-ifeq "$(RELEASE)" "noopt"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-ifeq "$(RELEASE)" "release"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-#\r
-# These are used by the link target if an NLM is being generated\r
-# This is used by the link 'name' directive to name the nlm.  If left blank\r
-# TARGET_nlm (see below) will be used.\r
-#\r
-NLM_NAME       = modbuffer\r
-\r
-#\r
-# This is used by the link '-desc ' directive.\r
-# If left blank, NLM_NAME will be used.\r
-#\r
-NLM_DESCRIPTION        = Apache $(VERSION_STR) Buffer Module\r
-\r
-#\r
-# This is used by the '-threadname' directive.  If left blank,\r
-# NLM_NAME Thread will be used.\r
-#\r
-NLM_THREAD_NAME        = modbuffer\r
-\r
-#\r
-# If this is specified, it will override VERSION value in\r
-# $(AP_WORK)\build\NWGNUenvironment.inc\r
-#\r
-NLM_VERSION    =\r
-\r
-#\r
-# If this is specified, it will override the default of 64K\r
-#\r
-NLM_STACK_SIZE = 8192\r
-\r
-\r
-#\r
-# If this is specified it will be used by the link '-entry' directive\r
-#\r
-NLM_ENTRY_SYM  = _LibCPrelude\r
-\r
-#\r
-# If this is specified it will be used by the link '-exit' directive\r
-#\r
-NLM_EXIT_SYM   = _LibCPostlude\r
-\r
-#\r
-# If this is specified it will be used by the link '-check' directive\r
-#\r
-NLM_CHECK_SYM  =\r
-\r
-#\r
-# If these are specified it will be used by the link '-flags' directive\r
-#\r
-NLM_FLAGS      = AUTOUNLOAD, PSEUDOPREEMPTION\r
-\r
-#\r
-# If this is specified it will be linked in with the XDCData option in the def\r
-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled\r
-# by setting APACHE_UNIPROC in the environment\r
-#\r
-XDCDATA                =\r
-\r
-#\r
-# If there is an NLM target, put it here\r
-#\r
-TARGET_nlm = \\r
-       $(OBJDIR)/modbuffer.nlm \\r
-       $(EOLIST)\r
-\r
-#\r
-# If there is an LIB target, put it here\r
-#\r
-TARGET_lib = \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the OBJ files needed to create the NLM target above.\r
-# Paths must all use the '/' character\r
-#\r
-FILES_nlm_objs = \\r
-       $(OBJDIR)/mod_buffer.o \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the LIB files needed to create the NLM target above.\r
-# These will be added as a library command in the link.opt file.\r
-#\r
-FILES_nlm_libs = \\r
-       libcpre.o \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the modules that the above NLM target depends on to load.\r
-# These will be added as a module command in the link.opt file.\r
-#\r
-FILES_nlm_modules = \\r
-       aprlib \\r
-       libc \\r
-       $(EOLIST)\r
-\r
-#\r
-# If the nlm has a msg file, put it's path here\r
-#\r
-FILE_nlm_msg =\r
-\r
-#\r
-# If the nlm has a hlp file put it's path here\r
-#\r
-FILE_nlm_hlp =\r
-\r
-#\r
-# If this is specified, it will override $(NWOS)\copyright.txt.\r
-#\r
-FILE_nlm_copyright =\r
-\r
-#\r
-# Any additional imports go here\r
-#\r
-FILES_nlm_Ximports = \\r
-       @$(APR)/aprlib.imp \\r
-       @$(NWOS)/httpd.imp \\r
-       @libc.imp \\r
-       $(EOLIST)\r
-\r
-#\r
-# Any symbols exported to here\r
-#\r
-FILES_nlm_exports = \\r
-       buffer_module \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the OBJ files needed to create the LIB target above.\r
-# Paths must all use the '/' character\r
-#\r
-FILES_lib_objs = \\r
-       $(EOLIST)\r
-\r
-#\r
-# implement targets and dependancies (leave this section alone)\r
-#\r
-\r
-libs :: $(OBJDIR) $(TARGET_lib)\r
-\r
-nlms :: libs $(TARGET_nlm)\r
-\r
-#\r
-# Updated this target to create necessary directories and copy files to the\r
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)\r
-#\r
-install :: nlms FORCE\r
-\r
-#\r
-# Any specialized rules here\r
-#\r
-\r
-#\r
-# Include the 'tail' makefile that has targets that depend on variables defined\r
-# in this makefile\r
-#\r
-\r
-include $(AP_WORK)\build\NWGNUtail.inc\r
-\r
-\r
+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+       $(EOLIST)
+
+#
+# Get the 'head' of the build environment.  This includes default targets and
+# paths to tools
+#
+
+include $(AP_WORK)\build\NWGNUhead.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS       += \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(AP_WORK)/modules/arch/netware \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
+                       $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS                += \
+                       $(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       = modbuffer
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION        = Apache $(VERSION_STR) Buffer Module
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME        = modbuffer
+
+#
+# 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)/modbuffer.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)/mod_buffer.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 \
+       $(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 \
+       $(EOLIST)
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+       buffer_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
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(AP_WORK)\build\NWGNUtail.inc
+
+

diff --git a/modules/filters/NWGNUratelimit b/modules/filters/NWGNUratelimit
index 25ffa5b9866c9ca81b4f6ab37064e23f426f5515..bd2e2ac11461e8e91df70c5b9cb3401e200812d5 100644 (file)
--- a/modules/filters/NWGNUratelimit
+++ b/modules/filters/NWGNUratelimit
@@ -1,258 +1,258 @@
-#\r
-# Declare the sub-directories to be built here\r
-#\r
-\r
-SUBDIRS = \\r
-       $(EOLIST)\r
-\r
-#\r
-# Get the 'head' of the build environment.  This includes default targets and\r
-# paths to tools\r
-#\r
-\r
-include $(AP_WORK)\build\NWGNUhead.inc\r
-\r
-#\r
-# build this level's files\r
-\r
-#\r
-# Make sure all needed macro's are defined\r
-#\r
-\r
-#\r
-# These directories will be at the beginning of the include list, followed by\r
-# INCDIRS\r
-#\r
-XINCDIRS       += \\r
-                       $(AP_WORK)/include \\r
-                       $(NWOS) \\r
-                       $(AP_WORK)/modules/arch/netware \\r
-                       $(APR)/include \\r
-                       $(APRUTIL)/include \\r
-                       $(APR) \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These flags will come after CFLAGS\r
-#\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These defines will come after DEFINES\r
-#\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These flags will be added to the link.opt file\r
-#\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These values will be appended to the correct variables based on the value of\r
-# RELEASE\r
-#\r
-ifeq "$(RELEASE)" "debug"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-ifeq "$(RELEASE)" "noopt"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-ifeq "$(RELEASE)" "release"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-#\r
-# These are used by the link target if an NLM is being generated\r
-# This is used by the link 'name' directive to name the nlm.  If left blank\r
-# TARGET_nlm (see below) will be used.\r
-#\r
-NLM_NAME       = ratelimit\r
-\r
-#\r
-# This is used by the link '-desc ' directive.\r
-# If left blank, NLM_NAME will be used.\r
-#\r
-NLM_DESCRIPTION        = Apache $(VERSION_STR) Rate Limit Module\r
-\r
-#\r
-# This is used by the '-threadname' directive.  If left blank,\r
-# NLM_NAME Thread will be used.\r
-#\r
-NLM_THREAD_NAME        = ratelimit\r
-\r
-#\r
-# If this is specified, it will override VERSION value in\r
-# $(AP_WORK)\build\NWGNUenvironment.inc\r
-#\r
-NLM_VERSION    =\r
-\r
-#\r
-# If this is specified, it will override the default of 64K\r
-#\r
-NLM_STACK_SIZE = 8192\r
-\r
-\r
-#\r
-# If this is specified it will be used by the link '-entry' directive\r
-#\r
-NLM_ENTRY_SYM  = _LibCPrelude\r
-\r
-#\r
-# If this is specified it will be used by the link '-exit' directive\r
-#\r
-NLM_EXIT_SYM   = _LibCPostlude\r
-\r
-#\r
-# If this is specified it will be used by the link '-check' directive\r
-#\r
-NLM_CHECK_SYM  =\r
-\r
-#\r
-# If these are specified it will be used by the link '-flags' directive\r
-#\r
-NLM_FLAGS      = AUTOUNLOAD, PSEUDOPREEMPTION\r
-\r
-#\r
-# If this is specified it will be linked in with the XDCData option in the def\r
-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled\r
-# by setting APACHE_UNIPROC in the environment\r
-#\r
-XDCDATA                =\r
-\r
-#\r
-# If there is an NLM target, put it here\r
-#\r
-TARGET_nlm = \\r
-       $(OBJDIR)/ratelimit.nlm \\r
-       $(EOLIST)\r
-\r
-#\r
-# If there is an LIB target, put it here\r
-#\r
-TARGET_lib = \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the OBJ files needed to create the NLM target above.\r
-# Paths must all use the '/' character\r
-#\r
-FILES_nlm_objs = \\r
-       $(OBJDIR)/mod_ratelimit.o \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the LIB files needed to create the NLM target above.\r
-# These will be added as a library command in the link.opt file.\r
-#\r
-FILES_nlm_libs = \\r
-       libcpre.o \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the modules that the above NLM target depends on to load.\r
-# These will be added as a module command in the link.opt file.\r
-#\r
-FILES_nlm_modules = \\r
-       aprlib \\r
-       libc \\r
-       $(EOLIST)\r
-\r
-#\r
-# If the nlm has a msg file, put it's path here\r
-#\r
-FILE_nlm_msg =\r
-\r
-#\r
-# If the nlm has a hlp file put it's path here\r
-#\r
-FILE_nlm_hlp =\r
-\r
-#\r
-# If this is specified, it will override $(NWOS)\copyright.txt.\r
-#\r
-FILE_nlm_copyright =\r
-\r
-#\r
-# Any additional imports go here\r
-#\r
-FILES_nlm_Ximports = \\r
-       @$(APR)/aprlib.imp \\r
-       @$(NWOS)/httpd.imp \\r
-       @libc.imp \\r
-       $(EOLIST)\r
-\r
-#\r
-# Any symbols exported to here\r
-#\r
-FILES_nlm_exports = \\r
-       ratelimit_module \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the OBJ files needed to create the LIB target above.\r
-# Paths must all use the '/' character\r
-#\r
-FILES_lib_objs = \\r
-       $(EOLIST)\r
-\r
-#\r
-# implement targets and dependancies (leave this section alone)\r
-#\r
-\r
-libs :: $(OBJDIR) $(TARGET_lib)\r
-\r
-nlms :: libs $(TARGET_nlm)\r
-\r
-#\r
-# Updated this target to create necessary directories and copy files to the\r
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)\r
-#\r
-install :: nlms FORCE\r
-\r
-#\r
-# Any specialized rules here\r
-#\r
-\r
-#\r
-# Include the 'tail' makefile that has targets that depend on variables defined\r
-# in this makefile\r
-#\r
-\r
-include $(AP_WORK)\build\NWGNUtail.inc\r
-\r
-\r
+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+       $(EOLIST)
+
+#
+# Get the 'head' of the build environment.  This includes default targets and
+# paths to tools
+#
+
+include $(AP_WORK)\build\NWGNUhead.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS       += \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(AP_WORK)/modules/arch/netware \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
+                       $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS                += \
+                       $(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       = ratelimit
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION        = Apache $(VERSION_STR) Rate Limit Module
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME        = ratelimit
+
+#
+# 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)/ratelimit.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)/mod_ratelimit.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 \
+       $(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 \
+       $(EOLIST)
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+       ratelimit_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
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(AP_WORK)\build\NWGNUtail.inc
+
+

diff --git a/modules/filters/NWGNUreqtimeout b/modules/filters/NWGNUreqtimeout
new file mode 100644 (file)
index 0000000..bb682fa
--- /dev/null
+++ b/modules/filters/NWGNUreqtimeout
@@ -0,0 +1,258 @@
+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+       $(EOLIST)
+
+#
+# Get the 'head' of the build environment.  This includes default targets and
+# paths to tools
+#
+
+include $(AP_WORK)\build\NWGNUhead.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS       += \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(AP_WORK)/modules/arch/netware \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
+                       $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS                += \
+                       $(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       = reqtimeout
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION        = Apache $(VERSION_STR) Request Timeout Module
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME        = $(NLM_NAME)
+
+#
+# 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)/$(NLM_NAME).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)/mod_reqtimeout.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 \
+       $(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 \
+       $(EOLIST)
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+       reqtimeout_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
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(AP_WORK)\build\NWGNUtail.inc
+
+