summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2021-01-30 17:51:00 +0100
committerDaniel Stenberg <daniel@haxx.se>2021-01-30 17:51:47 +0100
commit3c2210713e2427d567a6c44b83b3c9ac2a8577bc (patch)
tree0f0d6610f0700f8a6a74a456a9e045884e08b6c2
parent4fc5e7eda53124ce0b64687d2094587e8e56fd4a (diff)
downloadcurl-3c2210713e2427d567a6c44b83b3c9ac2a8577bc.tar.gz
hyper: fix CONNECT to set 'data' as userdata
Follow-up to 14e075d1a7fd
-rw-r--r--lib/c-hyper.c2
-rw-r--r--lib/http_proxy.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/c-hyper.c b/lib/c-hyper.c
index cdb8e0ef3..10bd7ef9b 100644
--- a/lib/c-hyper.c
+++ b/lib/c-hyper.c
@@ -64,7 +64,7 @@ size_t Curl_hyper_recv(void *userp, hyper_context *ctx,
struct connectdata *conn = data->conn;
CURLcode result;
ssize_t nread;
-
+ DEBUGASSERT(conn);
(void)ctx;
result = Curl_read(data, conn->sockfd, (char *)buf, buflen, &nread);
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index 46261184d..a03a27fdc 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -681,7 +681,7 @@ static CURLcode CONNECT(struct Curl_easy *data,
goto error;
}
/* tell Hyper how to read/write network data */
- hyper_io_set_userdata(io, conn);
+ hyper_io_set_userdata(io, data);
hyper_io_set_read(io, Curl_hyper_recv);
hyper_io_set_write(io, Curl_hyper_send);
conn->sockfd = tunnelsocket;