summaryrefslogtreecommitdiff
path: root/lib/formdata.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-03-02 07:42:55 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-03-02 08:07:49 +0100
commit8cd4e6d81fbf2b179f996146b3b111694fd8716e (patch)
tree74ae49f0012b9dfa7d64aa60204fc00d91ebf791 /lib/formdata.c
parentd7242f4757de67f02b13fac850c3472598f999ca (diff)
downloadcurl-8cd4e6d81fbf2b179f996146b3b111694fd8716e.tar.gz
Revert "mime: latch last read callback status."
This reverts commit 87869e38d7afdec3ef1bb4965711458b088e254f. Fixes #5014 Closes #5015 Reopens #4833
Diffstat (limited to 'lib/formdata.c')
-rw-r--r--lib/formdata.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/formdata.c b/lib/formdata.c
index 6103959cd..429d479da 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -730,15 +730,11 @@ int curl_formget(struct curl_httppost *form, void *arg,
switch(nread) {
default:
- if(append(arg, buffer, nread) == nread)
- break;
- /* FALLTHROUGH */
- case CURL_READFUNC_ABORT:
- result = CURLE_ABORTED_BY_CALLBACK;
+ if(append(arg, buffer, nread) != nread)
+ result = CURLE_READ_ERROR;
break;
- case (size_t) -1: /* Read error. */
- case CURL_READFUNC_PAUSE: /* Should not be paused. */
- result = CURLE_READ_ERROR;
+ case CURL_READFUNC_ABORT:
+ case CURL_READFUNC_PAUSE:
break;
}
}