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

2016-06-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'lib/rddownload.cpp' that caused download URLs
	using 'https' protocol to fail to be properly escaped.
This commit is contained in:
Fred Gleason 2016-06-17 14:06:19 -04:00
parent f04fa15090
commit ec79802cb6
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15249,3 +15249,6 @@
2016-06-17 Fred Gleason <fredg@paravelsystems.com> 2016-06-17 Fred Gleason <fredg@paravelsystems.com>
* Modified rdexport(1) to list correct audio format parameters * Modified rdexport(1) to list correct audio format parameters
in the XML output. in the XML output.
2016-06-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'lib/rddownload.cpp' that caused download URLs
using 'https' protocol to fail to be properly escaped.

4
lib/rddownload.cpp
View File

@ -131,8 +131,8 @@ RDDownload::ErrorCode RDDownload::runDownload(const QString &username,
// otherwise some versions of LibCurl will throw a 'bad/illegal format' // otherwise some versions of LibCurl will throw a 'bad/illegal format'
// error. // error.
// //
strncpy(url,conv_src_url.toString(conv_src_url.protocol().lower()=="http"), strncpy(url,conv_src_url.
1024); toString(conv_src_url.protocol().lower().left(4)=="http"),1024);
curl_easy_setopt(curl,CURLOPT_URL,url); curl_easy_setopt(curl,CURLOPT_URL,url);
curl_easy_setopt(curl,CURLOPT_WRITEDATA,f); curl_easy_setopt(curl,CURLOPT_WRITEDATA,f);
strncpy(userpwd,username+":"+password,256); strncpy(userpwd,username+":"+password,256);

6
rdcatchd/batch.cpp
View File

@ -59,6 +59,7 @@
#include <rdlibrary_conf.h> #include <rdlibrary_conf.h>
#include <rdaudioconvert.h> #include <rdaudioconvert.h>
#include <rdupload.h> #include <rdupload.h>
#include <rdweb.h>
#include <rddownload.h> #include <rddownload.h>
void MainObject::catchConnectedData(int serial,bool state) void MainObject::catchConnectedData(int serial,bool state)
@ -192,14 +193,15 @@ void MainObject::RunDownload(CatchEvent *evt)
// //
// Execute Download // Execute Download
// //
evt->setTempName(BuildTempName(evt,"download"));
LogLine(RDConfig::LogInfo,QString(). LogLine(RDConfig::LogInfo,QString().
sprintf("starting download of %s to %s, id=%d", sprintf("starting download of %s to %s, id=%d",
(const char *)evt->resolvedUrl(), (const char *)evt->resolvedUrl(),
(const char *)evt->tempName(), (const char *)evt->tempName(),
evt->id())); evt->id()));
evt->setTempName(BuildTempName(evt,"download"));
RDDownload *conv=new RDDownload(catch_config->stationName(),this); RDDownload *conv=new RDDownload(catch_config->stationName(),this);
conv->setSourceUrl(evt->resolvedUrl());
conv->setSourceUrl(RDUrlEscape(evt->resolvedUrl()));
conv->setDestinationFile(evt->tempName()); conv->setDestinationFile(evt->tempName());
QString url_username=evt->urlUsername(); QString url_username=evt->urlUsername();
QString url_password=evt->urlPassword(); QString url_password=evt->urlPassword();