[PULL,5/7] curl: Don't set curl options on the handle just before it's going to be deleted.

Message ID 1371486710-17793-6-git-send-email-kwolf@redhat.com
State New
Headers show

Commit Message

Kevin Wolf June 17, 2013, 4:31 p.m.
From: "Richard W.M. Jones" <rjones@redhat.com>

(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 | 2 --
 1 file changed, 2 deletions(-)


diff --git a/block/curl.c b/block/curl.c
index 0fba451..6af8cb7 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -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)