Browse Source

Disable threaded-resolver and pthreads in cURL. Enable verbose.

tags/v2.0.0
Andrew Belt 3 years ago
parent
commit
fecd8a5cf9
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      dep/Makefile
  2. +2
    -2
      src/network.cpp

+ 1
- 1
dep/Makefile View File

@@ -131,7 +131,7 @@ curl-7.79.1:
rm curl-7.79.1.tar.gz rm curl-7.79.1.tar.gz


CURL_FLAGS += --enable-symbol-hiding --enable-shared=no CURL_FLAGS += --enable-symbol-hiding --enable-shared=no
CURL_FLAGS += --enable-http --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --enable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-mqtt --disable-manual --enable-threaded-resolver --enable-pthreads --disable-verbose --disable-sspi --disable-ntlm --disable-ntlm-wb --disable-tls-srp --disable-unix-sockets --disable-doh --disable-mime --disable-dateparse --disable-netrc --disable-progress-meter --disable-alt-svc
CURL_FLAGS += --enable-http --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --enable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-mqtt --disable-manual --disable-threaded-resolver --disable-pthreads --enable-verbose --disable-sspi --disable-ntlm --disable-ntlm-wb --disable-tls-srp --disable-unix-sockets --disable-doh --disable-mime --disable-dateparse --disable-netrc --disable-progress-meter --disable-alt-svc
CURL_FLAGS += --without-hyper --without-zlib --without-brotli --without-zstd --without-libpsl --without-libgsasl --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 --without-ngtcp2 --without-nghttp3 --without-quiche CURL_FLAGS += --without-hyper --without-zlib --without-brotli --without-zstd --without-libpsl --without-libgsasl --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 --without-ngtcp2 --without-nghttp3 --without-quiche
CURL_FLAGS += --with-ssl="$(DEP_PATH)" CURL_FLAGS += --with-ssl="$(DEP_PATH)"




+ 2
- 2
src/network.cpp View File

@@ -22,7 +22,7 @@ static CURL* createCurl() {
CURL* curl = curl_easy_init(); CURL* curl = curl_easy_init();
assert(curl); assert(curl);


// curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true);
// 15 second timeout for requests // 15 second timeout for requests
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 15); curl_easy_setopt(curl, CURLOPT_TIMEOUT, 15);
@@ -214,7 +214,7 @@ bool requestDownload(const std::string& url, const std::string& filename, float*




std::string encodeUrl(const std::string& s) { std::string encodeUrl(const std::string& s) {
CURL* curl = curl_easy_init();
CURL* curl = createCurl();
DEFER({curl_easy_cleanup(curl);}); DEFER({curl_easy_cleanup(curl);});
assert(curl); assert(curl);
char* escaped = curl_easy_escape(curl, s.c_str(), s.size()); char* escaped = curl_easy_escape(curl, s.c_str(), s.size());


Loading…
Cancel
Save