From: Steve Holme <steve_holme@hotmail.com>
Date: Fri, 27 Dec 2013 10:55:01 +0000 (+0000)
Subject: FILE: Fixed sending of data would always return CURLE_WRITE_ERROR
X-Git-Tag: curl-7_35_0~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2d234a4dd9bcc;p=curl

FILE: Fixed sending of data would always return CURLE_WRITE_ERROR

Introduced in commit 2a4ee0d2215556 sending of data via the FILE
protocol would always return CURLE_WRITE_ERROR regardless of whether
CURL_WRITEFUNC_PAUSE was returned from the callback function or not.
---

diff --git a/lib/sendf.c b/lib/sendf.c
index 8ffd43f47..d508dfd3e 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -444,17 +444,17 @@ CURLcode Curl_client_write(struct connectdata *conn,
       wrote = len;
     }
 
-    if(conn->handler->flags & PROTOPT_NONETWORK) {
-      /* protocols that work without network cannot be paused. This is
-         actually only FILE:// just now, and it can't pause since the transfer
-         isn't done using the "normal" procedure. */
-      failf(data, "Write callback asked for PAUSE when not supported!");
-      return CURLE_WRITE_ERROR;
+    if(CURL_WRITEFUNC_PAUSE == wrote) {
+      if(conn->handler->flags & PROTOPT_NONETWORK) {
+        /* protocols that work without network cannot be paused. This is
+           actually only FILE:// just now, and it can't pause since the transfer
+           isn't done using the "normal" procedure. */
+        failf(data, "Write callback asked for PAUSE when not supported!");
+        return CURLE_WRITE_ERROR;
+      }
+      else
+        return pausewrite(data, type, ptr, len);
     }
-
-    else if(CURL_WRITEFUNC_PAUSE == wrote)
-      return pausewrite(data, type, ptr, len);
-
     else if(wrote != len) {
       failf(data, "Failed writing body (%zu != %zu)", wrote, len);
       return CURLE_WRITE_ERROR;