Commit119440a

committed

Minor revision: remove the unused code

1 parent0bfb804 commit119440aCopy full SHA for 119440a

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ mod_security2_la_CFLAGS = @APR_CFLAGS@ \`
`45`	`45`	`@MODSEC_EXTRA_CFLAGS@\`
`46`	`46`	`@PCRE_CFLAGS@\`
`47`	`47`	`@YAJL_CFLAGS@\`
`48`		`- @SSDEEP_CFLAGS@`
	`48`	`+ @SSDEEP_CFLAGS@`
	`49`	`+`
`49`	`50`
`50`	`51`	`mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@\`
`51`	`52`	`@CURL_CPPFLAGS@\`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,14 @@`
`21`	`21`	`#include"apr_lib.h"`
`22`	`22`	`#include"acmp.h"`
`23`	`23`	`#include"msc_crypt.h"`
	`24`	`+#ifdefMEMORY_DATABASE_ENABLE`
`24`	`25`	`#include"persist_dbm.h"`
	`26`	`+#endif`
`25`	`27`
`26`	`28`	`#if defined(WITH_LUA)`
`27`	`29`	`#include"msc_lua.h"`
`28`	`30`	`#endif`
`29`	`31`
`30`		`-#defineMAX_LEN_OF_REDIS_IP_ADDR 15`
`31`	`32`
`32`	`33`	`/* -- Directory context creation and initialisation -- */`
`33`	`34`
`@@ -1143,6 +1144,8 @@ static const char update_rule_action(cmd_parms cmd, directory_config *dcfg,`
`1143`	`1144`	`returnNULL;`
`1144`	`1145`	`}`
`1145`	`1146`
	`1147`	`+/* -- Configuration directives -- */`
	`1148`	`+`
`1146`	`1149`	`#ifdefMEMORY_DATABASE_ENABLE`
`1147`	`1150`	`staticconstcharcmd_db_option(cmd_parmscmd,void_dcfg,constcharp1){`
`1148`	`1151`	`directory_configdcfg= (directory_config)_dcfg;`
`@@ -1157,6 +1160,7 @@ static const char cmd_db_option(cmd_parms cmd, void _dcfg, const char p1){`
`1157`	`1160`	`returnNULL;`
`1158`	`1161`	`}`
`1159`	`1162`	`#endif`
	`1163`	`+`
`1160`	`1164`	`staticconstcharcmd_action(cmd_parmscmd,void_dcfg,constcharp1)`
`1161`	`1165`	`{`
`1162`	`1166`	`returnadd_rule(cmd, (directory_config*)_dcfg,RULE_TYPE_ACTION,SECACTION_TARGETS,SECACTION_ARGS,p1);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ struct directory_config {`
`645`	`645`
`646`	`646`	`/* This will be used whenever ModSecurity will be ready`
`647`	`647`	`* to ask the server for newer rules.`
`648`		`- */`
	`648`	`+ */`
`649`	`649`	`#if0`
`650`	`650`	`msc_remote_rules_server*remote_rules;`
`651`	`651`	`intremote_timeout;`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,7 @@ static apr_table_t collection_unpack(modsec_rec msr, const unsigned char *blob`
`47`	`47`	`unsignedintblob_offset;`
`48`	`48`
`49`	`49`	`col=apr_table_make(msr->mp,32);`
`50`		`-if (col==NULL) {`
`51`		`-returnNULL;`
`52`		`- }`
	`50`	`+if (col==NULL)returnNULL;`
`53`	`51`
`54`	`52`	`/* ENH verify the first 3 bytes (header) */`
`55`	`53`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1981,9 +1981,7 @@ static apr_status_t init_collection(modsec_rec msr, const char real_col_name,`
`1981`	`1981`	`}`
`1982`	`1982`
`1983`	`1983`	`table=apr_table_make(msr->mp,24);`
`1984`		`-if (table==NULL) {`
`1985`		`-return-1;`
`1986`		`- }`
	`1984`	`+if (table==NULL)return-1;`
`1987`	`1985`
`1988`	`1986`	`/* IMP1 Is the timeout hard-coded to 3600? */`
`1989`	`1987`

Comments

(0)