oasis

commit: 10e71a69a346c6137d3483ad544fefb0ca6ef3e2
parent 66ed61d62f0a508bd170f9ff7ac06c8ce92a797e
Author: Michael Forney <mforney@mforney.org>
Date:   Wed,  5 Jun 2019 22:50:46 -0700

curl: Remove temporary reverted commit

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

2 files changed, 1 insertion(+), 31 deletions(-)
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
@@ -1,30 +0,0 @@
-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 r1
+7.65.0 r2