NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit6c0cdab

Felipe Zimmerle

committed

IIS: Changes Curl version and removes OpenSSL dependency

As the this new Curl version supports well the Windows certificate storage,removing the dependency on the OpenSSL. Also changing the build scripts to workaccordingly. As the cmake build of Curl is said to broken abandoning it infavor of the nmake files. Thanks to Gregg Smith and Steffen.

1 parent0d2d01b commit6c0cdabCopy full SHA for 6c0cdab

File tree

10 files changed

+53

-159

lines changed

10 files changed

+53

-159

lines changed

`‎CHANGES‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`DD mmm YYYY - 2.9.????? (To be released)`
`2`	`2`	`-----------------------`
`3`	`3`
	`4`	`+ * OpenSSL dependency was removed on MS Windows builds. ModSecurity is now using`
	`5`	`+ the Windows certificate storage.`
	`6`	`+ [Gregg Smith, Steffen and ModSecurity team]`
`4`	`7`	`* Informs about external resources loaded/failed while reloading Apache.`
`5`	`8`	`[ModSecurity team]`
`6`	`9`	`* Adds missing 'ModSecurity:' prefix in some warnings messages.`

`‎apache2/Makefile.win‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ LIBS = $(APACHE)\lib\libhttpd.lib \`
`11`	`11`	`$(APACHE)\lib\libapr-1.lib \`
`12`	`12`	`$(APACHE)\lib\libaprutil-1.lib \`
`13`	`13`	`$(PCRE)\pcre.lib \`
`14`		`- $(CURL)\lib\libcurl_imp.lib \`
	`14`	`+ $(CURL)\libcurl.lib \`
`15`	`15`	`$(LIBXML2)\win32\bin.msvc\libxml2.lib \`
`16`	`16`	`Ws2_32.lib \`
`17`	`17`	`"iphlpapi.lib"`
`@@ -32,6 +32,9 @@ INCLUDES = -I. -I.. \`
`32`	`32`	`-I$(PCRE)\include -I$(PCRE) \`
`33`	`33`	`-I$(LIBXML2)\include \`
`34`	`34`	`-I$(APACHE)\include`
	`35`	`+`
	`36`	`+# Enables support for SecRemoteRules and external resources.`
	`37`	`+DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES`
`35`	`38`
`36`	`39`	`# Lua is optional`
`37`	`40`	`!IF "$(LUA)" != ""`

`‎iis/Makefile.win‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`LIBS = $(APACHE)\lib\libapr-1.lib \`
`11`	`11`	`$(APACHE)\lib\libaprutil-1.lib \`
`12`	`12`	`$(PCRE)\pcre.lib \`
`13`		`- $(CURL)\lib\libcurl_imp.lib \`
	`13`	`+ $(CURL)\libcurl.lib \`
`14`	`14`	`$(LIBXML2)\win32\bin.msvc\libxml2.lib \`
`15`	`15`	`"kernel32.lib" "user32.lib" "gdi32.lib" "winspool.lib" "comdlg32.lib" "advapi32.lib" "shell32.lib" "ole32.lib" \`
`16`	`16`	`"oleaut32.lib" "uuid.lib" "odbc32.lib" "odbccp32.lib" "ws2_32.lib" \`
`@@ -37,6 +37,8 @@ INCLUDES = -I. -I.. \`
`37`	`37`	`-I..\apache2 \`
`38`	`38`	`-I..\standalone`
`39`	`39`
	`40`	`+# Enables support for SecRemoteRules and external resources.`
	`41`	`+DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES`
`40`	`42`
`41`	`43`	`# -I$(SSDEEP) \`
`42`	`44`	`# Lua is optional`

`‎iis/build_dependencies.bat‎`

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,13 @@`
`13`	`13`	`@setZLIB=zlib-1.2.8.tar.gz`
`14`	`14`	`@setLIBXML2=libxml2-2.9.1.tar.gz`
`15`	`15`	`@setLUA=lua-5.1.5.tar.gz`
`16`		`-@setCURL=curl-7.33.0.zip`
	`16`	`+@setCURL=curl-7.39.0.zip`
`17`	`17`	`@setAPACHE_SRC=httpd-2.4.6.tar.gz`
`18`	`18`	`@setAPACHE_BIN32=httpd-2.4.6-win32-VC11.zip`
`19`	`19`	`@setAPACHE_BIN64=httpd-2.4.6-win64-VC11.zip`
`20`	`20`	`@setYAJL=lloyd-yajl-f4b2b1a.zip`
`21`	`21`	`@setSSDEEP=ssdeep-2.10.tar.gz`
`22`	`22`	`@setSSDEEP_BIN=ssdeep-2.10.zip`
`23`		`-@setOPENSSL=openssl-1.0.1j.tar.gz`
`24`	`23`
`25`	`24`	`:: @set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"`
`26`	`25`	`:: @set VCARGS64="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat"`
`@@ -71,11 +70,6 @@ call cl 2>&1 \| findstr /C:"x64"`
`71`	`70`	`@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_lua`
`72`	`71`	`@cd"%CURRENT_DIR%"`
`73`	`72`
`74`		`-@echo # openssl -%OPENSSL%`
`75`		`-@call dependencies/build_openssl.bat`
`76`		`-@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_openssl`
`77`		`-@cd"%CURRENT_DIR%"`
`78`		`-`
`79`	`73`	`@echo # curl -%CURL%`
`80`	`74`	`@call dependencies/build_curl.bat`
`81`	`75`	`@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_curl`
`@@ -127,10 +121,6 @@ call cl 2>&1 \| findstr /C:"x64"`
`127`	`121`	`@echo Failed to setup%CURL%...`
`128`	`122`	`@goto failed`
`129`	`123`
`130`		`-:build_failed_openssl`
`131`		`-@echo Failed to setup%OPENSSL%...`
`132`		`-@goto failed`
`133`		`-`
`134`	`124`	`:build_failed_yajl`
`135`	`125`	`@echo Failed to setup%YAJL%...`
`136`	`126`	`@goto failed`

`‎iis/build_release.bat‎`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ copy "%OUTPUT_DIR%\pcre.dll" "%AMD64%"`
`35`	`35`	`copy"%OUTPUT_DIR%\zlib1.dll""%AMD64%"`
`36`	`36`	`copy"%OUTPUT_DIR%\yajl.dll""%AMD64%"`
`37`	`37`	`copy"%OUTPUT_DIR%\fuzzy.dll""%AMD64%"`
`38`		`-copy"%OUTPUT_DIR%\libeay32.dll""%AMD64%"`
`39`		`-copy"%OUTPUT_DIR%\ssleay32.dll""%AMD64%"`
`40`	`38`
`41`	`39`	`setSSDEEP_ARCH="x86"`
`42`	`40`	`call build_dependencies.bat%VCARGS32%`
`@@ -56,8 +54,6 @@ copy "%OUTPUT_DIR%\pcre.dll" "%X86%"`
`56`	`54`	`copy"%OUTPUT_DIR%\zlib1.dll""%X86%"`
`57`	`55`	`copy"%OUTPUT_DIR%\yajl.dll""%X86%"`
`58`	`56`	`copy"%OUTPUT_DIR%\fuzzy.dll""%X86%"`
`59`		`-copy"%OUTPUT_DIR%\libeay32.dll""%X86%"`
`60`		`-copy"%OUTPUT_DIR%\ssleay32.dll""%X86%"`
`61`	`57`
`62`	`58`
`63`	`59`	`:: copy %OUTPUT_DIR%\Installer.exe %RELEASE_DIR%`

`‎iis/dependencies/build_curl.bat‎`

Lines changed: 35 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,39 +1,41 @@`
`1`		`-cd"%WORK_DIR%"`
`2`		`-`
`3`		`-@ifNOT EXIST"%SOURCE_DIR%\%CURL%"goto file_not_found_bin`
	`1`	`+cd"%WORK_DIR%"`
	`2`	`+@ifNOT EXIST"%SOURCE_DIR%\%CURL%"goto file_not_found_bin`
`4`	`3`	`echo"7z..."`
`5`		`-7z.exe x"%SOURCE_DIR%\%CURL%"`
	`4`	`+7z.exe x"%SOURCE_DIR%\%CURL%"`
`6`	`5`	`echo"Timeout..."`
`7`	`6`	`timeout5`
`8`	`7`	`echo"Curl..."`
`9`		`-setCURL_DIR=%CURL:~0,-4%`
	`8`	`+setCURL_DIR=%CURL:~0,-4%`
`10`	`9`	`echo"Move..."`
`11`		`-move"%CURL_DIR%""curl"`
	`10`	`+move"%CURL_DIR%""curl"`
`12`	`11`	`echo"Cd..."`
`13`		`-:: copy /y CMakeLists.txt "curl"`
`14`		`-CD"curl"`
`15`		`-echo"Cmake..."`
`16`		`-CMAKE -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True -DUSE_SSLEAY=dll -DUSE_OPENSSL=dll -DOPENSSL_ROOT_DIR=%WORK_DIR%/openssl_inst`
`17`		`-@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
`18`		`-:: "%WORK_DIR%\fart.exe" -r -C "%WORK_DIR%\curl\include\curl\curlbuild.h" LLU ULL`
`19`		`-NMAKE`
`20`		`-@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
`21`		`-cd"%WORK_DIR%"`
`22`		`-`
`23`		`-copy /y"%WORK_DIR%\curl\lib\libcurl.dll""%OUTPUT_DIR%"`
`24`		`-copy /y"%WORK_DIR%\curl\lib\libcurl.pdb""%OUTPUT_DIR%"`
`25`		`-copy /y"%WORK_DIR%\curl\lib\libcurl_imp.lib""%OUTPUT_DIR%"`
`26`		`-`
`27`		`-exit /B0`
`28`		`-`
`29`		`-:file_not_found_bin`
`30`		`-@echo File not found:"%SOURCE_DIR%\%CURL%"`
`31`		`-@goto failed`
`32`		`-`
`33`		`-:build_failed`
`34`		`-@echo Problems during the building phase`
`35`		`-@goto failed`
`36`		`-`
`37`		`-:failed`
`38`		`-@exit /B1`
`39`		`-`
	`12`	`+CD"curl\winbuild"`
	`13`	`+`
	`14`	`+@setARCH=x86`
	`15`	`+@call cl2>&1\|findstr /C:"x64"`
	`16`	`+@if (%ERRORLEVEL%)== (0)setARCH=x64`
	`17`	`+`
	`18`	`+nmake /f Makefile.vc mode=dll ENABLE_WINSSL=yes MACHINE=%ARCH% WITH_ZLIB=dll`
	`19`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
	`20`	`+`
	`21`	`+cd"%WORK_DIR%"`
	`22`	`+`
	`23`	`+copy /y"%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.dll""%OUTPUT_DIR%"`
	`24`	`+copy /y"%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib""%OUTPUT_DIR%"`
	`25`	`+copy /y"%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib""%WORK_DIR%\curl\libcurl.lib"`
	`26`	`+`
	`27`	`+exit /B0`
	`28`	`+`
	`29`	`+:file_not_found_bin`
	`30`	`+@echo File not found:"%SOURCE_DIR%\%CURL%"`
	`31`	`+@goto failed`
	`32`	`+`
	`33`	`+:build_failed`
	`34`	`+@echo Problems during the building phase`
	`35`	`+@goto failed`
	`36`	`+`
	`37`	`+:failed`
	`38`	`+@exit /B1`
	`39`	`+`
	`40`	`+`
	`41`	`+->`

`‎iis/dependencies/build_openssl.bat‎`

Lines changed: 0 additions & 83 deletions

This file was deleted.

`‎iis/installer.wxs‎`

Lines changed: 2 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,16 +86,6 @@`
`86`	`86`	`<DirectorySearchId="CheckFileDir19"Path="C:\Windows\System32\inetsrv"Depth="0">`
`87`	`87`	`<FileSearchId="CheckFile19"Name="fuzzy.dll" />`
`88`	`88`	`</DirectorySearch>`
`89`		`- <DirectorySearchId="CheckFileDir20"Path="C:\Windows\System32\inetsrv"Depth="0">`
`90`		`- <FileSearchId="CheckFile20"Name="libeay32.dll" />`
`91`		`- </DirectorySearch>`
`92`		`- <DirectorySearchId="CheckFileDir21"Path="C:\Windows\System32\inetsrv"Depth="0">`
`93`		`- <FileSearchId="CheckFile21"Name="ssleay32.dll" />`
`94`		`- </DirectorySearch>`
`95`		`- <DirectorySearchId="CheckFileDir22"Path="C:\Windows\System32\inetsrv"Depth="0">`
`96`		`- <FileSearchId="CheckFile22"Name="curl-ca-bundle.crt" />`
`97`		`- </DirectorySearch>`
`98`		`-`
`99`	`89`	`</Property>`
`100`	`90`	`<PropertyId="WWWROOT">`
`101`	`91`	`<RegistrySearchId="FindInetPubFolder"Root="HKLM"Key="SOFTWARE\Microsoft\InetStp"Name="PathWWWRoot"Type="directory" />`
`@@ -336,9 +326,9 @@`
`336`	`326`	`<ShortcutId="EULA"Name="EULA"Description="EULA"Target="[INSTALLFOLDER]EULA.rtf"WorkingDirectory="INSTALLFOLDER" />`
`337`	`327`	`<ShortcutId="Readme"Name="EULA"Description="EULA"Target="[INSTALLFOLDER]README.TXT"WorkingDirectory="INSTALLFOLDER" />`
`338`	`328`	`<?if $(var.Win64) ="yes" ?>`
`339`		- <Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments=""[inetsrv64]libapr-1.dll" "[inetsrv64]libapriconv-1.dll" "[inetsrv64]libaprutil-1.dll" "[inetsrv64]libcurl.dll" "[inetsrv64]libxml2.dll" "[inetsrv64]lua5.1.dll" "[inetsrv64]mlogc.exe" "[inetsrv64]ModSecurityIIS.dll" "[inetsrv64]pcre.dll" "[inetsrv64]zlib1.dll" "[inetsrv64]fuzzy.dll" "[inetsrv64]libeay32.dll" "[inetsrv64]ssleay32.dll" "[inetsrv32]libapr-1.dll" "[inetsrv32]libapriconv-1.dll" "[inetsrv32]libaprutil-1.dll" "[inetsrv32]libcurl.dll" "[inetsrv32]libxml2.dll" "[inetsrv32]lua5.1.dll" "[inetsrv32]mlogc.exe" "[inetsrv32]ModSecurityIIS.dll" "[inetsrv32]pcre.dll" "[inetsrv32]zlib1.dll" "[inetsrv32]fuzzy.dll" "[inetsrv32]libeay32.dll" "[inetsrv32]ssleay32.dll"" WorkingDirectory="INSTALLFOLDER" />
	`329`	+ <ShortcutId="List_Dependencies"Name="List Dependencies (Debug)"Description="Check for missing dependencies"Target="[INSTALLFOLDER]list_dependencies.bat"Arguments=""[inetsrv64]libapr-1.dll""[inetsrv64]libapriconv-1.dll""[inetsrv64]libaprutil-1.dll""[inetsrv64]libcurl.dll""[inetsrv64]libxml2.dll""[inetsrv64]lua5.1.dll""[inetsrv64]mlogc.exe""[inetsrv64]ModSecurityIIS.dll""[inetsrv64]pcre.dll""[inetsrv64]zlib1.dll""[inetsrv64]fuzzy.dll""[inetsrv32]libapr-1.dll""[inetsrv32]libapriconv-1.dll""[inetsrv32]libaprutil-1.dll""[inetsrv32]libcurl.dll""[inetsrv32]libxml2.dll""[inetsrv32]lua5.1.dll""[inetsrv32]mlogc.exe""[inetsrv32]ModSecurityIIS.dll""[inetsrv32]pcre.dll""[inetsrv32]zlib1.dll""[inetsrv32]fuzzy.dll""WorkingDirectory="INSTALLFOLDER" />
`340`	`330`	`<?else ?>`
`341`		- <ShortcutId="List_Dependencies"Name="List Dependencies (Debug)"Description="Check for missing dependencies"Target="[INSTALLFOLDER]list_dependencies.bat"Arguments=""[inetsrv32]libapr-1.dll""[inetsrv32]libapriconv-1.dll""[inetsrv32]libaprutil-1.dll""[inetsrv32]libcurl.dll""[inetsrv32]libxml2.dll""[inetsrv32]lua5.1.dll""[inetsrv32]mlogc.exe""[inetsrv32]ModSecurityIIS.dll""[inetsrv32]pcre.dll""[inetsrv32]zlib1.dll""[inetsrv32]fuzzy.dll""[inetsrv32]libeay32.dll""[inetsrv32]ssleay32.dll""WorkingDirectory="INSTALLFOLDER" />
	`331`	+ <ShortcutId="List_Dependencies"Name="List Dependencies (Debug)"Description="Check for missing dependencies"Target="[INSTALLFOLDER]list_dependencies.bat"Arguments=""[inetsrv32]libapr-1.dll""[inetsrv32]libapriconv-1.dll""[inetsrv32]libaprutil-1.dll""[inetsrv32]libcurl.dll""[inetsrv32]libxml2.dll""[inetsrv32]lua5.1.dll""[inetsrv32]mlogc.exe""[inetsrv32]ModSecurityIIS.dll""[inetsrv32]pcre.dll""[inetsrv32]zlib1.dll""[inetsrv32]fuzzy.dll""WorkingDirectory="INSTALLFOLDER" />
`342`	`332`	`<?endif ?>`
`343`	`333`	`</Component>`
`344`	`334`	`</Directory>`
`@@ -380,9 +370,6 @@`
`380`	`370`	`<FileId="_64_PCRE"Name="pcre.dll"Source="Release\amd64\pcre.dll" />`
`381`	`371`	`<FileId="_64_ZLIB1"Name="zlib1.dll"Source="Release\amd64\zlib1.dll" />`
`382`	`372`	`<FileId="_64_FUZZY"Name="fuzzy.dll"Source="Release\amd64\fuzzy.dll" />`
`383`		`- <FileId="_64_LIBEAY"Name="libeay32.dll"Source="Release\amd64\libeay32.dll" />`
`384`		`- <FileId="_64_SSLEAY"Name="ssleay32.dll"Source="Release\amd64\ssleay32.dll" />`
`385`		`-<FileId="_64_CA_BUNDLE"Name="curl-ca-bundle.crt"Source="curl-ca-bundle.crt" />`
`386`	`373`	`</Component>`
`387`	`374`	`</DirectoryRef>`
`388`	`375`	`<DirectoryRefId="inetsrv32">`
`@@ -399,9 +386,6 @@`
`399`	`386`	`<FileId="_32_PCRE"Name="pcre.dll"Source="Release\x86\pcre.dll" />`
`400`	`387`	`<FileId="_32_ZLIB1"Name="zlib1.dll"Source="Release\x86\zlib1.dll" />`
`401`	`388`	`<FileId="_32_FUZZY"Name="fuzzy.dll"Source="Release\x86\fuzzy.dll" />`
`402`		`- <FileId="_32_LIBEAY"Name="libeay32.dll"Source="Release\x86\libeay32.dll" />`
`403`		`- <FileId="_32_SSLEAY"Name="ssleay32.dll"Source="Release\x86\ssleay32.dll" />`
`404`		`-<FileId="_32_CA_BUNDLE"Name="curl-ca-bundle.crt"Source="curl-ca-bundle.crt" />`
`405`	`389`	`</Component>`
`406`	`390`	`</DirectoryRef>`
`407`	`391`	`<DirectoryRefId="SystemFolderConfigSchema32">`
`@@ -429,9 +413,6 @@`
`429`	`413`	`<FileId="_32_PCRE"Name="pcre.dll"Source="Release\x86\pcre.dll" />`
`430`	`414`	`<FileId="_32_ZLIB1"Name="zlib1.dll"Source="Release\x86\zlib1.dll" />`
`431`	`415`	`<FileId="_32_FUZZY"Name="fuzzy.dll"Source="Release\x86\fuzzy.dll" />`
`432`		`- <FileId="_32_LIBEAY"Name="libeay32.dll"Source="Release\x86\libeay32.dll" />`
`433`		`- <FileId="_32_SSLEAY"Name="ssleay32.dll"Source="Release\x86\ssleay32.dll" />`
`434`		`-<FileId="_32_CA_BUNDLE"Name="curl-ca-bundle.crt"Source="curl-ca-bundle.crt" />`
`435`	`416`	`</Component>`
`436`	`417`	`</DirectoryRef>`
`437`	`418`	`<DirectoryRefId="SystemFolderConfigSchema32">`

`‎iis/mlogc.vcxproj‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@`
`81`	`81`	`</ClCompile>`
`82`	`82`	`<Link>`
`83`	`83`	`<SubSystem>Console</SubSystem>`
`84`		- <AdditionalDependencies>kernel32.lib;IPHLPAPI.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;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\lib\libcurl_imp.lib;</AdditionalDependencies>
	`84`	+ <AdditionalDependencies>kernel32.lib;IPHLPAPI.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;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib;</AdditionalDependencies>
`85`	`85`	`<AdditionalLibraryDirectories>`
`86`	`86`	`</AdditionalLibraryDirectories>`
`87`	`87`	`<GenerateDebugInformation>false</GenerateDebugInformation>`
`@@ -95,7 +95,7 @@`
`95`	`95`	`</ClCompile>`
`96`	`96`	`<Link>`
`97`	`97`	`<SubSystem>Console</SubSystem>`
`98`		- <AdditionalDependencies>kernel32.lib;IPHLPAPI.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;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\lib\libcurl_imp.lib;</AdditionalDependencies>
	`98`	+ <AdditionalDependencies>kernel32.lib;IPHLPAPI.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;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib;</AdditionalDependencies>
`99`	`99`	`<AdditionalLibraryDirectories>`
`100`	`100`	`</AdditionalLibraryDirectories>`
`101`	`101`	`<GenerateDebugInformation>false</GenerateDebugInformation>`
`@@ -109,7 +109,7 @@`
`109`	`109`	`</ClCompile>`
`110`	`110`	`<Link>`
`111`	`111`	`<SubSystem>Console</SubSystem>`
`112`		- <AdditionalDependencies>kernel32.lib;IPHLPAPI.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;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\lib\libcurl_imp.lib;</AdditionalDependencies>
	`112`	+ <AdditionalDependencies>kernel32.lib;IPHLPAPI.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;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib;</AdditionalDependencies>
`113`	`113`	`<AdditionalLibraryDirectories>`
`114`	`114`	`</AdditionalLibraryDirectories>`
`115`	`115`	`<GenerateDebugInformation>false</GenerateDebugInformation>`
`@@ -121,4 +121,4 @@`
`121`	`121`	`<ImportProject="$(VCTargetsPath)\Microsoft.Cpp.targets" />`
`122`	`122`	`<ImportGroupLabel="ExtensionTargets">`
`123`	`123`	`</ImportGroup>`
`124`		`-</Project>`
	`124`	`+</Project>`

`‎mlogc/Makefile.win‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ CURL = %CURL%`
`14`	`14`	`LIBS = $(BASE)\lib\libapr-1.lib \`
`15`	`15`	`$(BASE)\lib\libaprutil-1.lib \`
`16`	`16`	`$(PCRE)\pcre.lib \`
`17`		`- $(CURL)\lib\libcurl_imp.lib \`
	`17`	`+ $(CURL)\libcurl.lib \`
`18`	`18`	`wsock32.lib`
`19`	`19`
`20`	`20`	`###########################################################################`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6c0cdab

File tree

10 files changed

10 files changed

`‎CHANGES‎`

`‎apache2/Makefile.win‎`

`‎iis/Makefile.win‎`

`‎iis/build_dependencies.bat‎`

`‎iis/build_release.bat‎`

`‎iis/dependencies/build_curl.bat‎`

`‎iis/dependencies/build_openssl.bat‎`

`‎iis/installer.wxs‎`

`‎iis/mlogc.vcxproj‎`

`‎mlogc/Makefile.win‎`

0 commit comments