From 217d88f21f11236478dd41c37b67bef5b0a06497 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 28 Oct 2014 22:10:47 +0100
Subject: TextInputStream: don't ignore unterminated last line
---
src/input/TextInputStream.cxx | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
(limited to 'src/input')
diff --git a/src/input/TextInputStream.cxx b/src/input/TextInputStream.cxx
index b79f64bdc..5a8dcc065 100644
--- a/src/input/TextInputStream.cxx
+++ b/src/input/TextInputStream.cxx
@@ -38,8 +38,8 @@ TextInputStream::ReadLine()
while (true) {
auto dest = buffer.Write();
if (dest.size < 2) {
- /* end of file (or line too long): terminate
- the current line */
+ /* line too long: terminate the current
+ line */
assert(!dest.IsEmpty());
dest[0] = 0;
@@ -66,7 +66,19 @@ TextInputStream::ReadLine()
if (line != nullptr)
return line;
- if (nbytes == 0)
- return nullptr;
+ if (nbytes == 0) {
+ /* end of file: see if there's an unterminated
+ line */
+
+ dest = buffer.Write();
+ assert(!dest.IsEmpty());
+ dest[0] = 0;
+
+ auto r = buffer.Read();
+ buffer.Clear();
+ return r.IsEmpty()
+ ? nullptr
+ : r.data;
+ }
}
}
--
cgit v1.2.3
From a8770aa606a1d83f252d150530db667bc7614da9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 1 Nov 2014 14:09:30 +0100
Subject: input/curl: fix curl_easy_setopt() parameter types
---
src/input/plugins/CurlInputPlugin.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src/input')
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index 617805e2c..42575a3fa 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -720,9 +720,9 @@ CurlInputStream::InitEasy(Error &error)
input_curl_writefunction);
curl_easy_setopt(easy, CURLOPT_WRITEDATA, this);
curl_easy_setopt(easy, CURLOPT_HTTP200ALIASES, http_200_aliases);
- curl_easy_setopt(easy, CURLOPT_FOLLOWLOCATION, 1);
- curl_easy_setopt(easy, CURLOPT_NETRC, 1);
- curl_easy_setopt(easy, CURLOPT_MAXREDIRS, 5);
+ curl_easy_setopt(easy, CURLOPT_FOLLOWLOCATION, 1l);
+ curl_easy_setopt(easy, CURLOPT_NETRC, 1l);
+ curl_easy_setopt(easy, CURLOPT_MAXREDIRS, 5l);
curl_easy_setopt(easy, CURLOPT_FAILONERROR, true);
curl_easy_setopt(easy, CURLOPT_ERRORBUFFER, error_buffer);
curl_easy_setopt(easy, CURLOPT_NOPROGRESS, 1l);
--
cgit v1.2.3
From ec3191f50279c432ffef7449133db1d4c433120c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 1 Nov 2014 14:09:30 +0100
Subject: input/curl: fix curl_easy_setopt() parameter types
---
src/input/CurlInputPlugin.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'src/input')
diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx
index b78545951..031ebfea6 100644
--- a/src/input/CurlInputPlugin.cxx
+++ b/src/input/CurlInputPlugin.cxx
@@ -983,10 +983,10 @@ input_curl_easy_init(struct input_curl *c, Error &error)
input_curl_writefunction);
curl_easy_setopt(c->easy, CURLOPT_WRITEDATA, c);
curl_easy_setopt(c->easy, CURLOPT_HTTP200ALIASES, http_200_aliases);
- curl_easy_setopt(c->easy, CURLOPT_FOLLOWLOCATION, 1);
- curl_easy_setopt(c->easy, CURLOPT_NETRC, 1);
- curl_easy_setopt(c->easy, CURLOPT_MAXREDIRS, 5);
- curl_easy_setopt(c->easy, CURLOPT_FAILONERROR, true);
+ curl_easy_setopt(c->easy, CURLOPT_FOLLOWLOCATION, 1l);
+ curl_easy_setopt(c->easy, CURLOPT_NETRC, 1l);
+ curl_easy_setopt(c->easy, CURLOPT_MAXREDIRS, 5l);
+ curl_easy_setopt(c->easy, CURLOPT_FAILONERROR, 1l);
curl_easy_setopt(c->easy, CURLOPT_ERRORBUFFER, c->error);
curl_easy_setopt(c->easy, CURLOPT_NOPROGRESS, 1l);
curl_easy_setopt(c->easy, CURLOPT_NOSIGNAL, 1l);
--
cgit v1.2.3
From 05c63af7c473de374406d76e146d73245de10a2b Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 2 Nov 2014 12:59:16 +0100
Subject: InputStream: add method ClearMimeType()
---
src/input/InputStream.hxx | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'src/input')
diff --git a/src/input/InputStream.hxx b/src/input/InputStream.hxx
index 15c350103..81b903ba2 100644
--- a/src/input/InputStream.hxx
+++ b/src/input/InputStream.hxx
@@ -200,6 +200,10 @@ public:
return mime.empty() ? nullptr : mime.c_str();
}
+ void ClearMimeType() {
+ mime.clear();
+ }
+
gcc_nonnull_all
void SetMimeType(const char *_mime) {
assert(!ready);
--
cgit v1.2.3
From a2eb14f3b379c966b259825c91c154f475f13eb6 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 2 Nov 2014 13:00:25 +0100
Subject: AsyncInputStream: add method ClearTag()
---
src/input/AsyncInputStream.hxx | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'src/input')
diff --git a/src/input/AsyncInputStream.hxx b/src/input/AsyncInputStream.hxx
index 7935f1a17..d1f0c3b9d 100644
--- a/src/input/AsyncInputStream.hxx
+++ b/src/input/AsyncInputStream.hxx
@@ -83,6 +83,10 @@ protected:
*/
void SetTag(Tag *_tag);
+ void ClearTag() {
+ SetTag(nullptr);
+ }
+
void Pause();
bool IsPaused() const {
--
cgit v1.2.3
From 56f763a4a83f6410b1bd9e1f8b41240df535ebc9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 2 Nov 2014 12:59:45 +0100
Subject: input/curl: forget Content-Length (and more) after redirect
Fixes playback of redirected streams.
---
src/input/plugins/CurlInputPlugin.cxx | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
(limited to 'src/input')
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index 0028158a3..1e1a46108 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -109,6 +109,13 @@ struct CurlInputStream final : public AsyncInputStream {
*/
void FreeEasyIndirect();
+ /**
+ * Called when a new response begins. This is used to discard
+ * headers from previous responses (for example authentication
+ * and redirects).
+ */
+ void ResponseBoundary();
+
void HeaderReceived(const char *name, std::string &&value);
size_t DataReceived(const void *ptr, size_t size);
@@ -597,6 +604,20 @@ CurlInputStream::~CurlInputStream()
FreeEasyIndirect();
}
+inline void
+CurlInputStream::ResponseBoundary()
+{
+ /* undo all effects of HeaderReceived() because the previous
+ response was not applicable for this stream */
+
+ seekable = false;
+ size = UNKNOWN_SIZE;
+ ClearMimeType();
+ ClearTag();
+
+ // TODO: reset the IcyInputStream?
+}
+
inline void
CurlInputStream::HeaderReceived(const char *name, std::string &&value)
{
@@ -645,6 +666,11 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
size *= nmemb;
const char *header = (const char *)ptr;
+ if (size > 5 && memcmp(header, "HTTP/", 5) == 0) {
+ c.ResponseBoundary();
+ return size;
+ }
+
const char *end = header + size;
char name[64];
--
cgit v1.2.3