diff options
| author | Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> | 2010-03-22 19:14:19 +0000 |
|---|---|---|
| committer | Roberto C. Sanchez <roberto@connexer.com> | 2014-03-29 10:54:04 -0400 |
| commit | c09b33dc22f6b15bb31abd798aa00375773b94d9 (patch) | |
| tree | db8fd550fdd7be4ce2d970622e3420a6c71f2dd5 /debian/patches | |
| parent | c4b77f09da0b4c42d2b19f8b1bf7d7830e59295f (diff) | |
Imported Debian patch 1.6.1+dfsg-2
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/13_curl.diff | 21 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/13_curl.diff b/debian/patches/13_curl.diff new file mode 100644 index 0000000..f0934b6 --- /dev/null +++ b/debian/patches/13_curl.diff @@ -0,0 +1,21 @@ +revno: 2452 +svn revno: 2506 (on /trunk) +committer: scribe +timestamp: Sat 2010-03-20 11:49:54 +0000 +message: + applied Karl's patch to fix libcurl problem with status reporter data. + +Index: sword/src/mgr/curlftpt.cpp +=================================================================== +--- sword.orig/src/mgr/curlftpt.cpp 2010-03-22 18:22:59.045847934 +0000 ++++ sword/src/mgr/curlftpt.cpp 2010-03-22 18:23:02.244846081 +0000 +@@ -177,6 +177,9 @@ + res = curl_easy_perform(session); + SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n"); + ++ // it seems CURL tries to use this option data later for some reason, so we unset here ++ curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL); ++ + if(CURLE_OK != res) { + retVal = -1; + } diff --git a/debian/patches/series b/debian/patches/series index d9bddb8..e0f9d43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 02_libver.diff 12_fix_compiler_warnings.diff +13_curl.diff |