curl: Don't set curl options on the handle just before it's going to be deleted.
authorRichard W.M. Jones <rjones@redhat.com>
Mon, 10 Jun 2013 16:40:15 +0000 (17:40 +0100)
committerKevin Wolf <kwolf@redhat.com>
Mon, 17 Jun 2013 15:47:59 +0000 (17:47 +0200)
(Found by Kamil Dudka)

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block/curl.c

index 0fba451e3b61f5d0a7557d0716967dd8fd85ee3b..6af8cb75772f7bceecf8654f51086c43910d145f 100644 (file)
@@ -452,8 +452,6 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags)
     if (curl_easy_perform(state->curl))
         goto out;
     curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d);
-    curl_easy_setopt(state->curl, CURLOPT_WRITEFUNCTION, (void *)curl_read_cb);
-    curl_easy_setopt(state->curl, CURLOPT_NOBODY, 0);
     if (d)
         s->len = (size_t)d;
     else if(!s->len)