Commit 51c48534 authored by Colin Hogben's avatar Colin Hogben Committed by Daniel Stenberg
Browse files

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.
parent 4563eeb9

src/tool_operate.c

+8 −3
Original line number Diff line number Diff line
@@ -767,10 +767,15 @@ 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);



        /* in 7.18.0, the CURLOPT_SEEKFUNCTION/DATA pair is taking over what