Commit 226321b1 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge in mod_dumpio 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151297 13f79535-47bb-0310-9956-ffa450edef68
parent 0a410da9

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.53













  *) mod_dumpio, an I/O logging/dumping module, added to the













     modules/expermimental subdirectory.  [Jim Jagielski]



























  *) mod_auth_ldap: Handle the inconsistent way in which the MS LDAP















     library handles special characters.  PR 24437.  [Jess Holle]















































STATUS



+0
−8






























Original line number
Diff line number
Diff line








@@ -112,14 +112,6 @@ PATCHES TO BACKPORT FROM 2.1













       svn rev 124556















       +1: wrowe





























    *) modules: Include mod_dumpio to the modules/experimental













       tree. Module included in 2.1:modules/debug.













       http://www.apache.org/~jim/mod_dumpio.c













       jerenkrantz notes: I won't merge this myself because of the build system













                          tweaks required to add the module.













       +1: jim, trawick, jerenkrantz













       -0: nd (suggests the experimental directory instead)





























    *) Fix the RPM spec file so that an RPM build now works. An RPM















       build now requires system installations of APR and APR-util.















       http://svn.apache.org/~minfrin/httpd-2.0.53-rpm.diff

































modules/experimental/NWGNUmakefile



+1
−0






























Original line number
Diff line number
Diff line








@@ -154,6 +154,7 @@ XDCDATA         =













TARGET_nlm = \















	$(OBJDIR)/charsetl.nlm \















	$(OBJDIR)/example.nlm \













	$(OBJDIR)/moddumpio.nlm \















	$(OBJDIR)/mod_cach.nlm \















	$(OBJDIR)/mem_cach.nlm \















	$(OBJDIR)/dsk_cach.nlm \

































modules/experimental/NWGNUmoddumpio
0 → 100644



+250
−0






























Original line number
Diff line number
Diff line













#













# 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/arch/netware \













			$(APR)/include \













			$(APRUTIL)/include \













			$(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		= moddumpio



























#













# This is used by the link '-desc ' directive. 













# If left blank, NLM_NAME will be used.













#













NLM_DESCRIPTION	= Apache $(VERSION_STR) Debugging IO Module



























#













# This is used by the '-threadname' directive.  If left blank,













# NLM_NAME Thread will be used.













#













NLM_THREAD_NAME	= DumpIO 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)/moddumpio.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_dumpio.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 = \













	dumpio_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





































modules/experimental/config.m4



+1
−0






























Original line number
Diff line number
Diff line








@@ -28,6 +28,7 @@ APACHE_MODULE(mem_cache, memory caching module, $mem_cache_objs, , no)













APACHE_MODULE(example, example and demo module, , , no)















APACHE_MODULE(case_filter, example uppercase conversion filter, , , no)















APACHE_MODULE(case_filter_in, example uppercase conversion input filter, , , no)













APACHE_MODULE(dumpio, I/O dump filter, , , no)































ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"















APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no)