From: Colin Hogben <curl@pythontech.co.uk>
Date: Wed, 4 Jan 2012 11:24:49 +0000 (+0000)
Subject: Remove bogus optimisation of telnet upload.
X-Git-Tag: curl-7_24_0~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51c485342b3be871c8998affc62901a27ffd3d92;p=curl

Remove bogus optimisation of telnet upload.

Remove wrongly implemented optimisation of telnet upload, apparently
intended to allow the library to avoid manually polling for input.
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index bf73479aa..a6f6f0b90 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -767,11 +767,16 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
         /* for uploads */
         input.fd = infd;
         input.config = config;
+        /* Note that if CURLOPT_READFUNCTION is fread (the default), then
+         * lib/telnet.c will Curl_poll() on the input file descriptor
+         * rather then calling the READFUNCTION at regular intervals.
+         * The circumstances in which it is preferable to enable this
+         * behaviour, by omitting to set the READFUNCTION & READDATA options,
+         * have not been determined.
+         */
         my_setopt(curl, CURLOPT_READDATA, &input);
         /* what call to read */
-        if((outfile && !curlx_strequal("-", outfile)) ||
-           !checkprefix("telnet:", this_url))
-          my_setopt(curl, CURLOPT_READFUNCTION, tool_read_cb);
+        my_setopt(curl, CURLOPT_READFUNCTION, tool_read_cb);
 
         /* in 7.18.0, the CURLOPT_SEEKFUNCTION/DATA pair is taking over what
            CURLOPT_IOCTLFUNCTION/DATA pair previously provided for seeking */