From fa3899f7b0e6c3250f3cb38ac4f9a07d0ab80874 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 15 Jan 2009 16:12:11 +0100 Subject: input_curl: call curl_multi_info_read() in constructor To check for early connect failures, call curl_multi_info_read() in the constructor input_curl_open(). This fixes an assertion failure. --- NEWS | 1 + src/input_curl.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 3c562472b..fe356d045 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,7 @@ MPD 0.14.1 - not yet released * input_curl: - use select() to eliminate busy loop during connect - honour http_proxy_* config directives + - fix assertion failure on "connection refused" * log: automatically append newline * fix setenv() conflict on Solaris * configure.ac: check for pkg-config before using it diff --git a/src/input_curl.c b/src/input_curl.c index d3bc219c8..8372f9924 100644 --- a/src/input_curl.c +++ b/src/input_curl.c @@ -926,6 +926,12 @@ input_curl_open(struct input_stream *is, const char *url) return false; } + ret = input_curl_multi_info_read(is); + if (!ret) { + input_curl_free(is); + return false; + } + return true; } -- cgit v1.2.3