1
0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00

curl: update from 7.79.1 to 7.82.0

This commit is contained in:
Megamouse 2022-04-23 21:03:58 +02:00
parent bfd10d7b06
commit b7c1750485
3 changed files with 26 additions and 42 deletions

2
3rdparty/curl/curl vendored

@ -1 +1 @@
Subproject commit c7aef0a945f9b6fb6d3f91716a21dfe2f4ea635f Subproject commit 64db5c575d9c5536bd273a890f50777ad1ca7c13

View File

@ -44,7 +44,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>curl\include;curl\lib;extra;$(SolutionDir)3rdparty\wolfssl\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\extra\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>curl\include;curl\lib;extra;$(SolutionDir)3rdparty\wolfssl\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\wolfssl;$(SolutionDir)3rdparty\wolfssl\extra\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_SNI;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WOLFSSL;WOLFSSL_USER_SETTINGS;USE_IPV6;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>HAVE_SNI;NDEBUG;BUILDING_LIBCURL;CURL_STATICLIB;USE_WOLFSSL;NO_MD4;WOLFSSL_USER_SETTINGS;USE_IPV6;SIZEOF_LONG=4;SIZEOF_LONG_LONG=8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
@ -104,10 +104,10 @@
<ClCompile Include="curl\lib\getenv.c" /> <ClCompile Include="curl\lib\getenv.c" />
<ClCompile Include="curl\lib\getinfo.c" /> <ClCompile Include="curl\lib\getinfo.c" />
<ClCompile Include="curl\lib\gopher.c" /> <ClCompile Include="curl\lib\gopher.c" />
<ClCompile Include="curl\lib\h2h3.c" />
<ClCompile Include="curl\lib\hash.c" /> <ClCompile Include="curl\lib\hash.c" />
<ClCompile Include="curl\lib\hmac.c" /> <ClCompile Include="curl\lib\hmac.c" />
<ClCompile Include="curl\lib\hostasyn.c" /> <ClCompile Include="curl\lib\hostasyn.c" />
<ClCompile Include="curl\lib\hostcheck.c" />
<ClCompile Include="curl\lib\hostip.c" /> <ClCompile Include="curl\lib\hostip.c" />
<ClCompile Include="curl\lib\hostip4.c" /> <ClCompile Include="curl\lib\hostip4.c" />
<ClCompile Include="curl\lib\hostip6.c" /> <ClCompile Include="curl\lib\hostip6.c" />
@ -137,10 +137,7 @@
<ClCompile Include="curl\lib\mqtt.c" /> <ClCompile Include="curl\lib\mqtt.c" />
<ClCompile Include="curl\lib\multi.c" /> <ClCompile Include="curl\lib\multi.c" />
<ClCompile Include="curl\lib\netrc.c" /> <ClCompile Include="curl\lib\netrc.c" />
<ClCompile Include="curl\lib\non-ascii.c" />
<ClCompile Include="curl\lib\nonblock.c" /> <ClCompile Include="curl\lib\nonblock.c" />
<ClCompile Include="curl\lib\nwlib.c" />
<ClCompile Include="curl\lib\nwos.c" />
<ClCompile Include="curl\lib\openldap.c" /> <ClCompile Include="curl\lib\openldap.c" />
<ClCompile Include="curl\lib\parsedate.c" /> <ClCompile Include="curl\lib\parsedate.c" />
<ClCompile Include="curl\lib\pingpong.c" /> <ClCompile Include="curl\lib\pingpong.c" />
@ -179,10 +176,11 @@
<ClCompile Include="curl\lib\vauth\gsasl.c" /> <ClCompile Include="curl\lib\vauth\gsasl.c" />
<ClCompile Include="curl\lib\version.c" /> <ClCompile Include="curl\lib\version.c" />
<ClCompile Include="curl\lib\version_win32.c" /> <ClCompile Include="curl\lib\version_win32.c" />
<ClCompile Include="curl\lib\vtls\hostcheck.c" />
<ClCompile Include="curl\lib\vtls\rustls.c" /> <ClCompile Include="curl\lib\vtls\rustls.c" />
<ClCompile Include="curl\lib\vtls\x509asn1.c" />
<ClCompile Include="curl\lib\warnless.c" /> <ClCompile Include="curl\lib\warnless.c" />
<ClCompile Include="curl\lib\wildcard.c" /> <ClCompile Include="curl\lib\wildcard.c" />
<ClCompile Include="curl\lib\x509asn1.c" />
<ClCompile Include="curl\lib\vauth\cleartext.c" /> <ClCompile Include="curl\lib\vauth\cleartext.c" />
<ClCompile Include="curl\lib\vauth\cram.c" /> <ClCompile Include="curl\lib\vauth\cram.c" />
<ClCompile Include="curl\lib\vauth\digest.c" /> <ClCompile Include="curl\lib\vauth\digest.c" />
@ -207,7 +205,6 @@
<ClCompile Include="curl\lib\vtls\keylog.c" /> <ClCompile Include="curl\lib\vtls\keylog.c" />
<ClCompile Include="curl\lib\vtls\mbedtls.c" /> <ClCompile Include="curl\lib\vtls\mbedtls.c" />
<ClCompile Include="curl\lib\vtls\mbedtls_threadlock.c" /> <ClCompile Include="curl\lib\vtls\mbedtls_threadlock.c" />
<ClCompile Include="curl\lib\vtls\mesalink.c" />
<ClCompile Include="curl\lib\vtls\nss.c" /> <ClCompile Include="curl\lib\vtls\nss.c" />
<ClCompile Include="curl\lib\vtls\openssl.c" /> <ClCompile Include="curl\lib\vtls\openssl.c" />
<ClCompile Include="curl\lib\vtls\schannel.c" /> <ClCompile Include="curl\lib\vtls\schannel.c" />
@ -292,8 +289,8 @@
<ClInclude Include="curl\lib\ftplistparser.h" /> <ClInclude Include="curl\lib\ftplistparser.h" />
<ClInclude Include="curl\lib\getinfo.h" /> <ClInclude Include="curl\lib\getinfo.h" />
<ClInclude Include="curl\lib\gopher.h" /> <ClInclude Include="curl\lib\gopher.h" />
<ClInclude Include="curl\lib\h2h3.h" />
<ClInclude Include="curl\lib\hash.h" /> <ClInclude Include="curl\lib\hash.h" />
<ClInclude Include="curl\lib\hostcheck.h" />
<ClInclude Include="curl\lib\hostip.h" /> <ClInclude Include="curl\lib\hostip.h" />
<ClInclude Include="curl\lib\hsts.h" /> <ClInclude Include="curl\lib\hsts.h" />
<ClInclude Include="curl\lib\http.h" /> <ClInclude Include="curl\lib\http.h" />
@ -315,7 +312,6 @@
<ClInclude Include="curl\lib\multihandle.h" /> <ClInclude Include="curl\lib\multihandle.h" />
<ClInclude Include="curl\lib\multiif.h" /> <ClInclude Include="curl\lib\multiif.h" />
<ClInclude Include="curl\lib\netrc.h" /> <ClInclude Include="curl\lib\netrc.h" />
<ClInclude Include="curl\lib\non-ascii.h" />
<ClInclude Include="curl\lib\nonblock.h" /> <ClInclude Include="curl\lib\nonblock.h" />
<ClInclude Include="curl\lib\parsedate.h" /> <ClInclude Include="curl\lib\parsedate.h" />
<ClInclude Include="curl\lib\pingpong.h" /> <ClInclude Include="curl\lib\pingpong.h" />
@ -356,10 +352,11 @@
<ClInclude Include="curl\lib\urlapi-int.h" /> <ClInclude Include="curl\lib\urlapi-int.h" />
<ClInclude Include="curl\lib\urldata.h" /> <ClInclude Include="curl\lib\urldata.h" />
<ClInclude Include="curl\lib\version_win32.h" /> <ClInclude Include="curl\lib\version_win32.h" />
<ClInclude Include="curl\lib\vtls\hostcheck.h" />
<ClInclude Include="curl\lib\vtls\rustls.h" /> <ClInclude Include="curl\lib\vtls\rustls.h" />
<ClInclude Include="curl\lib\vtls\x509asn1.h" />
<ClInclude Include="curl\lib\warnless.h" /> <ClInclude Include="curl\lib\warnless.h" />
<ClInclude Include="curl\lib\wildcard.h" /> <ClInclude Include="curl\lib\wildcard.h" />
<ClInclude Include="curl\lib\x509asn1.h" />
<ClInclude Include="curl\lib\vauth\digest.h" /> <ClInclude Include="curl\lib\vauth\digest.h" />
<ClInclude Include="curl\lib\vauth\ntlm.h" /> <ClInclude Include="curl\lib\vauth\ntlm.h" />
<ClInclude Include="curl\lib\vauth\vauth.h" /> <ClInclude Include="curl\lib\vauth\vauth.h" />
@ -374,7 +371,6 @@
<ClInclude Include="curl\lib\vtls\keylog.h" /> <ClInclude Include="curl\lib\vtls\keylog.h" />
<ClInclude Include="curl\lib\vtls\mbedtls.h" /> <ClInclude Include="curl\lib\vtls\mbedtls.h" />
<ClInclude Include="curl\lib\vtls\mbedtls_threadlock.h" /> <ClInclude Include="curl\lib\vtls\mbedtls_threadlock.h" />
<ClInclude Include="curl\lib\vtls\mesalink.h" />
<ClInclude Include="curl\lib\vtls\nssg.h" /> <ClInclude Include="curl\lib\vtls\nssg.h" />
<ClInclude Include="curl\lib\vtls\openssl.h" /> <ClInclude Include="curl\lib\vtls\openssl.h" />
<ClInclude Include="curl\lib\vtls\schannel.h" /> <ClInclude Include="curl\lib\vtls\schannel.h" />

View File

@ -147,9 +147,6 @@
<ClCompile Include="curl\lib\hostasyn.c"> <ClCompile Include="curl\lib\hostasyn.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="curl\lib\hostcheck.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="curl\lib\hostip.c"> <ClCompile Include="curl\lib\hostip.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -228,18 +225,9 @@
<ClCompile Include="curl\lib\netrc.c"> <ClCompile Include="curl\lib\netrc.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="curl\lib\non-ascii.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="curl\lib\nonblock.c"> <ClCompile Include="curl\lib\nonblock.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="curl\lib\nwlib.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="curl\lib\nwos.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="curl\lib\openldap.c"> <ClCompile Include="curl\lib\openldap.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -354,9 +342,6 @@
<ClCompile Include="curl\lib\wildcard.c"> <ClCompile Include="curl\lib\wildcard.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="curl\lib\x509asn1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="curl\lib\vauth\cleartext.c"> <ClCompile Include="curl\lib\vauth\cleartext.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -423,9 +408,6 @@
<ClCompile Include="curl\lib\vtls\mbedtls_threadlock.c"> <ClCompile Include="curl\lib\vtls\mbedtls_threadlock.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="curl\lib\vtls\mesalink.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="curl\lib\vtls\nss.c"> <ClCompile Include="curl\lib\vtls\nss.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -483,6 +465,15 @@
<ClCompile Include="curl\lib\vauth\gsasl.c"> <ClCompile Include="curl\lib\vauth\gsasl.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="curl\lib\h2h3.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="curl\lib\vtls\hostcheck.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="curl\lib\vtls\x509asn1.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="curl\include\curl\curl.h"> <ClInclude Include="curl\include\curl\curl.h">
@ -701,9 +692,6 @@
<ClInclude Include="curl\lib\hash.h"> <ClInclude Include="curl\lib\hash.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="curl\lib\hostcheck.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="curl\lib\hostip.h"> <ClInclude Include="curl\lib\hostip.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -758,9 +746,6 @@
<ClInclude Include="curl\lib\netrc.h"> <ClInclude Include="curl\lib\netrc.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="curl\lib\non-ascii.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="curl\lib\nonblock.h"> <ClInclude Include="curl\lib\nonblock.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -881,9 +866,6 @@
<ClInclude Include="curl\lib\wildcard.h"> <ClInclude Include="curl\lib\wildcard.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="curl\lib\x509asn1.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="curl\lib\vauth\digest.h"> <ClInclude Include="curl\lib\vauth\digest.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -920,9 +902,6 @@
<ClInclude Include="curl\lib\vtls\mbedtls_threadlock.h"> <ClInclude Include="curl\lib\vtls\mbedtls_threadlock.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="curl\lib\vtls\mesalink.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="curl\lib\vtls\nssg.h"> <ClInclude Include="curl\lib\vtls\nssg.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -977,6 +956,15 @@
<ClInclude Include="curl\lib\vtls\rustls.h"> <ClInclude Include="curl\lib\vtls\rustls.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="curl\lib\h2h3.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="curl\lib\vtls\hostcheck.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="curl\lib\vtls\x509asn1.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="curl\lib\libcurl.rc"> <ResourceCompile Include="curl\lib\libcurl.rc">