oasis

commit: d13d7247c6a380d9c2ec1f1b4421c492ebf2e1c6
parent 68c67d3d84269b072063a9c42252100a395b6ec2
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  4 Jun 2019 20:52:00 -0700

curl: Temporarily revert a commit in 7.65.0

This commit breaks redirects in netsurf[0].

[0] https://bugs.netsurf-browser.org/mantis/view.php?id=2663

Diffstat:
A
pkg/curl/patch/0001-Revert-WRITEFUNCTION-add-missing-set_in_callback-aro.patch
30
++++++++++++++++++++++++++++++
M
pkg/curl/ver
2
+-

2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/pkg/curl/patch/0001-Revert-WRITEFUNCTION-add-missing-set_in_callback-aro.patch b/pkg/curl/patch/0001-Revert-WRITEFUNCTION-add-missing-set_in_callback-aro.patch
@@ -0,0 +1,30 @@
+From 22c793025b6029dfee88edbb75e90884af529a55 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sat, 1 Jun 2019 23:14:33 -0700
+Subject: [PATCH] Revert "WRITEFUNCTION: add missing set_in_callback around
+ callback"
+
+This reverts commit 0eec832603d3a4ba9ae69a16351cf29c37f7fb7c.
+---
+ lib/sendf.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/lib/sendf.c b/lib/sendf.c
+index 5913ea406..504a28ae4 100644
+--- a/lib/sendf.c
++++ b/lib/sendf.c
+@@ -595,10 +595,7 @@ static CURLcode chop_write(struct connectdata *conn,
+     size_t chunklen = len <= CURL_MAX_WRITE_SIZE? len: CURL_MAX_WRITE_SIZE;
+ 
+     if(writebody) {
+-      size_t wrote;
+-      Curl_set_in_callback(data, true);
+-      wrote = writebody(ptr, 1, chunklen, data->set.out);
+-      Curl_set_in_callback(data, false);
++      size_t wrote = writebody(ptr, 1, chunklen, data->set.out);
+ 
+       if(CURL_WRITEFUNC_PAUSE == wrote) {
+         if(conn->handler->flags & PROTOPT_NONETWORK) {
+-- 
+2.21.0
+
diff --git a/pkg/curl/ver b/pkg/curl/ver
@@ -1 +1 @@
-7.65.0 r0
+7.65.0 r1