Adds curl support to main core

Curl was used only by mlogc, as we want to expand ModSecurity to load
external rules/resources it is now a dependency of the core as well.

Author: Felipe Zimmerle

apache2/Makefile.am

@@ -46,11 +46,15 @@ mod_security2_la_CFLAGS = @APR_CFLAGS@ \
 
 
 mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ \
+    @CURL_CPPFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_CPPFLAGS@ \
     @PCRE_CPPFLAGS@
 
 mod_security2_la_LIBADD = @APR_LDADD@ \
     @APU_LDADD@ \
+    @CURL_LDADD@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDADD@ \
     @LUA_LDADD@ \
     @PCRE_LDADD@ \
@@ -61,6 +65,8 @@ mod_security2_la_LDFLAGS = -module -avoid-version \
     @APR_LDFLAGS@ \
     @APU_LDFLAGS@ \
     @APXS_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \
@@ -73,6 +79,8 @@ mod_security2_la_LDFLAGS = -module -avoid-version \
     @APR_LDFLAGS@ \
     @APU_LDFLAGS@ \
     @APXS_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \
@@ -85,6 +93,8 @@ mod_security2_la_LDFLAGS = -module -avoid-version \
     @APR_LDFLAGS@ \
     @APU_LDFLAGS@ \
     @APXS_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \
@@ -97,6 +107,8 @@ mod_security2_la_LDFLAGS = -module -avoid-version \
     @APR_LDFLAGS@ \
     @APU_LDFLAGS@ \
     @APXS_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \
@@ -109,6 +121,8 @@ mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH
     @APR_LDFLAGS@ \
     @APU_LDFLAGS@ \
     @APXS_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \
@@ -121,6 +135,8 @@ mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
     @APR_LDFLAGS@ \
     @APU_LDFLAGS@ \
     @APXS_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \
@@ -133,6 +149,8 @@ mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
     @APR_LDFLAGS@ \
     @APU_LDFLAGS@ \
     @APXS_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \
@@ -145,6 +163,8 @@ mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
     @APR_LDFLAGS@ \
     @APU_LDFLAGS@ \
     @APXS_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \

apache2/Makefile.win

@@ -2,15 +2,16 @@
 #
 # Usage:   NMAKE -f Makefile.win APACHE={httpd installion dir}  PCRE={pcre dir} LIBXML2={LibXML2 dir} [   LUA={Lua dir} ]
 #
-!IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == ""
-!ERROR NMAKE arguments: APACHE=dir PCRE=dir LIBXML2=dir are required to build mod_security2 for Windows
+!IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == "" || "$(CURL)" == ""
+!ERROR NMAKE arguments: APACHE=dir PCRE=dir LIBXML2=dir CURL=dir are required to build mod_security2 for Windows
 !ENDIF
 
 # Linking libraries
 LIBS = $(APACHE)\lib\libhttpd.lib \
        $(APACHE)\lib\libapr-1.lib \
        $(APACHE)\lib\libaprutil-1.lib \
        $(PCRE)\pcre.lib \
+       $(CURL)\lib\libcurl_imp.lib \
        $(LIBXML2)\win32\bin.msvc\libxml2.lib \
        Ws2_32.lib \
        "iphlpapi.lib"
@@ -27,6 +28,7 @@ DEFS = /nologo /O2 /LD /W3 /wd4244 /wd4018 -DWIN32 -DWINNT -Dinline=APR_INLINE -
 DLL = mod_security2.so
 
 INCLUDES = -I. -I.. \
+           -I$(CURL)\include -I$(CURL) \
            -I$(PCRE)\include -I$(PCRE) \
            -I$(LIBXML2)\include \
            -I$(APACHE)\include

configure.ac

@@ -694,9 +694,9 @@ CHECK_APU()
 fi
 CHECK_LIBXML2()
 CHECK_LUA()
-if test "$build_mlogc" -ne 0; then
+#if test "$build_mlogc" -ne 0; then
 CHECK_CURL()
-fi
+#fi
 
 # Check for YAJL libs (for JSON body processor)
 CHECK_YAJL()

iis/Makefile.win

@@ -2,15 +2,16 @@
 #
 # Usage:   NMAKE -f Makefile.win APACHE={httpd installion dir}  PCRE={pcre dir} LIBXML2={LibXML2 dir} [   LUA={Lua dir} ]
 #
-!IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == ""
-!ERROR NMAKE arguments: APACHE=dir PCRE=dir LIBXML2=dir are required to build mod_security2 for Windows
+!IF "$(APACHE)" == "" || "$(PCRE)" == "" || "$(LIBXML2)" == "" || "$(CURL)" == ""
+!ERROR NMAKE arguments: APACHE=dir PCRE=dir LIBXML2=dir CURL=dir are required to build mod_security2 for Windows
 !ENDIF
 
 # Linking libraries
 LIBS = $(APACHE)\lib\libapr-1.lib \
        $(APACHE)\lib\libaprutil-1.lib \
        $(PCRE)\pcre.lib \
        $(SSDEEP)\fuzzy.lib \
+       $(CURL)\lib\libcurl_imp.lib \
        $(LIBXML2)\win32\bin.msvc\libxml2.lib \
        "kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" \
        "oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" "ws2_32.lib" \
@@ -32,6 +33,7 @@ INCLUDES = -I. -I.. \
 	   -I$(SSDEEP) \
            -I$(PCRE)\include -I$(PCRE) \
            -I$(LIBXML2)\include \
+           -I$(CURL)\include -I$(CURL) \
            -I$(APACHE)\include \
            -I..\apache2 \
            -I..\standalone

iis/build_modsecurity.bat

@@ -15,7 +15,7 @@ set CURRENT_DIR=%cd%
 cd ..\apache2
 del *.obj *.dll *.lib
 del libinjection\*.obj libinjection\*.dll libinjection\*.lib
-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
+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
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 
 @echo mlogc...
@@ -29,7 +29,7 @@ nmake -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEP
 cd ..\iis
 del *.obj *.dll *.lib
 nmake -f Makefile.win clean
-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
+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
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 
 cd %CURRENT_DIR%

tests/Makefile.am

@@ -32,6 +32,7 @@ msc_test_SOURCES = msc_test.c \
 msc_test_CFLAGS = @APR_CFLAGS@ \
     @APU_CFLAGS@ \
     @APXS_CFLAGS@ \
+    @CURL_CFLAGS@ \
     @LIBXML2_CFLAGS@ \
     @LUA_CFLAGS@ \
     @MODSEC_EXTRA_CFLAGS@ \
@@ -41,11 +42,15 @@ msc_test_CFLAGS = @APR_CFLAGS@ \
 
 msc_test_CPPFLAGS = -I$(top_srcdir)/apache2 \
     @APR_CPPFLAGS@ \
+    @CURL_CPPFLAGS@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_CPPFLAGS@ \
     @PCRE_CPPFLAGS@
 
 msc_test_LDADD = @APR_LDADD@ \
     @APU_LDADD@ \
+    @CURL_LDADD@ \
+    @LIBXML2_CFLAGS@ \
     @LIBXML2_LDADD@ \
     @LUA_LDADD@ \
     @PCRE_LDADD@ \
@@ -55,6 +60,7 @@ msc_test_LDADD = @APR_LDADD@ \
 msc_test_LDFLAGS = @APR_LDFLAGS@ \
     @APU_LDFLAGS@ \
     @APXS_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \