sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libcurl avatar upload works now ;-)

Browse Source
This commit is contained in:
doitux
2009-02-26 21:39:04 +00:00
parent ed3ec99344
commit cc197bbc00
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/transferhelper.cpp
-1
View File
@@ -157,4 +157,3 @@ TransferHelper::GetData()
{ {
return m_data; return m_data;
} }
src/net/common/uploaderthread.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ UploaderThread::Main()
{ {
if (m_uploadInProgress) if (m_uploadInProgress)
{ {
m_uploadInProgress = m_uploadHelper->Process(); m_uploadInProgress = !m_uploadHelper->Process();
} }
if (!m_uploadInProgress) if (!m_uploadInProgress)
@@ -73,7 +73,7 @@ UploaderThread::Main()
if (!data.filename.empty() && data.filesize > 0) if (!data.filename.empty() && data.filesize > 0)
{ {
path filepath(data.filename); path filepath(data.filename);
m_uploadHelper->Init("url" + filepath.leaf(), filepath.file_string().c_str(), "user", "pwd"); m_uploadHelper->Init("url" + filepath.leaf(), filepath.file_string().c_str(), "user", "pw");
m_uploadInProgress = true; m_uploadInProgress = true;
} }
} }
src/net/common/uploadhelper.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ UploadHelper::InternalInit(const string &/*url*/, const string &targetFileName,
// Assume that the following calls never fail. // Assume that the following calls never fail.
curl_easy_setopt(GetData()->curlHandle, CURLOPT_READFUNCTION, readFunction); curl_easy_setopt(GetData()->curlHandle, CURLOPT_READFUNCTION, readFunction);
curl_easy_setopt(GetData()->curlHandle, CURLOPT_READDATA, GetData()->targetFile); curl_easy_setopt(GetData()->curlHandle, CURLOPT_READDATA, GetData()->targetFile);
curl_easy_setopt(GetData()->curlHandle, CURLOPT_INFILESIZE_LARGE, filesize); curl_easy_setopt(GetData()->curlHandle, CURLOPT_INFILESIZE_LARGE, (curl_off_t)filesize);
curl_easy_setopt(GetData()->curlHandle, CURLOPT_USERPWD, GetData()->userCredentials.c_str()); curl_easy_setopt(GetData()->curlHandle, CURLOPT_USERPWD, GetData()->userCredentials.c_str());
curl_easy_setopt(GetData()->curlHandle, CURLOPT_UPLOAD, 1L); curl_easy_setopt(GetData()->curlHandle, CURLOPT_UPLOAD, 1L);
curl_easy_setopt(GetData()->curlHandle, CURLOPT_PUT, 1L); curl_easy_setopt(GetData()->curlHandle, CURLOPT_PUT, 1L);