Commit f2d234a4 authored by Steve Holme's avatar Steve Holme
Browse files

FILE: Fixed sending of data would always return CURLE_WRITE_ERROR 

Introduced in commit 2a4ee0d2 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.
parent 2a4ee0d2

lib/sendf.c

+10 −10
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ CURLcode Curl_client_write(struct connectdata *conn, 
      wrote = len;

    }



    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
@@ -451,10 +452,9 @@ CURLcode Curl_client_write(struct connectdata *conn, 
        failf(data, "Write callback asked for PAUSE when not supported!");

        return CURLE_WRITE_ERROR;

      }



    else if(CURL_WRITEFUNC_PAUSE == wrote)

      else

        return pausewrite(data, type, ptr, len);



    }

    else if(wrote != len) {

      failf(data, "Failed writing body (%zu != %zu)", wrote, len);

      return CURLE_WRITE_ERROR;