github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-15 23:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Enable optimization for large stream input by default on IIS

Browse Source
This commit is contained in:
Victor Hora 2018-12-04 11:44:40 -05:00
parent 780f9ddf0f
commit cc97550b71
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
DD MMM YYYY - 2.9.3 - To be released DD MMM YYYY - 2.9.3 - To be released
------------------------------------ ------------------------------------
* Enable optimization for large stream input by default on IIS
[Issue #1299 - @victorhora, @zimmerle]
* Allow 0 length JSON requests. * Allow 0 length JSON requests.
[Issue #1822 - @allanbomsft, @zimmerle, @victorhora, @marcstern] [Issue #1822 - @allanbomsft, @zimmerle, @victorhora, @marcstern]
* Include unanmed JSON values in unnamed ARGS * Include unanmed JSON values in unnamed ARGS

30
iis/Makefile.win
View File

@ -10,12 +10,12 @@
LIBS = $(APACHE)\lib\libapr-1.lib \ LIBS = $(APACHE)\lib\libapr-1.lib \
$(APACHE)\lib\libaprutil-1.lib \ $(APACHE)\lib\libaprutil-1.lib \
$(PCRE)\pcre.lib \ $(PCRE)\pcre.lib \
$(CURL)\libcurl.lib \ $(CURL)\libcurl.lib \
$(LIBXML2)\win32\bin.msvc\libxml2.lib \ $(LIBXML2)\win32\bin.msvc\libxml2.lib \
"kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" \ "kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" \
"oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" "ws2_32.lib" \ "oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" "ws2_32.lib" \
"iphlpapi.lib" "iphlpapi.lib"
# $(SSDEEP)\fuzzy.lib \ # $(SSDEEP)\fuzzy.lib \
########################################################################### ###########################################################################
########################################################################### ###########################################################################
@ -24,12 +24,12 @@ LINK = link.exe
MT = mt MT = mt
DEFS = /nologo /O2 /LD /W3 /wd4244 /wd4018 -DWITH_YAJL -DWIN32 -DWINNT -Dinline=APR_INLINE -DAP_DECLARE_STATIC -D_MBCS -D$(VERSION) DEFS = /nologo /O2 /LD /W3 /wd4244 /wd4018 -DWITH_YAJL -DWIN32 -DWINNT -Dinline=APR_INLINE -DAP_DECLARE_STATIC -D_MBCS -D$(VERSION)
DLL = ModSecurityIIS.dll DLL = ModSecurityIIS.dll
INCLUDES = -I. -I.. \ INCLUDES = -I. -I.. \
-I$(YAJL)\.. \ -I$(YAJL)\.. \
-I$(PCRE)\include -I$(PCRE) \ -I$(PCRE)\include -I$(PCRE) \
-I$(LIBXML2)\include \ -I$(LIBXML2)\include \
-I$(CURL)\include -I$(CURL) \ -I$(CURL)\include -I$(CURL) \
@ -37,10 +37,10 @@ INCLUDES = -I. -I.. \
-I..\apache2 \ -I..\apache2 \
-I..\standalone -I..\standalone
# Enables support for SecRemoteRules and external resources. # Enables support for SecRemoteRules, external resources and enable optimization for large stream input by default on IIS.
DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES -DMSC_LARGE_STREAM_INPUT
# -I$(SSDEEP) \ # -I$(SSDEEP) \
# Lua is optional # Lua is optional
!IF "$(LUA)" != "" !IF "$(LUA)" != ""
LIBS = $(LIBS) $(LUA)\lua5.1.lib LIBS = $(LIBS) $(LUA)\lua5.1.lib
@ -54,16 +54,16 @@ LIBS = $(LIBS) $(YAJL)\lib\yajl.lib
DEFS=$(DEFS) -DWITH_YAJL DEFS=$(DEFS) -DWITH_YAJL
INCLUDES = $(INCLUDES) -I$(YAJL)\include -I$(YAJL) \ INCLUDES = $(INCLUDES) -I$(YAJL)\include -I$(YAJL) \
!ENDIF !ENDIF
# ssdeep is optional # ssdeep is optional
# !IF "$(SSDEEP)" != "" # !IF "$(SSDEEP)" != ""
# LIBS = $(LIBS) $(SSDEEP)\fuzzy.lib # LIBS = $(LIBS) $(SSDEEP)\fuzzy.lib
# DEFS=$(DEFS) -DWITH_SSDEEP # DEFS=$(DEFS) -DWITH_SSDEEP
# INCLUDES = $(INCLUDES) -I$(SSDEEP)\include -I$(SSDEEP) \ # INCLUDES = $(INCLUDES) -I$(SSDEEP)\include -I$(SSDEEP) \
# !ENDIF # !ENDIF
CFLAGS= -MD /Zi $(INCLUDES) $(DEFS) CFLAGS= -MD /Zi $(INCLUDES) $(DEFS)
@ -75,10 +75,10 @@ OBJS1 = mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \
msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \ msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \
msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_unicode.obj acmp.obj msc_lua.obj \ msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_unicode.obj acmp.obj msc_lua.obj \
msc_release.obj msc_crypt.obj msc_tree.obj \ msc_release.obj msc_crypt.obj msc_tree.obj \
msc_status_engine.obj \ msc_status_engine.obj \
msc_json.obj \ msc_json.obj \
msc_remote_rules.obj msc_remote_rules.obj
OBJS2 = api.obj buckets.obj config.obj filters.obj hooks.obj regex.obj server.obj OBJS2 = api.obj buckets.obj config.obj filters.obj hooks.obj regex.obj server.obj
OBJS3 = main.obj moduleconfig.obj mymodule.obj OBJS3 = main.obj moduleconfig.obj mymodule.obj
OBJS4 = libinjection_html5.obj \ OBJS4 = libinjection_html5.obj \