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

Commit81bde08

Browse files
author
Felipe Zimmerle
committed
Adds curl support to main core
Curl was used only by mlogc, as we want to expand ModSecurity to loadexternal rules/resources it is now a dependency of the core as well.
1 parentf45c6fe commit81bde08

File tree

6 files changed

+38
-8
lines changed

6 files changed

+38
-8
lines changed

‎apache2/Makefile.am‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,15 @@ mod_security2_la_CFLAGS = @APR_CFLAGS@ \
4646

4747

4848
mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@\
49+
@CURL_CPPFLAGS@\
50+
@LIBXML2_CFLAGS@\
4951
@LIBXML2_CPPFLAGS@\
5052
@PCRE_CPPFLAGS@
5153

5254
mod_security2_la_LIBADD = @APR_LDADD@\
5355
@APU_LDADD@\
56+
@CURL_LDADD@\
57+
@LIBXML2_CFLAGS@\
5458
@LIBXML2_LDADD@\
5559
@LUA_LDADD@\
5660
@PCRE_LDADD@\
@@ -61,6 +65,8 @@ mod_security2_la_LDFLAGS = -module -avoid-version \
6165
@APR_LDFLAGS@\
6266
@APU_LDFLAGS@\
6367
@APXS_LDFLAGS@\
68+
@CURL_LDFLAGS@\
69+
@LIBXML2_CFLAGS@\
6470
@LIBXML2_LDFLAGS@\
6571
@LUA_LDFLAGS@\
6672
@PCRE_LDFLAGS@\
@@ -73,6 +79,8 @@ mod_security2_la_LDFLAGS = -module -avoid-version \
7379
@APR_LDFLAGS@\
7480
@APU_LDFLAGS@\
7581
@APXS_LDFLAGS@\
82+
@CURL_LDFLAGS@\
83+
@LIBXML2_CFLAGS@\
7684
@LIBXML2_LDFLAGS@\
7785
@LUA_LDFLAGS@\
7886
@PCRE_LDFLAGS@\
@@ -85,6 +93,8 @@ mod_security2_la_LDFLAGS = -module -avoid-version \
8593
@APR_LDFLAGS@\
8694
@APU_LDFLAGS@\
8795
@APXS_LDFLAGS@\
96+
@CURL_LDFLAGS@\
97+
@LIBXML2_CFLAGS@\
8898
@LIBXML2_LDFLAGS@\
8999
@LUA_LDFLAGS@\
90100
@PCRE_LDFLAGS@\
@@ -97,6 +107,8 @@ mod_security2_la_LDFLAGS = -module -avoid-version \
97107
@APR_LDFLAGS@\
98108
@APU_LDFLAGS@\
99109
@APXS_LDFLAGS@\
110+
@CURL_LDFLAGS@\
111+
@LIBXML2_CFLAGS@\
100112
@LIBXML2_LDFLAGS@\
101113
@LUA_LDFLAGS@\
102114
@PCRE_LDFLAGS@\
@@ -109,6 +121,8 @@ mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH
109121
@APR_LDFLAGS@\
110122
@APU_LDFLAGS@\
111123
@APXS_LDFLAGS@\
124+
@CURL_LDFLAGS@\
125+
@LIBXML2_CFLAGS@\
112126
@LIBXML2_LDFLAGS@\
113127
@LUA_LDFLAGS@\
114128
@PCRE_LDFLAGS@\
@@ -121,6 +135,8 @@ mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
121135
@APR_LDFLAGS@\
122136
@APU_LDFLAGS@\
123137
@APXS_LDFLAGS@\
138+
@CURL_LDFLAGS@\
139+
@LIBXML2_CFLAGS@\
124140
@LIBXML2_LDFLAGS@\
125141
@LUA_LDFLAGS@\
126142
@PCRE_LDFLAGS@\
@@ -133,6 +149,8 @@ mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
133149
@APR_LDFLAGS@\
134150
@APU_LDFLAGS@\
135151
@APXS_LDFLAGS@\
152+
@CURL_LDFLAGS@\
153+
@LIBXML2_CFLAGS@\
136154
@LIBXML2_LDFLAGS@\
137155
@LUA_LDFLAGS@\
138156
@PCRE_LDFLAGS@\
@@ -145,6 +163,8 @@ mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
145163
@APR_LDFLAGS@\
146164
@APU_LDFLAGS@\
147165
@APXS_LDFLAGS@\
166+
@CURL_LDFLAGS@\
167+
@LIBXML2_CFLAGS@\
148168
@LIBXML2_LDFLAGS@\
149169
@LUA_LDFLAGS@\
150170
@PCRE_LDFLAGS@\

‎apache2/Makefile.win‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
#
33
# Usage: NMAKE -f Makefile.win APACHE={httpd installion dir} PCRE={pcre dir} LIBXML2={LibXML2 dir} [ LUA={Lua dir} ]
44
#
5-
!IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == ""
6-
!ERROR NMAKE arguments: APACHE=dir PCRE=dir LIBXML2=dir are required to build mod_security2 for Windows
5+
!IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == "" || "$(CURL)" == ""
6+
!ERROR NMAKE arguments: APACHE=dir PCRE=dir LIBXML2=dirCURL=dirare required to build mod_security2 for Windows
77
!ENDIF
88

99
# Linking libraries
1010
LIBS = $(APACHE)\lib\libhttpd.lib \
1111
$(APACHE)\lib\libapr-1.lib \
1212
$(APACHE)\lib\libaprutil-1.lib \
1313
$(PCRE)\pcre.lib \
14+
$(CURL)\lib\libcurl_imp.lib \
1415
$(LIBXML2)\win32\bin.msvc\libxml2.lib \
1516
Ws2_32.lib \
1617
"iphlpapi.lib"
@@ -27,6 +28,7 @@ DEFS = /nologo /O2 /LD /W3 /wd4244 /wd4018 -DWIN32 -DWINNT -Dinline=APR_INLINE -
2728
DLL = mod_security2.so
2829

2930
INCLUDES = -I. -I.. \
31+
-I$(CURL)\include -I$(CURL) \
3032
-I$(PCRE)\include -I$(PCRE) \
3133
-I$(LIBXML2)\include \
3234
-I$(APACHE)\include

‎configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,9 +694,9 @@ CHECK_APU()
694694
fi
695695
CHECK_LIBXML2()
696696
CHECK_LUA()
697-
if test "$build_mlogc" -ne 0; then
697+
#if test "$build_mlogc" -ne 0; then
698698
CHECK_CURL()
699-
fi
699+
#fi
700700

701701
# Check for YAJL libs (for JSON body processor)
702702
CHECK_YAJL()

‎iis/Makefile.win‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
#
33
# Usage: NMAKE -f Makefile.win APACHE={httpd installion dir} PCRE={pcre dir} LIBXML2={LibXML2 dir} [ LUA={Lua dir} ]
44
#
5-
!IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == ""
6-
!ERROR NMAKE arguments: APACHE=dir PCRE=dir LIBXML2=dir are required to build mod_security2 for Windows
5+
!IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == "" || "$(CURL)" == ""
6+
!ERROR NMAKE arguments: APACHE=dir PCRE=dir LIBXML2=dirCURL=dirare required to build mod_security2 for Windows
77
!ENDIF
88

99
# Linking libraries
1010
LIBS = $(APACHE)\lib\libapr-1.lib \
1111
$(APACHE)\lib\libaprutil-1.lib \
1212
$(PCRE)\pcre.lib \
1313
$(SSDEEP)\fuzzy.lib \
14+
$(CURL)\lib\libcurl_imp.lib \
1415
$(LIBXML2)\win32\bin.msvc\libxml2.lib \
1516
"kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" \
1617
"oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" "ws2_32.lib" \
@@ -32,6 +33,7 @@ INCLUDES = -I. -I.. \
3233
-I$(SSDEEP) \
3334
-I$(PCRE)\include -I$(PCRE) \
3435
-I$(LIBXML2)\include \
36+
-I$(CURL)\include -I$(CURL) \
3537
-I$(APACHE)\include \
3638
-I..\apache2 \
3739
-I..\standalone

‎iis/build_modsecurity.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set CURRENT_DIR=%cd%
1515
cd ..\apache2
1616
del *.obj *.dll *.lib
1717
del libinjection\*.obj libinjection\*.dll libinjection\*.lib
18-
NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\yajl-2.0.1 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep
18+
NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\yajl-2.0.1 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep CURL=..\iis\%DEPENDENCIES_DIR%\curl
1919
@ifNOT (%ERRORLEVEL%)== (0)goto build_failed
2020

2121
@echo mlogc...
@@ -29,7 +29,7 @@ nmake -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEP
2929
cd ..\iis
3030
del *.obj *.dll *.lib
3131
nmake -f Makefile.win clean
32-
NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\yajl-2.0.1 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep
32+
NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS YAJL=..\iis\%DEPENDENCIES_DIR%\yajl\build\yajl-2.0.1 SSDEEP=..\iis\%DEPENDENCIES_DIR%\ssdeep CURL=..\iis\%DEPENDENCIES_DIR%\curl
3333
@ifNOT (%ERRORLEVEL%)== (0)goto build_failed
3434

3535
cd%CURRENT_DIR%

‎tests/Makefile.am‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ msc_test_SOURCES = msc_test.c \
3232
msc_test_CFLAGS = @APR_CFLAGS@\
3333
@APU_CFLAGS@\
3434
@APXS_CFLAGS@\
35+
@CURL_CFLAGS@\
3536
@LIBXML2_CFLAGS@\
3637
@LUA_CFLAGS@\
3738
@MODSEC_EXTRA_CFLAGS@\
@@ -41,11 +42,15 @@ msc_test_CFLAGS = @APR_CFLAGS@ \
4142

4243
msc_test_CPPFLAGS = -I$(top_srcdir)/apache2\
4344
@APR_CPPFLAGS@\
45+
@CURL_CPPFLAGS@\
46+
@LIBXML2_CFLAGS@\
4447
@LIBXML2_CPPFLAGS@\
4548
@PCRE_CPPFLAGS@
4649

4750
msc_test_LDADD = @APR_LDADD@\
4851
@APU_LDADD@\
52+
@CURL_LDADD@\
53+
@LIBXML2_CFLAGS@\
4954
@LIBXML2_LDADD@\
5055
@LUA_LDADD@\
5156
@PCRE_LDADD@\
@@ -55,6 +60,7 @@ msc_test_LDADD = @APR_LDADD@ \
5560
msc_test_LDFLAGS = @APR_LDFLAGS@\
5661
@APU_LDFLAGS@\
5762
@APXS_LDFLAGS@\
63+
@CURL_LDFLAGS@\
5864
@LIBXML2_LDFLAGS@\
5965
@LUA_LDFLAGS@\
6066
@PCRE_LDFLAGS@\

0 commit comments

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