diff options
| author | ted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2009-12-03 16:31:25 +0000 |
|---|---|---|
| committer | ted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2009-12-03 16:31:25 +0000 |
| commit | 3b9b206b5ff3103e2d9503cbf3c85a2bec18f195 (patch) | |
| tree | e512fb7d8b392fa9390b60ff52bdc58049324373 | |
| parent | remove empty file, leftover from r384 (diff) | |
| download | breakpad-3b9b206b5ff3103e2d9503cbf3c85a2bec18f195.tar.xz | |
issue 336 - Look for libcurl-gnutls in addition to libcurl.so. Patch by Karl Tomlinson <karlt@mozbugz.karlt.net>, r=me
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@435 4c0a9323-5329-0410-9bdc-e9ce6186880e
| -rw-r--r-- | src/common/linux/http_upload.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/common/linux/http_upload.cc b/src/common/linux/http_upload.cc index 8748d117..f0f9a6de 100644 --- a/src/common/linux/http_upload.cc +++ b/src/common/linux/http_upload.cc @@ -69,9 +69,16 @@ bool HTTPUpload::SendRequest(const string &url, void *curl_lib = dlopen("libcurl.so", RTLD_NOW); if (!curl_lib) { + if (error_description != NULL) + *error_description = dlerror(); curl_lib = dlopen("libcurl.so.4", RTLD_NOW); } if (!curl_lib) { + // Debian gives libcurl a different name when it is built against GnuTLS + // instead of OpenSSL. + curl_lib = dlopen("libcurl-gnutls.so.4", RTLD_NOW); + } + if (!curl_lib) { curl_lib = dlopen("libcurl.so.3", RTLD_NOW); } if (!curl_lib) { |