diff options
Diffstat (limited to 'modules/filters')
-rw-r--r-- | modules/filters/mod_buffer.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_charset_lite.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_data.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_deflate.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_ext_filter.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_filter.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_include.c | 10 | ||||
-rw-r--r-- | modules/filters/mod_include.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_proxy_html.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_ratelimit.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_reflector.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_reqtimeout.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_request.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_sed.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_substitute.mak | 4 | ||||
-rw-r--r-- | modules/filters/mod_xml2enc.mak | 4 | ||||
-rw-r--r-- | modules/filters/sed0.c | 4 | ||||
-rw-r--r-- | modules/filters/sed1.c | 1 |
18 files changed, 43 insertions, 32 deletions
diff --git a/modules/filters/mod_buffer.mak b/modules/filters/mod_buffer.mak index 521f6e74..d74bec25 100644 --- a/modules/filters/mod_buffer.mak +++ b/modules/filters/mod_buffer.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_buffer.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_buffer.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_buffer.so" /d LONG_NAME="buffer_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_buffer.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_buffer.so" /d LONG_NAME="buffer_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_buffer - Win32 Debug" "$(INTDIR)\mod_buffer.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_buffer.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_buffer.so" /d LONG_NAME="buffer_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_buffer.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_buffer.so" /d LONG_NAME="buffer_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_charset_lite.mak b/modules/filters/mod_charset_lite.mak index ccfdc941..b2524706 100644 --- a/modules/filters/mod_charset_lite.mak +++ b/modules/filters/mod_charset_lite.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_charset_lite.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_charset_lite.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_charset_lite.so" /d LONG_NAME="charset_lite_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_charset_lite.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_charset_lite.so" /d LONG_NAME="charset_lite_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_charset_lite - Win32 Debug" "$(INTDIR)\mod_charset_lite.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_charset_lite.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_charset_lite.so" /d LONG_NAME="charset_lite_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_charset_lite.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_charset_lite.so" /d LONG_NAME="charset_lite_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_data.mak b/modules/filters/mod_data.mak index b3b35aa5..cc73f510 100644 --- a/modules/filters/mod_data.mak +++ b/modules/filters/mod_data.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_data.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_data.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_data.so" /d LONG_NAME="data_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_data.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_data.so" /d LONG_NAME="data_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_data - Win32 Debug" "$(INTDIR)\mod_data.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_data.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_data.so" /d LONG_NAME="data_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_data.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_data.so" /d LONG_NAME="data_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_deflate.mak b/modules/filters/mod_deflate.mak index 3696a7df..95792842 100644 --- a/modules/filters/mod_deflate.mak +++ b/modules/filters/mod_deflate.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_deflate.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_deflate.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_deflate.so" /d LONG_NAME="deflate_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_deflate.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_deflate.so" /d LONG_NAME="deflate_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_deflate - Win32 Debug" "$(INTDIR)\mod_deflate.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_deflate.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_deflate.so" /d LONG_NAME="deflate_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_deflate.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_deflate.so" /d LONG_NAME="deflate_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_ext_filter.mak b/modules/filters/mod_ext_filter.mak index 638515b2..f03bff36 100644 --- a/modules/filters/mod_ext_filter.mak +++ b/modules/filters/mod_ext_filter.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_ext_filter.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ext_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ext_filter.so" /d LONG_NAME="ext_filter_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ext_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_ext_filter.so" /d LONG_NAME="ext_filter_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_ext_filter - Win32 Debug" "$(INTDIR)\mod_ext_filter.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ext_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ext_filter.so" /d LONG_NAME="ext_filter_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ext_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_ext_filter.so" /d LONG_NAME="ext_filter_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_filter.mak b/modules/filters/mod_filter.mak index ab0f340c..c753d9bb 100644 --- a/modules/filters/mod_filter.mak +++ b/modules/filters/mod_filter.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_filter.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_filter.so" /d LONG_NAME="filter_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_filter.so" /d LONG_NAME="filter_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_filter - Win32 Debug" "$(INTDIR)\mod_filter.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_filter.so" /d LONG_NAME="filter_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_filter.so" /d LONG_NAME="filter_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index 0f3527c0..5a6271c5 100644 --- a/modules/filters/mod_include.c +++ b/modules/filters/mod_include.c @@ -1763,6 +1763,15 @@ static int find_file(request_rec *r, const char *directive, const char *tag, } /* + * <!--#comment blah blah blah ... --> + */ +static apr_status_t handle_comment(include_ctx_t *ctx, ap_filter_t *f, + apr_bucket_brigade *bb) +{ + return APR_SUCCESS; +} + +/* * <!--#include virtual|file="..." [onerror|virtual|file="..."] ... --> * * Output each file/virtual in turn until one of them returns an error. @@ -4160,6 +4169,7 @@ static int include_post_config(apr_pool_t *p, apr_pool_t *plog, ssi_pfn_register("endif", handle_endif); ssi_pfn_register("fsize", handle_fsize); ssi_pfn_register("config", handle_config); + ssi_pfn_register("comment", handle_comment); ssi_pfn_register("include", handle_include); ssi_pfn_register("flastmod", handle_flastmod); ssi_pfn_register("printenv", handle_printenv); diff --git a/modules/filters/mod_include.mak b/modules/filters/mod_include.mak index 9b61e328..a9c3fedc 100644 --- a/modules/filters/mod_include.mak +++ b/modules/filters/mod_include.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_include.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_include.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_include.so" /d LONG_NAME="include_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_include.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_include.so" /d LONG_NAME="include_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_include - Win32 Debug" "$(INTDIR)\mod_include.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_include.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_include.so" /d LONG_NAME="include_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_include.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_include.so" /d LONG_NAME="include_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_proxy_html.mak b/modules/filters/mod_proxy_html.mak index 4fc3a936..c3579beb 100644 --- a/modules/filters/mod_proxy_html.mak +++ b/modules/filters/mod_proxy_html.mak @@ -252,14 +252,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\httpd.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\httpd.res" /i "../../include" /i "../../srclib/apr/include" /i "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_html.so" /d LONG_NAME="proxy_html_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\httpd.res" /i "../../include" /i "../../srclib/apr/include" /i "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_html.so" /d LONG_NAME="proxy_html_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_proxy_html - Win32 Debug" "$(INTDIR)\httpd.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\httpd.res" /i "../../include" /i "../../srclib/apr/include" /i "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_html.so" /d LONG_NAME="proxy_html_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\httpd.res" /i "../../include" /i "../../srclib/apr/include" /i "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_html.so" /d LONG_NAME="proxy_html_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_ratelimit.mak b/modules/filters/mod_ratelimit.mak index b45a7b3f..e50e8922 100644 --- a/modules/filters/mod_ratelimit.mak +++ b/modules/filters/mod_ratelimit.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_ratelimit.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ratelimit.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ratelimit.so" /d LONG_NAME="ratelimit_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ratelimit.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_ratelimit.so" /d LONG_NAME="ratelimit_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_ratelimit - Win32 Debug" "$(INTDIR)\mod_ratelimit.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ratelimit.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ratelimit.so" /d LONG_NAME="ratelimit_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ratelimit.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_ratelimit.so" /d LONG_NAME="ratelimit_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_reflector.mak b/modules/filters/mod_reflector.mak index 18c3e86a..d38b35c1 100644 --- a/modules/filters/mod_reflector.mak +++ b/modules/filters/mod_reflector.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_reflector.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reflector.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_reflector.so" /d LONG_NAME="reflector_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reflector.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_reflector.so" /d LONG_NAME="reflector_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_reflector - Win32 Debug" "$(INTDIR)\mod_reflector.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reflector.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_reflector.so" /d LONG_NAME="reflector_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reflector.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_reflector.so" /d LONG_NAME="reflector_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_reqtimeout.mak b/modules/filters/mod_reqtimeout.mak index 1262bf46..459272e2 100644 --- a/modules/filters/mod_reqtimeout.mak +++ b/modules/filters/mod_reqtimeout.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_reqtimeout.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reqtimeout.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_reqtimeout.so" /d LONG_NAME="reqtimeout_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reqtimeout.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_reqtimeout.so" /d LONG_NAME="reqtimeout_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_reqtimeout - Win32 Debug" "$(INTDIR)\mod_reqtimeout.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reqtimeout.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_reqtimeout.so" /d LONG_NAME="reqtimeout_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reqtimeout.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_reqtimeout.so" /d LONG_NAME="reqtimeout_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_request.mak b/modules/filters/mod_request.mak index 0f89a219..7ceb603b 100644 --- a/modules/filters/mod_request.mak +++ b/modules/filters/mod_request.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_request.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_request.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_request.so" /d LONG_NAME="request_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_request.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_request.so" /d LONG_NAME="request_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_request - Win32 Debug" "$(INTDIR)\mod_request.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_request.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_request.so" /d LONG_NAME="request_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_request.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_request.so" /d LONG_NAME="request_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_sed.mak b/modules/filters/mod_sed.mak index 24bbda70..c997b237 100644 --- a/modules/filters/mod_sed.mak +++ b/modules/filters/mod_sed.mak @@ -343,14 +343,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_sed.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_sed.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_sed.so" /d LONG_NAME="sed_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_sed.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_sed.so" /d LONG_NAME="sed_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_sed - Win32 Debug" "$(INTDIR)\mod_sed.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_sed.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_sed.so" /d LONG_NAME="sed_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_sed.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_sed.so" /d LONG_NAME="sed_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_substitute.mak b/modules/filters/mod_substitute.mak index 040775a4..f1538e82 100644 --- a/modules/filters/mod_substitute.mak +++ b/modules/filters/mod_substitute.mak @@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\mod_substitute.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_substitute - Win32 Debug" "$(INTDIR)\mod_substitute.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/mod_xml2enc.mak b/modules/filters/mod_xml2enc.mak index fb253044..028c736b 100644 --- a/modules/filters/mod_xml2enc.mak +++ b/modules/filters/mod_xml2enc.mak @@ -252,14 +252,14 @@ SOURCE=..\..\build\win32\httpd.rc "$(INTDIR)\httpd.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\httpd.res" /i "../../include" /i "../../srclib/apr/include" /i "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "NDEBUG" /d BIN_NAME="mod_xml2enc.so" /d LONG_NAME="xml2enc_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\httpd.res" /i "../../include" /i "../../srclib/apr/include" /i "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" /i "../../build\win32" /d "NDEBUG" /d BIN_NAME="mod_xml2enc.so" /d LONG_NAME="xml2enc_module for Apache" $(SOURCE) !ELSEIF "$(CFG)" == "mod_xml2enc - Win32 Debug" "$(INTDIR)\httpd.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\httpd.res" /i "../../include" /i "../../srclib/apr/include" /i "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" /i "\local0\asf\build\httpd-2.4\build\win32" /d "_DEBUG" /d BIN_NAME="mod_xml2enc.so" /d LONG_NAME="xml2enc_module for Apache" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\httpd.res" /i "../../include" /i "../../srclib/apr/include" /i "../../srclib/apr-util/include" /i "../../srclib/libxml2/include" /i "../../build\win32" /d "_DEBUG" /d BIN_NAME="mod_xml2enc.so" /d LONG_NAME="xml2enc_module for Apache" $(SOURCE) !ENDIF diff --git a/modules/filters/sed0.c b/modules/filters/sed0.c index ddc4bfed..a044f647 100644 --- a/modules/filters/sed0.c +++ b/modules/filters/sed0.c @@ -588,7 +588,7 @@ jtcommon: command_errf(commands, SEDERR_SMMES, commands->linebuf); return -1; } - if (text(commands, fnamebuf, &fnamebuf[APR_PATH_MAX]) == NULL) { + if (text(commands, fnamebuf, &fnamebuf[APR_PATH_MAX-1]) == NULL) { command_errf(commands, SEDERR_FNTL, commands->linebuf); return -1; } @@ -617,7 +617,7 @@ jtcommon: command_errf(commands, SEDERR_SMMES, commands->linebuf); return -1; } - if (text(commands, fnamebuf, &fnamebuf[APR_PATH_MAX]) == NULL) { + if (text(commands, fnamebuf, &fnamebuf[APR_PATH_MAX-1]) == NULL) { command_errf(commands, SEDERR_FNTL, commands->linebuf); return -1; } diff --git a/modules/filters/sed1.c b/modules/filters/sed1.c index 739e1ce9..8f383b8b 100644 --- a/modules/filters/sed1.c +++ b/modules/filters/sed1.c @@ -235,6 +235,7 @@ static void copy_to_genbuf(sed_eval_t *eval, const char* sz) if (eval->gsize < reqsize) { grow_gen_buffer(eval, reqsize, NULL); } + memcpy(eval->genbuf, sz, len + 1); } /* |