Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 17:13:47 +02:00
Code Issues Projects Releases Wiki Activity

2020-01-10 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed all Qt3Support dependencies from the 'RDUpload' class.
	* Removed all Qt3Support dependencies from the 'RDDownload' class.
	* Added a 'test_download' test harness.
This commit is contained in:
Fred Gleason
2020-01-10 17:06:36 -05:00
parent aa7a2ab01d
commit d32aa115f7
9 changed files with 192 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/rddownload.cpp
View File

@@ -2,7 +2,7 @@
//
// Download a File
//
// (C) Copyright 2010-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -107,7 +107,7 @@ RDDownload::ErrorCode RDDownload::runDownload(const QString &username,
long response_code=0;
RDDownload::ErrorCode ret=RDDownload::ErrorOk;
RDSystemUser *user=NULL;
char url[1024];
// char url[1024];
char userpwd[256];
//
@@ -128,14 +128,19 @@ RDDownload::ErrorCode RDDownload::runDownload(const QString &username,
curl_easy_cleanup(curl);
return RDDownload::ErrorNoDestination;
}
//
// Write out URL as a C string before passing to curl_easy_setopt(),
// otherwise some versions of LibCurl will throw a 'bad/illegal format'
// error.
// Write out an encoded URL
//
strncpy(url,conv_src_url.
toString(conv_src_url.protocol().lower().left(4)=="http").utf8(),1024);
curl_easy_setopt(curl,CURLOPT_URL,url);
QByteArray url=conv_src_url.toEncoded(QUrl::RemoveUserInfo);
//
// An URL anchor element will never occur here, so treat any '#'
// characters as part of the path.
//
url.replace("#","%23");
curl_easy_setopt(curl,CURLOPT_URL,(const char *)url);
curl_easy_setopt(curl,CURLOPT_WRITEDATA,f);
strncpy(userpwd,(username+":"+password).utf8(),256);
curl_easy_setopt(curl,CURLOPT_USERPWD,userpwd);