Commit79db6c3

authored

Merge pull requestmicrosoft#7 from Microsoft/inMemoryDB

Initial in memory db

2 parents7a56ea0 +a8e8b6b commit79db6c3Copy full SHA for 79db6c3

File tree

+3440

-228

lines changed

+3440

-228

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@ pkglibdir = $(prefix)/lib`
`2`	`2`	`pkglib_LTLIBRARIES = mod_security2.la`
`3`	`3`
`4`	`4`	`mod_security2_la_SOURCES = acmp.c\`
	`5`	`+ ag_mdb/murmur3.c\`
	`6`	`+ ag_mdb/ag_mdb.cpp\`
`5`	`7`	`apache2_config.c\`
`6`	`8`	`apache2_io.c\`
`7`	`9`	`apache2_util.c\`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ INCLUDES = -I. -I.. \`
`36`	`36`	`-I$(CURL)\include -I$(CURL) \`
`37`	`37`	`-I$(PCRE)\include -I$(PCRE) \`
`38`	`38`	`-I$(LIBXML2)\include \`
`39`		`- -I$(APACHE)\include`
	`39`	`+ -I$(APACHE)\include \`
	`40`	`+ -I.\ag_mdb`
`40`	`41`
`41`	`42`	`# Enables support for SecRemoteRules and external resources.`
`42`	`43`	`DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES`
`@@ -55,11 +56,15 @@ DEFS=$(DEFS) -DWITH_YAJL`
`55`	`56`	`INCLUDES = $(INCLUDES) -I$(YAJL)\include -I$(YAJL) \`
`56`	`57`	`!ENDIF`
`57`	`58`
	`59`	`+# Enable support for collection's memory database`
	`60`	`+DEFS=$(DEFS) -DMEMORY_DATABASE_ENABLE`
	`61`	`+`
`58`	`62`	`CFLAGS= -MD $(INCLUDES) $(DEFS)`
`59`	`63`
`60`	`64`	`LDFLAGS =`
`61`	`65`
`62`		`-OBJS = mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \`
	`66`	`+OBJS = ag_mdb/ag_mdb.obj ag_mdb/murmur3.obj \`
	`67`	`+ mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \`
`63`	`68`	`re.obj re_operators.obj re_actions.obj re_tfns.obj re_variables.obj \`
`64`	`69`	`msc_logging.obj msc_xml.obj msc_multipart.obj modsecurity.obj \`
`65`	`70`	`msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \`

Comments

(0)