aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--NEWS1
-rw-r--r--src/input/CurlInputPlugin.cxx3
-rw-r--r--src/ls.cxx1
3 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index fb4145c30..06e2ab724 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ ver 0.18 (2012/??/??)
* protocol:
- new command "toggleoutput"
* innput:
+ - curl: enable https
- soup: plugin removed
* decoder:
- adplug: new decoder plugin using libadplug
diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx
index 42fb99982..cd4733973 100644
--- a/src/input/CurlInputPlugin.cxx
+++ b/src/input/CurlInputPlugin.cxx
@@ -1083,7 +1083,8 @@ static struct input_stream *
input_curl_open(const char *url, Mutex &mutex, Cond &cond,
Error &error)
{
- if (strncmp(url, "http://", 7) != 0)
+ if ((strncmp(url, "http://", 7) != 0) &&
+ (strncmp(url, "https://", 8) != 0))
return NULL;
struct input_curl *c = new input_curl(url, mutex, cond);
diff --git a/src/ls.cxx b/src/ls.cxx
index 9a74f88b8..06237641e 100644
--- a/src/ls.cxx
+++ b/src/ls.cxx
@@ -36,6 +36,7 @@
static const char *remoteUrlPrefixes[] = {
#if defined(ENABLE_CURL)
"http://",
+ "https://",
#endif
#ifdef ENABLE_MMS
"mms://",