qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 5/7] curl: Don't set curl options on the handle just before it's going to be deleted.
Date: Mon, 17 Jun 2013 18:31:48 +0200	[thread overview]
Message-ID: <1371486710-17793-6-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1371486710-17793-1-git-send-email-kwolf@redhat.com>

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)
-- 
1.8.1.4

  parent reply	other threads:[~2013-06-17 16:32 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-17 16:31 [Qemu-devel] [PULL 0/7] Block patches Kevin Wolf
2013-06-17 16:31 ` [Qemu-devel] [PULL 1/7] sheepdog: fix snapshot tag initialization Kevin Wolf
2013-06-17 16:31 ` [Qemu-devel] [PULL 2/7] sheepdog: support 'qemu-img snapshot -a' Kevin Wolf
2013-06-17 16:31 ` [Qemu-devel] [PULL 3/7] block/curl.c: Refuse to open the handle for writes Kevin Wolf
2013-06-17 16:31 ` [Qemu-devel] [PULL 4/7] vmdk: byteswap VMDK4Header.desc_offset field Kevin Wolf
2013-06-17 16:31 ` Kevin Wolf [this message]
2013-06-17 16:31 ` [Qemu-devel] [PULL 6/7] NVMe: Initial commit for new storage interface Kevin Wolf
2013-06-17 16:31 ` [Qemu-devel] [PULL 7/7] vmdk: Allow reading variable size descriptor files Kevin Wolf
2013-06-17 21:17 ` [Qemu-devel] [PULL 0/7] Block patches Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371486710-17793-6-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).