| |
@@ -0,0 +1,332 @@
|
| |
+ --- dotnet/src/corefx/src/Native/Unix/System.Net.Http.Native/pal_versioninfo.cpp.orig 2018-04-23 18:51:04.400019840 -0400
|
| |
+ +++ dotnet/src/corefx/src/Native/Unix/System.Net.Http.Native/pal_versioninfo.cpp 2018-04-23 18:58:50.057184551 -0400
|
| |
+ @@ -8,36 +8,36 @@
|
| |
+ #include <string.h>
|
| |
+ #include <curl/curl.h>
|
| |
+
|
| |
+ -static_assert(PAL_CURL_VERSION_IPV6 == CURL_VERSION_IPV6, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_KERBEROS4 == CURL_VERSION_KERBEROS4, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_SSL == CURL_VERSION_SSL, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_LIBZ == CURL_VERSION_LIBZ, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_NTLM == CURL_VERSION_NTLM, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_GSSNEGOTIATE == CURL_VERSION_GSSNEGOTIATE, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_DEBUG == CURL_VERSION_DEBUG, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_ASYNCHDNS == CURL_VERSION_ASYNCHDNS, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_SPNEGO == CURL_VERSION_SPNEGO, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_LARGEFILE == CURL_VERSION_LARGEFILE, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_IDN == CURL_VERSION_IDN, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_SSPI == CURL_VERSION_SSPI, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_CONV == CURL_VERSION_CONV, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_CURLDEBUG == CURL_VERSION_CURLDEBUG, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_TLSAUTH_SRP == CURL_VERSION_TLSAUTH_SRP, "");
|
| |
+ -static_assert(PAL_CURL_VERSION_NTLM_WB == CURL_VERSION_NTLM_WB, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_IPV6 == CURL_VERSION_IPV6, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_KERBEROS4 == CURL_VERSION_KERBEROS4, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_SSL == CURL_VERSION_SSL, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_LIBZ == CURL_VERSION_LIBZ, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_NTLM == CURL_VERSION_NTLM, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_GSSNEGOTIATE == CURL_VERSION_GSSNEGOTIATE, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_DEBUG == CURL_VERSION_DEBUG, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_ASYNCHDNS == CURL_VERSION_ASYNCHDNS, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_SPNEGO == CURL_VERSION_SPNEGO, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_LARGEFILE == CURL_VERSION_LARGEFILE, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_IDN == CURL_VERSION_IDN, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_SSPI == CURL_VERSION_SSPI, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_CONV == CURL_VERSION_CONV, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_CURLDEBUG == CURL_VERSION_CURLDEBUG, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_TLSAUTH_SRP == CURL_VERSION_TLSAUTH_SRP, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_NTLM_WB == CURL_VERSION_NTLM_WB, "");
|
| |
+ #ifdef CURL_VERSION_HTTP2
|
| |
+ -static_assert(PAL_CURL_VERSION_HTTP2 == CURL_VERSION_HTTP2, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_HTTP2 == CURL_VERSION_HTTP2, "");
|
| |
+ #endif
|
| |
+ #ifdef CURL_VERSION_GSSAPI
|
| |
+ -static_assert(PAL_CURL_VERSION_GSSAPI == CURL_VERSION_GSSAPI, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_GSSAPI == CURL_VERSION_GSSAPI, "");
|
| |
+ #endif
|
| |
+ #ifdef CURL_VERSION_KERBEROS5
|
| |
+ -static_assert(PAL_CURL_VERSION_KERBEROS5 == CURL_VERSION_KERBEROS5, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_KERBEROS5 == CURL_VERSION_KERBEROS5, "");
|
| |
+ #endif
|
| |
+ #ifdef CURL_VERSION_UNIX_SOCKETS
|
| |
+ -static_assert(PAL_CURL_VERSION_UNIX_SOCKETS == CURL_VERSION_UNIX_SOCKETS, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_UNIX_SOCKETS == CURL_VERSION_UNIX_SOCKETS, "");
|
| |
+ #endif
|
| |
+ #ifdef CURL_VERSION_PSL
|
| |
+ -static_assert(PAL_CURL_VERSION_PSL == CURL_VERSION_PSL, "");
|
| |
+ +static_assert((int)PAL_CURL_VERSION_PSL == CURL_VERSION_PSL, "");
|
| |
+ #endif
|
| |
+
|
| |
+ // Based on docs/libcurl/symbols-in-versions in libcurl source tree,
|
| |
+ --- dotnet-2.0.7/src/corefx/src/Native/Unix/System.Net.Http.Native/pal_multi.cpp.orig 2018-04-20 11:02:33.000000000 -0400
|
| |
+ +++ dotnet-2.0.7/src/corefx/src/Native/Unix/System.Net.Http.Native/pal_multi.cpp 2018-04-23 19:00:48.579717419 -0400
|
| |
+ @@ -9,26 +9,26 @@
|
| |
+ #include <assert.h>
|
| |
+ #include <poll.h>
|
| |
+
|
| |
+ -static_assert(PAL_CURLM_CALL_MULTI_PERFORM == CURLM_CALL_MULTI_PERFORM, "");
|
| |
+ -static_assert(PAL_CURLM_OK == CURLM_OK, "");
|
| |
+ -static_assert(PAL_CURLM_BAD_HANDLE == CURLM_BAD_HANDLE, "");
|
| |
+ -static_assert(PAL_CURLM_BAD_EASY_HANDLE == CURLM_BAD_EASY_HANDLE, "");
|
| |
+ -static_assert(PAL_CURLM_OUT_OF_MEMORY == CURLM_OUT_OF_MEMORY, "");
|
| |
+ -static_assert(PAL_CURLM_INTERNAL_ERROR == CURLM_INTERNAL_ERROR, "");
|
| |
+ -static_assert(PAL_CURLM_BAD_SOCKET == CURLM_BAD_SOCKET, "");
|
| |
+ -static_assert(PAL_CURLM_UNKNOWN_OPTION == CURLM_UNKNOWN_OPTION, "");
|
| |
+ +static_assert((int)PAL_CURLM_CALL_MULTI_PERFORM == CURLM_CALL_MULTI_PERFORM, "");
|
| |
+ +static_assert((int)PAL_CURLM_OK == CURLM_OK, "");
|
| |
+ +static_assert((int)PAL_CURLM_BAD_HANDLE == CURLM_BAD_HANDLE, "");
|
| |
+ +static_assert((int)PAL_CURLM_BAD_EASY_HANDLE == CURLM_BAD_EASY_HANDLE, "");
|
| |
+ +static_assert((int)PAL_CURLM_OUT_OF_MEMORY == CURLM_OUT_OF_MEMORY, "");
|
| |
+ +static_assert((int)PAL_CURLM_INTERNAL_ERROR == CURLM_INTERNAL_ERROR, "");
|
| |
+ +static_assert((int)PAL_CURLM_BAD_SOCKET == CURLM_BAD_SOCKET, "");
|
| |
+ +static_assert((int)PAL_CURLM_UNKNOWN_OPTION == CURLM_UNKNOWN_OPTION, "");
|
| |
+ #if HAVE_CURLM_ADDED_ALREADY
|
| |
+ -static_assert(PAL_CURLM_ADDED_ALREADY == CURLM_ADDED_ALREADY, "");
|
| |
+ +static_assert((int)PAL_CURLM_ADDED_ALREADY == CURLM_ADDED_ALREADY, "");
|
| |
+ #endif
|
| |
+ -static_assert(PAL_CURLMOPT_PIPELINING == CURLMOPT_PIPELINING, "");
|
| |
+ +static_assert((int)PAL_CURLMOPT_PIPELINING == CURLMOPT_PIPELINING, "");
|
| |
+ #ifdef CURLMOPT_MAX_HOST_CONNECTIONS
|
| |
+ -static_assert(PAL_CURLMOPT_MAX_HOST_CONNECTIONS == CURLMOPT_MAX_HOST_CONNECTIONS, "");
|
| |
+ +static_assert((int)PAL_CURLMOPT_MAX_HOST_CONNECTIONS == CURLMOPT_MAX_HOST_CONNECTIONS, "");
|
| |
+ #endif
|
| |
+ #if HAVE_CURLPIPE_MULTIPLEX
|
| |
+ -static_assert(PAL_CURLPIPE_MULTIPLEX == CURLPIPE_MULTIPLEX, "");
|
| |
+ +static_assert((int)PAL_CURLPIPE_MULTIPLEX == CURLPIPE_MULTIPLEX, "");
|
| |
+ #endif
|
| |
+
|
| |
+ -static_assert(PAL_CURLMSG_DONE == CURLMSG_DONE, "");
|
| |
+ +static_assert((int)PAL_CURLMSG_DONE == CURLMSG_DONE, "");
|
| |
+
|
| |
+ extern "C" CURLM* HttpNative_MultiCreate()
|
| |
+ {
|
| |
+ --- dotnet-2.0.7/src/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.cpp.orig 2018-04-20 11:02:33.000000000 -0400
|
| |
+ +++ dotnet-2.0.7/src/corefx/src/Native/Unix/System.Net.Http.Native/pal_easy.cpp 2018-04-23 19:04:08.769928413 -0400
|
| |
+ @@ -8,102 +8,102 @@
|
| |
+ #include <assert.h>
|
| |
+ #include <memory>
|
| |
+
|
| |
+ -static_assert(PAL_CURLOPT_INFILESIZE == CURLOPT_INFILESIZE, "");
|
| |
+ -static_assert(PAL_CURLOPT_SSLVERSION == CURLOPT_SSLVERSION, "");
|
| |
+ -static_assert(PAL_CURLOPT_VERBOSE == CURLOPT_VERBOSE, "");
|
| |
+ -static_assert(PAL_CURLOPT_NOBODY == CURLOPT_NOBODY, "");
|
| |
+ -static_assert(PAL_CURLOPT_UPLOAD == CURLOPT_UPLOAD, "");
|
| |
+ -static_assert(PAL_CURLOPT_POST == CURLOPT_POST, "");
|
| |
+ -static_assert(PAL_CURLOPT_FOLLOWLOCATION == CURLOPT_FOLLOWLOCATION, "");
|
| |
+ -static_assert(PAL_CURLOPT_PROXYPORT == CURLOPT_PROXYPORT, "");
|
| |
+ -static_assert(PAL_CURLOPT_POSTFIELDSIZE == CURLOPT_POSTFIELDSIZE, "");
|
| |
+ -static_assert(PAL_CURLOPT_SSL_VERIFYPEER == CURLOPT_SSL_VERIFYPEER, "");
|
| |
+ -static_assert(PAL_CURLOPT_MAXREDIRS == CURLOPT_MAXREDIRS, "");
|
| |
+ -static_assert(PAL_CURLOPT_SSL_VERIFYHOST == CURLOPT_SSL_VERIFYHOST, "");
|
| |
+ -static_assert(PAL_CURLOPT_HTTP_VERSION == CURLOPT_HTTP_VERSION, "");
|
| |
+ -static_assert(PAL_CURLOPT_DNS_CACHE_TIMEOUT == CURLOPT_DNS_CACHE_TIMEOUT, "");
|
| |
+ -static_assert(PAL_CURLOPT_NOSIGNAL == CURLOPT_NOSIGNAL, "");
|
| |
+ -static_assert(PAL_CURLOPT_PROXYTYPE == CURLOPT_PROXYTYPE, "");
|
| |
+ -static_assert(PAL_CURLOPT_HTTPAUTH == CURLOPT_HTTPAUTH, "");
|
| |
+ -static_assert(PAL_CURLOPT_TCP_NODELAY == CURLOPT_TCP_NODELAY, "");
|
| |
+ -static_assert(PAL_CURLOPT_CONNECTTIMEOUT_MS == CURLOPT_CONNECTTIMEOUT_MS, "");
|
| |
+ -static_assert(PAL_CURLOPT_ADDRESS_SCOPE == CURLOPT_ADDRESS_SCOPE, "");
|
| |
+ -static_assert(PAL_CURLOPT_PROTOCOLS == CURLOPT_PROTOCOLS, "");
|
| |
+ -static_assert(PAL_CURLOPT_REDIR_PROTOCOLS == CURLOPT_REDIR_PROTOCOLS, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURLOPT_URL == CURLOPT_URL, "");
|
| |
+ -static_assert(PAL_CURLOPT_PROXY == CURLOPT_PROXY, "");
|
| |
+ -static_assert(PAL_CURLOPT_PROXYUSERPWD == CURLOPT_PROXYUSERPWD, "");
|
| |
+ -static_assert(PAL_CURLOPT_COOKIE == CURLOPT_COOKIE, "");
|
| |
+ -static_assert(PAL_CURLOPT_HTTPHEADER == CURLOPT_HTTPHEADER, "");
|
| |
+ -static_assert(PAL_CURLOPT_CUSTOMREQUEST == CURLOPT_CUSTOMREQUEST, "");
|
| |
+ -static_assert(PAL_CURLOPT_ACCEPT_ENCODING == CURLOPT_ACCEPT_ENCODING, "");
|
| |
+ -static_assert(PAL_CURLOPT_PRIVATE == CURLOPT_PRIVATE, "");
|
| |
+ -static_assert(PAL_CURLOPT_COPYPOSTFIELDS == CURLOPT_COPYPOSTFIELDS, "");
|
| |
+ -static_assert(PAL_CURLOPT_USERNAME == CURLOPT_USERNAME, "");
|
| |
+ -static_assert(PAL_CURLOPT_PASSWORD == CURLOPT_PASSWORD, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURLOPT_INFILESIZE_LARGE == CURLOPT_INFILESIZE_LARGE, "");
|
| |
+ -static_assert(PAL_CURLOPT_POSTFIELDSIZE_LARGE == CURLOPT_POSTFIELDSIZE_LARGE, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURLE_OK == CURLE_OK, "");
|
| |
+ -static_assert(PAL_CURLE_UNSUPPORTED_PROTOCOL == CURLE_UNSUPPORTED_PROTOCOL, "");
|
| |
+ -static_assert(PAL_CURLE_FAILED_INIT == CURLE_FAILED_INIT, "");
|
| |
+ -static_assert(PAL_CURLE_NOT_BUILT_IN == CURLE_NOT_BUILT_IN, "");
|
| |
+ -static_assert(PAL_CURLE_COULDNT_RESOLVE_HOST == CURLE_COULDNT_RESOLVE_HOST, "");
|
| |
+ -static_assert(PAL_CURLE_OUT_OF_MEMORY == CURLE_OUT_OF_MEMORY, "");
|
| |
+ -static_assert(PAL_CURLE_OPERATION_TIMEDOUT == CURLE_OPERATION_TIMEDOUT, "");
|
| |
+ -static_assert(PAL_CURLE_ABORTED_BY_CALLBACK == CURLE_ABORTED_BY_CALLBACK, "");
|
| |
+ -static_assert(PAL_CURLE_UNKNOWN_OPTION == CURLE_UNKNOWN_OPTION, "");
|
| |
+ -static_assert(PAL_CURLE_RECV_ERROR == CURLE_RECV_ERROR, "");
|
| |
+ -static_assert(PAL_CURLE_SEND_FAIL_REWIND == CURLE_SEND_FAIL_REWIND, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURL_HTTP_VERSION_NONE == CURL_HTTP_VERSION_NONE, "");
|
| |
+ -static_assert(PAL_CURL_HTTP_VERSION_1_0 == CURL_HTTP_VERSION_1_0, "");
|
| |
+ -static_assert(PAL_CURL_HTTP_VERSION_1_1 == CURL_HTTP_VERSION_1_1, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_INFILESIZE == CURLOPT_INFILESIZE, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_SSLVERSION == CURLOPT_SSLVERSION, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_VERBOSE == CURLOPT_VERBOSE, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_NOBODY == CURLOPT_NOBODY, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_UPLOAD == CURLOPT_UPLOAD, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_POST == CURLOPT_POST, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_FOLLOWLOCATION == CURLOPT_FOLLOWLOCATION, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_PROXYPORT == CURLOPT_PROXYPORT, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_POSTFIELDSIZE == CURLOPT_POSTFIELDSIZE, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_SSL_VERIFYPEER == CURLOPT_SSL_VERIFYPEER, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_MAXREDIRS == CURLOPT_MAXREDIRS, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_SSL_VERIFYHOST == CURLOPT_SSL_VERIFYHOST, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_HTTP_VERSION == CURLOPT_HTTP_VERSION, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_DNS_CACHE_TIMEOUT == CURLOPT_DNS_CACHE_TIMEOUT, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_NOSIGNAL == CURLOPT_NOSIGNAL, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_PROXYTYPE == CURLOPT_PROXYTYPE, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_HTTPAUTH == CURLOPT_HTTPAUTH, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_TCP_NODELAY == CURLOPT_TCP_NODELAY, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_CONNECTTIMEOUT_MS == CURLOPT_CONNECTTIMEOUT_MS, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_ADDRESS_SCOPE == CURLOPT_ADDRESS_SCOPE, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_PROTOCOLS == CURLOPT_PROTOCOLS, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_REDIR_PROTOCOLS == CURLOPT_REDIR_PROTOCOLS, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURLOPT_URL == CURLOPT_URL, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_PROXY == CURLOPT_PROXY, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_PROXYUSERPWD == CURLOPT_PROXYUSERPWD, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_COOKIE == CURLOPT_COOKIE, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_HTTPHEADER == CURLOPT_HTTPHEADER, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_CUSTOMREQUEST == CURLOPT_CUSTOMREQUEST, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_ACCEPT_ENCODING == CURLOPT_ACCEPT_ENCODING, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_PRIVATE == CURLOPT_PRIVATE, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_COPYPOSTFIELDS == CURLOPT_COPYPOSTFIELDS, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_USERNAME == CURLOPT_USERNAME, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_PASSWORD == CURLOPT_PASSWORD, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURLOPT_INFILESIZE_LARGE == CURLOPT_INFILESIZE_LARGE, "");
|
| |
+ +static_assert((int)PAL_CURLOPT_POSTFIELDSIZE_LARGE == CURLOPT_POSTFIELDSIZE_LARGE, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURLE_OK == CURLE_OK, "");
|
| |
+ +static_assert((int)PAL_CURLE_UNSUPPORTED_PROTOCOL == CURLE_UNSUPPORTED_PROTOCOL, "");
|
| |
+ +static_assert((int)PAL_CURLE_FAILED_INIT == CURLE_FAILED_INIT, "");
|
| |
+ +static_assert((int)PAL_CURLE_NOT_BUILT_IN == CURLE_NOT_BUILT_IN, "");
|
| |
+ +static_assert((int)PAL_CURLE_COULDNT_RESOLVE_HOST == CURLE_COULDNT_RESOLVE_HOST, "");
|
| |
+ +static_assert((int)PAL_CURLE_OUT_OF_MEMORY == CURLE_OUT_OF_MEMORY, "");
|
| |
+ +static_assert((int)PAL_CURLE_OPERATION_TIMEDOUT == CURLE_OPERATION_TIMEDOUT, "");
|
| |
+ +static_assert((int)PAL_CURLE_ABORTED_BY_CALLBACK == CURLE_ABORTED_BY_CALLBACK, "");
|
| |
+ +static_assert((int)PAL_CURLE_UNKNOWN_OPTION == CURLE_UNKNOWN_OPTION, "");
|
| |
+ +static_assert((int)PAL_CURLE_RECV_ERROR == CURLE_RECV_ERROR, "");
|
| |
+ +static_assert((int)PAL_CURLE_SEND_FAIL_REWIND == CURLE_SEND_FAIL_REWIND, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURL_HTTP_VERSION_NONE == CURL_HTTP_VERSION_NONE, "");
|
| |
+ +static_assert((int)PAL_CURL_HTTP_VERSION_1_0 == CURL_HTTP_VERSION_1_0, "");
|
| |
+ +static_assert((int)PAL_CURL_HTTP_VERSION_1_1 == CURL_HTTP_VERSION_1_1, "");
|
| |
+ #if HAVE_CURL_HTTP_VERSION_2_0
|
| |
+ -static_assert(PAL_CURL_HTTP_VERSION_2_0 == CURL_HTTP_VERSION_2_0, "");
|
| |
+ +static_assert((int)PAL_CURL_HTTP_VERSION_2_0 == CURL_HTTP_VERSION_2_0, "");
|
| |
+ #endif
|
| |
+
|
| |
+ -static_assert(PAL_CURL_SSLVERSION_TLSv1 == CURL_SSLVERSION_TLSv1, "");
|
| |
+ +static_assert((int)PAL_CURL_SSLVERSION_TLSv1 == CURL_SSLVERSION_TLSv1, "");
|
| |
+ #if HAVE_CURL_SSLVERSION_TLSv1_012
|
| |
+ -static_assert(PAL_CURL_SSLVERSION_TLSv1_0 == CURL_SSLVERSION_TLSv1_0, "");
|
| |
+ -static_assert(PAL_CURL_SSLVERSION_TLSv1_1 == CURL_SSLVERSION_TLSv1_1, "");
|
| |
+ -static_assert(PAL_CURL_SSLVERSION_TLSv1_2 == CURL_SSLVERSION_TLSv1_2, "");
|
| |
+ +static_assert((int)PAL_CURL_SSLVERSION_TLSv1_0 == CURL_SSLVERSION_TLSv1_0, "");
|
| |
+ +static_assert((int)PAL_CURL_SSLVERSION_TLSv1_1 == CURL_SSLVERSION_TLSv1_1, "");
|
| |
+ +static_assert((int)PAL_CURL_SSLVERSION_TLSv1_2 == CURL_SSLVERSION_TLSv1_2, "");
|
| |
+ #endif
|
| |
+
|
| |
+ -static_assert(PAL_CURLINFO_EFFECTIVE_URL == CURLINFO_EFFECTIVE_URL, "");
|
| |
+ -static_assert(PAL_CURLINFO_PRIVATE == CURLINFO_PRIVATE, "");
|
| |
+ -static_assert(PAL_CURLINFO_HTTPAUTH_AVAIL == CURLINFO_HTTPAUTH_AVAIL, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURLAUTH_None == CURLAUTH_NONE, "");
|
| |
+ -static_assert(PAL_CURLAUTH_Basic == CURLAUTH_BASIC, "");
|
| |
+ -static_assert(PAL_CURLAUTH_Digest == CURLAUTH_DIGEST, "");
|
| |
+ -static_assert(PAL_CURLAUTH_Negotiate == CURLAUTH_GSSNEGOTIATE, "");
|
| |
+ -static_assert(PAL_CURLAUTH_NTLM == CURLAUTH_NTLM, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURLPROXY_HTTP == CURLPROXY_HTTP, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURLPROTO_HTTP == CURLPROTO_HTTP, "");
|
| |
+ -static_assert(PAL_CURLPROTO_HTTPS == CURLPROTO_HTTPS, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURL_SEEKFUNC_OK == CURL_SEEKFUNC_OK, "");
|
| |
+ -static_assert(PAL_CURL_SEEKFUNC_FAIL == CURL_SEEKFUNC_FAIL, "");
|
| |
+ -static_assert(PAL_CURL_SEEKFUNC_CANTSEEK == CURL_SEEKFUNC_CANTSEEK, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURL_READFUNC_ABORT == CURL_READFUNC_ABORT, "");
|
| |
+ -static_assert(PAL_CURL_READFUNC_PAUSE == CURL_READFUNC_PAUSE, "");
|
| |
+ -static_assert(PAL_CURL_WRITEFUNC_PAUSE == CURL_WRITEFUNC_PAUSE, "");
|
| |
+ -
|
| |
+ -static_assert(PAL_CURLINFO_TEXT == CURLINFO_TEXT, "");
|
| |
+ -static_assert(PAL_CURLINFO_HEADER_IN == CURLINFO_HEADER_IN, "");
|
| |
+ -static_assert(PAL_CURLINFO_HEADER_OUT == CURLINFO_HEADER_OUT, "");
|
| |
+ -static_assert(PAL_CURLINFO_DATA_IN == CURLINFO_DATA_IN, "");
|
| |
+ -static_assert(PAL_CURLINFO_DATA_OUT == CURLINFO_DATA_OUT, "");
|
| |
+ -static_assert(PAL_CURLINFO_SSL_DATA_IN == CURLINFO_SSL_DATA_IN, "");
|
| |
+ -static_assert(PAL_CURLINFO_SSL_DATA_OUT == CURLINFO_SSL_DATA_OUT, "");
|
| |
+ +static_assert((int)PAL_CURLINFO_EFFECTIVE_URL == CURLINFO_EFFECTIVE_URL, "");
|
| |
+ +static_assert((int)PAL_CURLINFO_PRIVATE == CURLINFO_PRIVATE, "");
|
| |
+ +static_assert((int)PAL_CURLINFO_HTTPAUTH_AVAIL == CURLINFO_HTTPAUTH_AVAIL, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURLAUTH_None == CURLAUTH_NONE, "");
|
| |
+ +static_assert((int)PAL_CURLAUTH_Basic == CURLAUTH_BASIC, "");
|
| |
+ +static_assert((int)PAL_CURLAUTH_Digest == CURLAUTH_DIGEST, "");
|
| |
+ +static_assert((int)PAL_CURLAUTH_Negotiate == CURLAUTH_GSSNEGOTIATE, "");
|
| |
+ +static_assert((int)PAL_CURLAUTH_NTLM == CURLAUTH_NTLM, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURLPROXY_HTTP == CURLPROXY_HTTP, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURLPROTO_HTTP == CURLPROTO_HTTP, "");
|
| |
+ +static_assert((int)PAL_CURLPROTO_HTTPS == CURLPROTO_HTTPS, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURL_SEEKFUNC_OK == CURL_SEEKFUNC_OK, "");
|
| |
+ +static_assert((int)PAL_CURL_SEEKFUNC_FAIL == CURL_SEEKFUNC_FAIL, "");
|
| |
+ +static_assert((int)PAL_CURL_SEEKFUNC_CANTSEEK == CURL_SEEKFUNC_CANTSEEK, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURL_READFUNC_ABORT == CURL_READFUNC_ABORT, "");
|
| |
+ +static_assert((int)PAL_CURL_READFUNC_PAUSE == CURL_READFUNC_PAUSE, "");
|
| |
+ +static_assert((int)PAL_CURL_WRITEFUNC_PAUSE == CURL_WRITEFUNC_PAUSE, "");
|
| |
+ +
|
| |
+ +static_assert((int)PAL_CURLINFO_TEXT == CURLINFO_TEXT, "");
|
| |
+ +static_assert((int)PAL_CURLINFO_HEADER_IN == CURLINFO_HEADER_IN, "");
|
| |
+ +static_assert((int)PAL_CURLINFO_HEADER_OUT == CURLINFO_HEADER_OUT, "");
|
| |
+ +static_assert((int)PAL_CURLINFO_DATA_IN == CURLINFO_DATA_IN, "");
|
| |
+ +static_assert((int)PAL_CURLINFO_DATA_OUT == CURLINFO_DATA_OUT, "");
|
| |
+ +static_assert((int)PAL_CURLINFO_SSL_DATA_IN == CURLINFO_SSL_DATA_IN, "");
|
| |
+ +static_assert((int)PAL_CURLINFO_SSL_DATA_OUT == CURLINFO_SSL_DATA_OUT, "");
|
| |
+
|
| |
+ -static_assert(PAL_CURL_MAX_HTTP_HEADER == CURL_MAX_HTTP_HEADER, "");
|
| |
+ +static_assert((int)PAL_CURL_MAX_HTTP_HEADER == CURL_MAX_HTTP_HEADER, "");
|
| |
+
|
| |
+ extern "C" CURL* HttpNative_EasyCreate()
|
| |
+ {
|
| |
+ --- dotnet/src/corefx/src/Native/Unix/CMakeLists.txt 2018-04-24 11:22:53.290510537 -0400
|
| |
+ +++ dotnet/src/corefx/src/Native/Unix/CMakeLists.txt 2018-04-24 11:25:18.883504641 -0400
|
| |
+ @@ -15,11 +15,18 @@
|
| |
+ add_compile_options(-Wno-disabled-macro-expansion)
|
| |
+ add_compile_options(-Wno-c++98-compat)
|
| |
+ add_compile_options(-Wno-c++98-compat-pedantic)
|
| |
+ +add_compile_options(-Wno-padded)
|
| |
+ +add_compile_options(-Wno-empty-translation-unit)
|
| |
+ +add_compile_options(-Wno-old-style-cast)
|
| |
+ +add_compile_options(-Wno-cast-align)
|
| |
+ +add_compile_options(-Wno-typedef-redefinition)
|
| |
+ +add_compile_options(-Wno-unused-local-typedef)
|
| |
+ +add_compile_options(-Wno-c99-extensions)
|
| |
+ +add_compile_options(-Wno-c11-extensions)
|
| |
+ add_compile_options(-Werror)
|
| |
+ add_compile_options(-fPIC)
|
| |
+ add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
|
| |
+ add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
|
| |
+ -add_compile_options(-Wno-c99-extensions)
|
| |
+ add_compile_options(-g)
|
| |
+
|
| |
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
|
| |
+ --- dotnet/src/corefx/src/Native/Unix/System.Native/pal_process.cpp
|
| |
+ +++ dotnet/src/corefx/src/Native/Unix/System.Native/pal_process.cpp
|
| |
+ @@ -367,7 +367,11 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value)
|
| |
+ static rlim_t ConvertFromManagedRLimitInfinityToPalIfNecessary(uint64_t value)
|
| |
+ {
|
| |
+ // rlim_t type can vary per platform, so we also treat anything outside its range as infinite.
|
| |
+ +#pragma clang diagnostic push
|
| |
+ +#pragma clang diagnostic ignored "-Wunknown-pragmas"
|
| |
+ +#pragma clang diagnostic ignored "-Wtautological-type-limit-compare"
|
| |
+ if (value == UINT64_MAX || value > std::numeric_limits<rlim_t>::max())
|
| |
+ +#pragma clang diagnostic pop
|
| |
+ return RLIM_INFINITY;
|
| |
+
|
| |
+ return static_cast<rlim_t>(value);
|
| |
Lets not build this just yet. I will post a separate merge request with the fixes and updates to only build the few needed components in copr, now that we have a 2.1 RPM as well.