Commit f3f00e3

authored

Merge pull request #3438 from A13501350/v2/master

fix: add event message resources to ModSecurityIIS.dll and resolve "Invalid function" errors (#3408)

2 parents 18cae50 + 0238e2d commit f3f00e3Copy full SHA for f3f00e3

File tree

+24

-2

lines changed

+24

-2

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,8 @@ OBJS4 = libinjection_html5.obj \`
`85`	`85`	`libinjection_sqli.obj \`
`86`	`86`	`libinjection_xss.obj`
`87`	`87`
	`88`	`+OBJS5 = ModSecurityIISMessage.res`
	`89`	`+`
`88`	`90`	`all: $(DLL)`
`89`	`91`
`90`	`92`	`dll: $(DLL)`
`@@ -101,12 +103,21 @@ $(OBJS2): ..\standalone\$*.c`
`101`	`103`	`.cpp.obj:`
`102`	`104`	`$(CC) $(CFLAGS) -c $< -Fo$@`
`103`	`105`
`104`		`-$(DLL): $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)`
`105`		`- $(LINK) $(LDFLAGS) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(LIBS)`
	`106`	`+$(DLL): $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5)`
	`107`	`+ $(LINK) $(LDFLAGS) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(LIBS)`
`106`	`108`	`IF EXIST $(DLL).manifest $(MT) -manifest $(DLL).manifest -outputresource:$(DLL);#1`
`107`	`109`
	`110`	`+$(OBJS5): ModSecurityIISMessage.rc`
	`111`	`+ rc /r ModSecurityIISMessage.rc`
	`112`	`+`
	`113`	`+ModSecurityIISMessage.rc: ModSecurityIISMessage.mc`
	`114`	`+ mc -U ModSecurityIISMessage.mc`
	`115`	`+`
`108`	`116`	`clean:`
`109`	`117`	`del /f *.obj`
`110`	`118`	`del /f *.dll`
`111`	`119`	`del /f *.exp`
`112`	`120`	`del /f *.lib`
	`121`	`+ del /f *.rc`
	`122`	`+ del /f *.bin`
	`123`	`+ del /f *.res`

Lines changed: 5 additions & 0 deletions

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -402,6 +402,9 @@`
`402`	`402`	`Source="Release\amd64\zlib1.dll" />`
`403`	`403`	`<File Id="_64_FUZZY" Name="fuzzy.dll"`
`404`	`404`	`Source="Release\amd64\fuzzy.dll" />`
	`405`	`+ <util:EventSource Name="ModSecurity" Log="Application"`
	`406`	`+ EventMessageFile="[inetsrv64]ModSecurityIIS.dll"`
	`407`	`+ KeyPath="yes" />`
`405`	`408`	`</Component> </DirectoryRef> <DirectoryRef`
`406`	`409`	`Id="inetsrv32"> <Component Id="ModSec32" DiskId="1"`
`407`	`410`	`Guid="514A81F0-2413-42EF-B19F-E2613125ECE7"`
`@@ -480,6 +483,9 @@`
`480`	`483`	`Source="Release\x86\zlib1.dll" /> <File`
`481`	`484`	`Id="_32_FUZZY" Name="fuzzy.dll"`
`482`	`485`	`Source="Release\x86\fuzzy.dll" />`
	`486`	`+ <util:EventSource Name="ModSecurity" Log="Application"`
	`487`	`+ EventMessageFile="[inetsrv32]ModSecurityIIS.dll"`
	`488`	`+ KeyPath="yes" />`
`483`	`489`	`</Component> </DirectoryRef> <DirectoryRef`
`484`	`490`	`Id="SystemFolderConfigSchema32"> <Component`
`485`	`491`	`Id="ConfigSchema32"`

Comments

(0)