Using c-ares in libcurl.

6 files changed, 19 insertions, 18 deletions

diff --git a/src/TaskMan.cc b/src/TaskMan.cc
index 07fff44..fce7ffe 100644
--- a/src/TaskMan.cc
+++ b/src/TaskMan.cc
@@ -540,6 +540,7 @@ void Balau::TaskMan::registerCurlHandle(Balau::CurlTask * curlTask) {
     m_curlGotNewHandles = true;
     curl_easy_setopt(curlTask->m_curlHandle, CURLOPT_SHARE, s_curlShared);
     curl_easy_setopt(curlTask->m_curlHandle, CURLOPT_PRIVATE, curlTask);
+    curl_easy_setopt(curlTask->m_curlHandle, CURLOPT_NOSIGNAL, 1L);
     curl_multi_add_handle(m_curlMulti, curlTask->m_curlHandle);
 }
 
diff --git a/win32/project/Balau.vcxproj b/win32/project/Balau.vcxproj
index 2f0d740..e08f09f 100644
--- a/win32/project/Balau.vcxproj
+++ b/win32/project/Balau.vcxproj
@@ -86,7 +86,7 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;DEBUG;_DEBUG;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;USE_ARES;DEBUG;_DEBUG;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>.;.\curl;..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers;..\..\win32\curl\include</AdditionalIncludeDirectories>

       <DisableSpecificWarnings>4290;4800</DisableSpecificWarnings>

       <ForcedIncludeFiles>$(SolutionDir)\Balau\msvc-config.h</ForcedIncludeFiles>

@@ -101,7 +101,7 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;DEBUG;_DEBUG;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;USE_ARES;DEBUG;_DEBUG;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>.;.\curl;..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers;..\..\win32\curl\include</AdditionalIncludeDirectories>

       <DisableSpecificWarnings>4290;4800</DisableSpecificWarnings>

       <ForcedIncludeFiles>$(SolutionDir)\Balau\msvc-config.h</ForcedIncludeFiles>

@@ -117,7 +117,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;USE_ARES;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>.;.\curl;..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers;..\..\win32\curl\include</AdditionalIncludeDirectories>

       <DisableSpecificWarnings>4290;4800</DisableSpecificWarnings>

       <ForcedIncludeFiles>$(SolutionDir)\Balau\msvc-config.h</ForcedIncludeFiles>

@@ -135,7 +135,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <SDLCheck>true</SDLCheck>

-      <PreprocessorDefinitions>PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>PTW32_STATIC_LIB;LTC_SOURCE;LTM_DESC;USE_LTM;LTC_NO_PROTOTYPES;_SCL_SECURE_NO_WARNINGS;CARES_STATICLIB;_CONSOLE;_LIB;CURL_STATICLIB;USE_ARES;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>.;.\curl;..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers;..\..\win32\curl\include</AdditionalIncludeDirectories>

       <DisableSpecificWarnings>4290;4800</DisableSpecificWarnings>

       <ForcedIncludeFiles>$(SolutionDir)\Balau\msvc-config.h</ForcedIncludeFiles>

diff --git a/win32/project/c-ares.vcxproj b/win32/project/c-ares.vcxproj
index 7fd5ede..342516e 100644
--- a/win32/project/c-ares.vcxproj
+++ b/win32/project/c-ares.vcxproj
@@ -86,7 +86,7 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <SDLCheck>false</SDLCheck>

-      <AdditionalIncludeDirectories>..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>c-ares;..\..\win32\c-ares</AdditionalIncludeDirectories>

       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

       <PreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

@@ -99,7 +99,7 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <SDLCheck>false</SDLCheck>

-      <AdditionalIncludeDirectories>..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>c-ares;..\..\win32\c-ares</AdditionalIncludeDirectories>

       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

       <PreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

@@ -114,7 +114,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <SDLCheck>false</SDLCheck>

-      <AdditionalIncludeDirectories>..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>c-ares;..\..\win32\c-ares</AdditionalIncludeDirectories>

       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

       <PreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

@@ -131,7 +131,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <SDLCheck>false</SDLCheck>

-      <AdditionalIncludeDirectories>..\..\includes;..\..\includes\msc;..\..\libev;..\..\win32;..\..\win32\pthreads-win32;..\..\win32\iconv;..\..\win32\zlib;..\..\win32\regex;..\..\win32\c-ares;..\..\LuaJIT\src;..\..\src\jsoncpp\include;..\..\libtommath;..\..\libtomcrypt\src\headers</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>c-ares;..\..\win32\c-ares</AdditionalIncludeDirectories>

       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

       <PreprocessorDefinitions>CARES_BUILDING_LIBRARY;CARES_STATICLIB;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

@@ -142,7 +142,6 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="..\ares_build.h" />

     <ClInclude Include="..\c-ares\ares.h" />

     <ClInclude Include="..\c-ares\ares_data.h" />

     <ClInclude Include="..\c-ares\ares_dns.h" />

@@ -163,6 +162,7 @@
     <ClInclude Include="..\c-ares\config-win32.h" />

     <ClInclude Include="..\c-ares\nameser.h" />

     <ClInclude Include="..\c-ares\setup_once.h" />

+    <ClInclude Include="c-ares\ares_build.h" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="..\c-ares\ares_cancel.c" />

diff --git a/win32/project/c-ares.vcxproj.filters b/win32/project/c-ares.vcxproj.filters
index 44896d7..189c3cd 100644
--- a/win32/project/c-ares.vcxproj.filters
+++ b/win32/project/c-ares.vcxproj.filters
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup>

-    <ClInclude Include="..\ares_build.h" />

     <ClInclude Include="..\c-ares\ares.h" />

     <ClInclude Include="..\c-ares\ares_data.h" />

     <ClInclude Include="..\c-ares\ares_dns.h" />

@@ -22,6 +21,7 @@
     <ClInclude Include="..\c-ares\config-win32.h" />

     <ClInclude Include="..\c-ares\nameser.h" />

     <ClInclude Include="..\c-ares\setup_once.h" />

+    <ClInclude Include="c-ares\ares_build.h" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="..\c-ares\ares_cancel.c" />

diff --git a/win32/ares_build.h b/win32/project/c-ares/ares_build.h
index afcb75a..afcb75a 100644
--- a/win32/ares_build.h
+++ b/win32/project/c-ares/ares_build.h
diff --git a/win32/project/libcurl.vcxproj b/win32/project/libcurl.vcxproj
index 0a31d48..f1bae89 100644
--- a/win32/project/libcurl.vcxproj
+++ b/win32/project/libcurl.vcxproj
@@ -79,8 +79,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>.;.\curl;..\curl\include;..\curl\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>.;.\curl;..\curl\include;..\curl\lib;..\c-ares;c-ares;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;USE_ARES;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -108,8 +108,8 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>.;.\curl;..\curl\include;..\curl\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>.;.\curl;..\curl\include;..\curl\lib;..\c-ares;c-ares;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;USE_ARES;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -135,8 +135,8 @@
     <ClCompile>

       <Optimization>MaxSpeed</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>.;.\curl;..\curl\include;..\curl\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>.;.\curl;..\curl\include;..\curl\lib;..\c-ares;c-ares;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;USE_ARES;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -164,8 +164,8 @@
     <ClCompile>

       <Optimization>MaxSpeed</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>.;.\curl;..\curl\include;..\curl\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>.;.\curl;..\curl\include;..\curl\lib;..\c-ares;c-ares;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>BUILDING_LIBCURL;CURL_STATICLIB;USE_WINDOWS_SSPI;USE_SCHANNEL;CURL_DISABLE_LDAP;USE_ARES;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>