Skip to content

M
mpd
Commit 74eac1d4 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

lib/curl/Request: add constructor without "url" parameter

Allows constructing the request first and set the URL later. This is needed because curl_easy_escape() is needed to construct the URL, which however needs the CURL "easy" handle created by the Request class.
parent 96676f8f
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 3 deletions
src/lib/curl/Request.cxx
View file @ 74eac1d4
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
CurlRequest::CurlRequest(CurlGlobal &_global, const char *url, CurlRequest::CurlRequest(CurlGlobal &_global,
CurlResponseHandler &_handler) CurlResponseHandler &_handler)
:global(_global), handler(_handler), :global(_global), handler(_handler),
postpone_error_event(global.GetEventLoop(), postpone_error_event(global.GetEventLoop(),
...@@ -64,7 +64,6 @@ CurlRequest::CurlRequest(CurlGlobal &_global, const char *url, ...@@ -64,7 +64,6 @@ CurlRequest::CurlRequest(CurlGlobal &_global, const char *url,
easy.SetOption(CURLOPT_NOPROGRESS, 1l); easy.SetOption(CURLOPT_NOPROGRESS, 1l);
easy.SetOption(CURLOPT_NOSIGNAL, 1l); easy.SetOption(CURLOPT_NOSIGNAL, 1l);
easy.SetOption(CURLOPT_CONNECTTIMEOUT, 10l); easy.SetOption(CURLOPT_CONNECTTIMEOUT, 10l);
easy.SetOption(CURLOPT_URL, url);
} }
CurlRequest::~CurlRequest() noexcept CurlRequest::~CurlRequest() noexcept
......
src/lib/curl/Request.hxx
View file @ 74eac1d4
...@@ -78,8 +78,15 @@ public: ...@@ -78,8 +78,15 @@ public:
/** /**
* To start sending the request, call Start(). * To start sending the request, call Start().
*/ */
CurlRequest(CurlGlobal &_global, const char *url, CurlRequest(CurlGlobal &_global,
CurlResponseHandler &_handler); CurlResponseHandler &_handler);
CurlRequest(CurlGlobal &_global, const char *url,
CurlResponseHandler &_handler)
:CurlRequest(_global, _handler) {
SetUrl(url);
}
~CurlRequest() noexcept; ~CurlRequest() noexcept;
CurlRequest(const CurlRequest &) = delete; CurlRequest(const CurlRequest &) = delete;
...@@ -119,6 +126,10 @@ public: ...@@ -119,6 +126,10 @@ public:
easy.SetOption(option, value); easy.SetOption(option, value);
} }
void SetUrl(const char *url) {
easy.SetOption(CURLOPT_URL, url);
}
/** /**
* CurlResponseHandler::OnData() shall throw this to pause the * CurlResponseHandler::OnData() shall throw this to pause the
* stream. Call Resume() to resume the transfer. * stream. Call Resume() to resume the transfer.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment