merge upstream & update configs

This commit is contained in:
Mihai Pitu
2013-08-23 13:54:30 +03:00
parent 107ff9af8f
commit 9651da3d4c
192 changed files with 14497 additions and 439 deletions

Binary file not shown.

Binary file not shown.

BIN
standalone/Debug/acmp.obj Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
standalone/Debug/api.obj Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
standalone/Debug/config.obj Normal file

Binary file not shown.

Binary file not shown.

BIN
standalone/Debug/hooks.obj Normal file

Binary file not shown.

View File

@@ -0,0 +1 @@
<EFBFBD><EFBFBD>

View File

@@ -0,0 +1 @@
<EFBFBD><EFBFBD>

View File

@@ -0,0 +1 @@
<EFBFBD><EFBFBD>

View File

@@ -0,0 +1 @@
<EFBFBD><EFBFBD>

View File

@@ -0,0 +1 @@
<EFBFBD><EFBFBD>

View File

@@ -0,0 +1 @@
<EFBFBD><EFBFBD>

View File

@@ -0,0 +1 @@
<EFBFBD><EFBFBD>

BIN
standalone/Debug/main.obj Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
standalone/Debug/re.obj Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
standalone/Debug/regex.obj Normal file

Binary file not shown.

BIN
standalone/Debug/server.obj Normal file

Binary file not shown.

View File

@@ -0,0 +1,84 @@
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_PCRE.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_RELEASE.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_REQBODY.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_TREE.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_UNICODE.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_UTIL.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_XML.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\PERSIST_DBM.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE_ACTIONS.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE_OPERATORS.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE_TFNS.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE_VARIABLES.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\API.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\BUCKETS.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\CONFIG.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\FILTERS.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\HOOKS.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\REGEX.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\SERVER.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\ACMP.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\APACHE2_CONFIG.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\APACHE2_IO.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\APACHE2_UTIL.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MODSECURITY.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MOD_SECURITY2.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_CRYPT.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_GEO.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_GSB.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_LOGGING.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_LUA.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_MULTIPART.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_PARSERS.OBJ
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\VC110.PDB
C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MAIN.OBJ
c:\work\mod_security2\standalone\Debug\acmp.obj
c:\work\mod_security2\standalone\Debug\apache2_config.obj
c:\work\mod_security2\standalone\Debug\apache2_io.obj
c:\work\mod_security2\standalone\Debug\apache2_util.obj
c:\work\mod_security2\standalone\Debug\api.obj
c:\work\mod_security2\standalone\Debug\buckets.obj
c:\work\mod_security2\standalone\Debug\config.obj
c:\work\mod_security2\standalone\Debug\filters.obj
c:\work\mod_security2\standalone\Debug\hooks.obj
c:\work\mod_security2\standalone\Debug\main.obj
c:\work\mod_security2\standalone\Debug\modsecurity.obj
c:\work\mod_security2\standalone\Debug\mod_security2.obj
c:\work\mod_security2\standalone\Debug\msc_crypt.obj
c:\work\mod_security2\standalone\Debug\msc_geo.obj
c:\work\mod_security2\standalone\Debug\msc_gsb.obj
c:\work\mod_security2\standalone\Debug\msc_logging.obj
c:\work\mod_security2\standalone\Debug\msc_lua.obj
c:\work\mod_security2\standalone\Debug\msc_multipart.obj
c:\work\mod_security2\standalone\Debug\msc_parsers.obj
c:\work\mod_security2\standalone\Debug\msc_pcre.obj
c:\work\mod_security2\standalone\Debug\msc_release.obj
c:\work\mod_security2\standalone\Debug\msc_reqbody.obj
c:\work\mod_security2\standalone\Debug\msc_tree.obj
c:\work\mod_security2\standalone\Debug\msc_unicode.obj
c:\work\mod_security2\standalone\Debug\msc_util.obj
c:\work\mod_security2\standalone\Debug\msc_xml.obj
c:\work\mod_security2\standalone\Debug\persist_dbm.obj
c:\work\mod_security2\standalone\Debug\re.obj
c:\work\mod_security2\standalone\Debug\regex.obj
c:\work\mod_security2\standalone\Debug\re_actions.obj
c:\work\mod_security2\standalone\Debug\re_operators.obj
c:\work\mod_security2\standalone\Debug\re_tfns.obj
c:\work\mod_security2\standalone\Debug\re_variables.obj
c:\work\mod_security2\standalone\Debug\server.obj
c:\work\mod_security2\standalone\Debug\cl.command.1.tlog
c:\work\mod_security2\standalone\Debug\CL.read.1.tlog
c:\work\mod_security2\standalone\Debug\CL.write.1.tlog
c:\work\mod_security2\standalone\Debug\link-cvtres.read.1.tlog
c:\work\mod_security2\standalone\Debug\link-cvtres.write.1.tlog
c:\work\mod_security2\standalone\Debug\link-rc.read.1.tlog
c:\work\mod_security2\standalone\Debug\link-rc.write.1.tlog
c:\work\mod_security2\standalone\Debug\link.command.1.tlog
c:\work\mod_security2\standalone\Debug\link.read.1.tlog
c:\work\mod_security2\standalone\Debug\link.write.1.tlog
c:\work\mod_security2\standalone\Debug\standalone.exp
c:\work\mod_security2\standalone\Debug\vc110.idb
c:\work\mod_security2\standalone\Debug\standalone.pdb
c:\work\mod_security2\standalone\Debug\vc110.pdb
C:\work\mod_security2\standalone\Debug\standalone.pdb

Binary file not shown.

View File

@@ -0,0 +1,2 @@
#v4.0:v110:false
Debug|Win32|C:\work\mod_security2\standalone\|

Binary file not shown.

View File

@@ -0,0 +1,90 @@
Build started 8/23/2013 12:59:45 PM.
1>Project "c:\work\mod_security2\standalone\standalone.vcxproj" on node 2 (Build target(s)).
1>ClCompile:
C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\CL.exe /c /I"C:\work\pcre-8.30\include" /I"C:\work\pcre-8.30" /I"C:\work\libxml2-2.7.7\include" /IC:\apache22\include /I..\apache2 /Ic:\work\apache24\include /ZI /nologo /W3 /WX- /Od /Oy- /D _MBCS /D _MBCS /D WIN32 /D WINNT /D inline=APR_INLINE /D AP_DECLARE_STATIC /D VERSION_STANDALONE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc110.pdb" /Gd /TC /wd4244 /wd4018 /analyze- /errorReport:prompt ..\apache2\acmp.c ..\apache2\apache2_config.c ..\apache2\apache2_io.c ..\apache2\apache2_util.c ..\apache2\modsecurity.c ..\apache2\mod_security2.c ..\apache2\msc_crypt.c ..\apache2\msc_geo.c ..\apache2\msc_gsb.c ..\apache2\msc_logging.c ..\apache2\msc_lua.c ..\apache2\msc_multipart.c ..\apache2\msc_parsers.c ..\apache2\msc_pcre.c ..\apache2\msc_release.c ..\apache2\msc_reqbody.c ..\apache2\msc_tree.c ..\apache2\msc_unicode.c ..\apache2\msc_util.c ..\apache2\msc_xml.c ..\apache2\persist_dbm.c ..\apache2\re.c ..\apache2\re_actions.c ..\apache2\re_operators.c ..\apache2\re_tfns.c ..\apache2\re_variables.c api.c buckets.c config.c filters.c hooks.c regex.c server.c
server.c
regex.c
hooks.c
filters.c
config.c
buckets.c
api.c
1>c:\work\mod_security2\standalone\api.c(226): warning C4101: 'rc' : unreferenced local variable
re_variables.c
re_tfns.c
re_operators.c
re_actions.c
re.c
persist_dbm.c
msc_xml.c
msc_util.c
msc_unicode.c
msc_tree.c
msc_reqbody.c
msc_release.c
msc_pcre.c
Generating Code...
Compiling...
msc_parsers.c
msc_multipart.c
msc_lua.c
msc_logging.c
msc_gsb.c
msc_geo.c
msc_crypt.c
1>c:\work\mod_security2\apache2\msc_crypt.c(70): warning C4101: 'i' : unreferenced local variable
mod_security2.c
modsecurity.c
apache2_util.c
apache2_io.c
apache2_config.c
acmp.c
Generating Code...
C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\CL.exe /c /I"C:\work\pcre-8.30\include" /I"C:\work\pcre-8.30" /I"C:\work\libxml2-2.7.7\include" /IC:\apache22\include /I..\apache2 /Ic:\work\apache24\include /ZI /nologo /W3 /WX- /Od /Oy- /D _MBCS /D _MBCS /D WIN32 /D WINNT /D inline=APR_INLINE /D AP_DECLARE_STATIC /D VERSION_STANDALONE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc110.pdb" /Gd /TP /wd4244 /wd4018 /analyze- /errorReport:prompt main.cpp
main.cpp
1>c:\work\mod_security2\standalone\main.cpp(16): warning C4005: 'inline' : macro redefinition
command-line arguments : see previous definition of 'inline'
Link:
C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\work\mod_security2\standalone\Debug\standalone.exe" /INCREMENTAL /NOLOGO /LIBPATH:c:\drop\x86 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "libapr-1.lib" "libaprutil-1.lib" pcre.lib libxml2.lib /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /DEBUG /PDB:"C:\work\mod_security2\standalone\Debug\standalone.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\work\mod_security2\standalone\Debug\standalone.lib" /MACHINE:X86 Debug\acmp.obj
Debug\apache2_config.obj
Debug\apache2_io.obj
Debug\apache2_util.obj
Debug\modsecurity.obj
Debug\mod_security2.obj
Debug\msc_crypt.obj
Debug\msc_geo.obj
Debug\msc_gsb.obj
Debug\msc_logging.obj
Debug\msc_lua.obj
Debug\msc_multipart.obj
Debug\msc_parsers.obj
Debug\msc_pcre.obj
Debug\msc_release.obj
Debug\msc_reqbody.obj
Debug\msc_tree.obj
Debug\msc_unicode.obj
Debug\msc_util.obj
Debug\msc_xml.obj
Debug\persist_dbm.obj
Debug\re.obj
Debug\re_actions.obj
Debug\re_operators.obj
Debug\re_tfns.obj
Debug\re_variables.obj
Debug\api.obj
Debug\buckets.obj
Debug\config.obj
Debug\filters.obj
Debug\hooks.obj
Debug\main.obj
Debug\regex.obj
Debug\server.obj
Creating library C:\work\mod_security2\standalone\Debug\standalone.lib and object C:\work\mod_security2\standalone\Debug\standalone.exp
1>re_operators.obj : error LNK2019: unresolved external symbol _libinjection_sqli_init referenced in function _msre_op_detectSQLi_execute
1>re_operators.obj : error LNK2019: unresolved external symbol _libinjection_is_sqli referenced in function _msre_op_detectSQLi_execute
1>C:\work\mod_security2\standalone\Debug\standalone.exe : fatal error LNK1120: 2 unresolved externals
1>Done Building Project "c:\work\mod_security2\standalone\standalone.vcxproj" (Build target(s)) -- FAILED.
Build FAILED.
Time Elapsed 00:00:15.65

Binary file not shown.

BIN
standalone/Debug/vc110.idb Normal file

Binary file not shown.

BIN
standalone/Debug/vc110.pdb Normal file

Binary file not shown.