mirror of
https://github.com/moparisthebest/curl
synced 2024-11-12 04:25:08 -05:00
9a2cbf30b8
Attempt to unpause a busy read in the CURLOPT_XFERINFOFUNCTION. When uploading from stdin in non-blocking mode, a delay in reading the stream (EAGAIN) causes curl to pause sending data (CURL_READFUNC_PAUSE). Prior to this change, a busy read was detected and unpaused only in the CURLOPT_WRITEFUNCTION handler. This change performs the same busy read handling in a CURLOPT_XFERINFOFUNCTION handler. Fixes #2051 Closes #4599 Reported-by: bdry on github
81 lines
2.3 KiB
C
81 lines
2.3 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* 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
|
|
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
#include "tool_setup.h"
|
|
|
|
#define ENABLE_CURLX_PRINTF
|
|
/* use our own printf() functions */
|
|
#include "curlx.h"
|
|
|
|
#include "tool_cfgable.h"
|
|
#include "tool_cb_rea.h"
|
|
#include "tool_operate.h"
|
|
|
|
#include "memdebug.h" /* keep this as LAST include */
|
|
|
|
/*
|
|
** callback for CURLOPT_READFUNCTION
|
|
*/
|
|
|
|
size_t tool_read_cb(void *buffer, size_t sz, size_t nmemb, void *userdata)
|
|
{
|
|
ssize_t rc;
|
|
struct InStruct *in = userdata;
|
|
|
|
rc = read(in->fd, buffer, sz*nmemb);
|
|
if(rc < 0) {
|
|
if(errno == EAGAIN) {
|
|
errno = 0;
|
|
in->config->readbusy = TRUE;
|
|
return CURL_READFUNC_PAUSE;
|
|
}
|
|
/* since size_t is unsigned we can't return negative values fine */
|
|
rc = 0;
|
|
}
|
|
in->config->readbusy = FALSE;
|
|
return (size_t)rc;
|
|
}
|
|
|
|
/*
|
|
** callback for CURLOPT_XFERINFOFUNCTION used to unpause busy reads
|
|
*/
|
|
|
|
int tool_readbusy_cb(void *clientp,
|
|
curl_off_t dltotal, curl_off_t dlnow,
|
|
curl_off_t ultotal, curl_off_t ulnow)
|
|
{
|
|
struct per_transfer *per = clientp;
|
|
struct OutStruct *outs = &per->outs;
|
|
struct OperationConfig *config = outs->config;
|
|
|
|
(void)dltotal; /* unused */
|
|
(void)dlnow; /* unused */
|
|
(void)ultotal; /* unused */
|
|
(void)ulnow; /* unused */
|
|
|
|
if(config->readbusy) {
|
|
config->readbusy = FALSE;
|
|
curl_easy_pause(per->curl, CURLPAUSE_CONT);
|
|
}
|
|
|
|
return per->noprogress? 0 : CURL_PROGRESSFUNC_CONTINUE;
|
|
}
|