Merge pull request #3902 from stefansaraev/curl-5.0

#3887 for openelec-5.0 branch
This commit is contained in:
Peter Frühberger 2015-02-11 15:48:32 +01:00
commit c860c46d79
2 changed files with 1 additions and 24 deletions

View File

@ -1,23 +0,0 @@
From 3eec72d4fd109e9f153a375138c1a997bcf86d9a Mon Sep 17 00:00:00 2001
From: wsnipex <wsnipex@a1.net>
Date: Sun, 8 Feb 2015 14:15:49 +0100
Subject: [PATCH] [curl] don't return 0 in the write callback, it causes ftp
content lenght requests to fail
---
xbmc/filesystem/CurlFile.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
index 7d68dab..e67d951 100644
--- a/xbmc/filesystem/CurlFile.cpp
+++ b/xbmc/filesystem/CurlFile.cpp
@@ -100,7 +100,7 @@ extern "C" size_t write_callback(char *buffer,
size_t nitems,
void *userp)
{
- if(userp == NULL) return 0;
+ if(userp == NULL) return size * nitems;
CCurlFile::CReadState *state = (CCurlFile::CReadState *)userp;
return state->WriteCallback(buffer, size, nitems);

View File

@ -25,7 +25,7 @@
# there: http://forum.xbmc.org/showthread.php?tid=177557
PKG_NAME="curl"
PKG_VERSION="7.40.0"
PKG_VERSION="7.37.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MIT"