diff --git a/appveyor.yml b/appveyor.yml index 1fdfb3d..9d8897f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ shallow_clone: true environment: LR_EXTERNAL: c:\external - CURL_VER: 7.59.0 + CURL_VER: 7.60.0 matrix: - LUA: "lua 5.1" diff --git a/msvc/lcurl.sln b/msvc/lcurl.sln index fb537a0..e9920fc 100644 --- a/msvc/lcurl.sln +++ b/msvc/lcurl.sln @@ -1,18 +1,26 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lcurl", "lcurl.vcproj", "{200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lcurl", "lcurl.vcxproj", "{200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}.Debug|Win32.ActiveCfg = Debug|Win32 {200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}.Debug|Win32.Build.0 = Debug|Win32 + {200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}.Debug|x64.ActiveCfg = Debug|x64 + {200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}.Debug|x64.Build.0 = Debug|x64 {200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}.Release|Win32.ActiveCfg = Release|Win32 {200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}.Release|Win32.Build.0 = Release|Win32 + {200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}.Release|x64.ActiveCfg = Release|x64 + {200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/lcopteasy.h b/src/lcopteasy.h index d4741c4..38eff29 100644 --- a/src/lcopteasy.h +++ b/src/lcopteasy.h @@ -439,6 +439,11 @@ OPT_ENTRY( happy_eyeballs_timeout_ms,HAPPY_EYEBALLS_TIMEOUT_MS,LNG, 0, CURL_HET_ OPT_ENTRY( timevalue_large, TIMEVALUE_LARGE ,OFF, 0, LCURL_DEFAULT_VALUE) #endif +#if LCURL_CURL_VER_GE(7,60,0) +OPT_ENTRY(dns_shuffle_addresses, DNS_SHUFFLE_ADDRESSES, LNG, 0, LCURL_DEFAULT_VALUE) +OPT_ENTRY(haproxyprotocol, HAPROXYPROTOCOL, LNG, 0, LCURL_DEFAULT_VALUE) +#endif + //{ Restore system macros #ifdef LCURL__TCP_FASTOPEN