Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit67401a1

Browse files
committed
Revise the configuration and Makefile for including the Memory Database Headers into MODSEC_EXTRA_CFLAGS
1 parentb9aaf26 commit67401a1

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

‎apache2/Makefile.am‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ mod_security2_la_CFLAGS = @APR_CFLAGS@ \
4545
@MODSEC_EXTRA_CFLAGS@\
4646
@PCRE_CFLAGS@\
4747
@YAJL_CFLAGS@\
48-
@SSDEEP_CFLAGS@\
49-
-I./ag_mdb
48+
@SSDEEP_CFLAGS@
5049

5150
mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@\
5251
@CURL_CPPFLAGS@\
@@ -130,7 +129,7 @@ mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH
130129
@LUA_LDFLAGS@\
131130
@PCRE_LDFLAGS@\
132131
@YAJL_LDFLAGS@\
133-
@SSDEEP_LDFLAGS@
132+
@SSDEEP_LDFLAGS@
134133
endif
135134

136135
if FREEBSD

‎configure.ac‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,23 @@ AC_ARG_ENABLE(collection-global-lock,
564564
])
565565

566566

567+
# Enable collection's memory database support
568+
AC_ARG_ENABLE(collection-memory-database,
569+
AS_HELP_STRING([--enable-collection-memory-database],
570+
[Enable memory database support for collection. This is enabled by default]),
571+
[
572+
if test "$enableval" != "no"; then
573+
collection_memory_database="-I"`pwd`"/apache2/ag_mdb -DMEMORY_DATABASE_ENABLE"
574+
MODSEC_EXTRA_CFLAGS="$MODSEC_EXTRA_CFLAGS $collection_memory_database"
575+
else
576+
collection_memory_database=""
577+
fi
578+
],
579+
[
580+
collection_memory_database="-I"`pwd`"/apache2/ag_mdb -DMEMORY_DATABASE_ENABLE"
581+
])
582+
583+
567584
# Ignore configure errors
568585
AC_ARG_ENABLE(errors,
569586
AS_HELP_STRING([--disable-errors],
@@ -814,7 +831,7 @@ else
814831
fi
815832
fi
816833

817-
MODSEC_EXTRA_CFLAGS="$pcre_study $pcre_match_limit $pcre_match_limit_recursion $pcre_jit $request_early $htaccess_config $lua_cache $debug_conf $debug_cache $debug_acmp $debug_mem $perf_meas $modsec_api $cpu_type $unique_id $log_filename $log_server $log_collection_delete_problem $log_dechunk $log_stopwatch $log_handler $log_server_contex $collection_global_lock"
834+
MODSEC_EXTRA_CFLAGS="$pcre_study $pcre_match_limit $pcre_match_limit_recursion $pcre_jit $request_early $htaccess_config $lua_cache $debug_conf $debug_cache $debug_acmp $debug_mem $perf_meas $modsec_api $cpu_type $unique_id $log_filename $log_server $log_collection_delete_problem $log_dechunk $log_stopwatch $log_handler $log_server_contex $collection_global_lock $collection_memory_database"
818835

819836
APXS_WRAPPER=build/apxs-wrapper
820837
APXS_EXTRA_CFLAGS=""

‎standalone/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ standalone_la_CFLAGS = -DVERSION_NGINX \
5555
@MODSEC_EXTRA_CFLAGS@ \
5656
@PCRE_CFLAGS@ \
5757
@YAJL_CFLAGS@ \
58-
@SSDEEP_CFLAGS@ \
59-
-I../apache2/ag_mdb
58+
@SSDEEP_CFLAGS@
6059

6160
standalone_la_CPPFLAGS = @APR_CPPFLAGS@ \
6261
@LIBXML2_CPPFLAGS@ \

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp