mirror of
https://github.com/curl/curl.git
synced 2025-01-24 14:15:18 +08:00
9369c30cd8
- replace `Curl_read()`, `Curl_write()` and `Curl_nwrite()` to
clarify when and at what level they operate
- send/recv of transfer related data is now done via
`Curl_xfer_send()/Curl_xfer_recv()` which no longer has
socket/socketindex as parameter. It decides on the transfer
setup of `conn->sockfd` and `conn->writesockfd` on which
connection filter chain to operate.
- send/recv on a specific connection filter chain is done via
`Curl_conn_send()/Curl_conn_recv()` which get the socket index
as parameter.
- rename `Curl_setup_transfer()` to `Curl_xfer_setup()` for
naming consistency
- clarify that the special CURLE_AGAIN hangling to return
`CURLE_OK` with length 0 only applies to `Curl_xfer_send()`
and CURLE_AGAIN is returned by all other send() variants.
- fix a bug in websocket `curl_ws_recv()` that mixed up data
when it arrived in more than a single chunk (to be made
into a sperate PR, also)
Added as documented [in
CLIENT-READER.md](5b1f31dfba/docs/CLIENT-READERS.md).
- old `Curl_buffer_send()` completely replaced by new `Curl_req_send()`
- old `Curl_fillreadbuffer()` replaced with `Curl_client_read()`
- HTTP chunked uploads are now formatted in a client reader added when
needed.
- FTP line-end conversions are done in a client reader added when
needed.
- when sending requests headers, remaining buffer space is filled with
body data for sending in "one go". This is independent of the request
body size. Resolves #12938 as now small and large requests have the
same code path.
Changes done to test cases:
- test513: now fails before sending request headers as this initial
"client read" triggers the setup fault. Behaves now the same as in
hyper build
- test547, test555, test1620: fix the length check in the lib code to
only fail for reads *smaller* than expected. This was a bug in the
test code that never triggered in the old implementation.
Closes #12969
128 lines
3.6 KiB
C
128 lines
3.6 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 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.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.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
/* argv1 = URL
|
|
* argv2 = proxy
|
|
* argv3 = proxyuser:password
|
|
*/
|
|
|
|
#include "test.h"
|
|
|
|
#include "memdebug.h"
|
|
|
|
#define UPLOADTHIS "this is the blurb we want to upload\n"
|
|
|
|
#ifndef LIB548
|
|
static size_t readcallback(char *ptr,
|
|
size_t size,
|
|
size_t nmemb,
|
|
void *clientp)
|
|
{
|
|
int *counter = (int *)clientp;
|
|
|
|
if(*counter) {
|
|
/* only do this once and then require a clearing of this */
|
|
fprintf(stderr, "READ ALREADY DONE!\n");
|
|
return 0;
|
|
}
|
|
(*counter)++; /* bump */
|
|
|
|
if(size * nmemb >= strlen(UPLOADTHIS)) {
|
|
fprintf(stderr, "READ!\n");
|
|
strcpy(ptr, UPLOADTHIS);
|
|
return strlen(UPLOADTHIS);
|
|
}
|
|
fprintf(stderr, "READ NOT FINE!\n");
|
|
return 0;
|
|
}
|
|
static curlioerr ioctlcallback(CURL *handle,
|
|
int cmd,
|
|
void *clientp)
|
|
{
|
|
int *counter = (int *)clientp;
|
|
(void)handle; /* unused */
|
|
if(cmd == CURLIOCMD_RESTARTREAD) {
|
|
fprintf(stderr, "REWIND!\n");
|
|
*counter = 0; /* clear counter to make the read callback restart */
|
|
}
|
|
return CURLIOE_OK;
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
int test(char *URL)
|
|
{
|
|
CURLcode res;
|
|
CURL *curl;
|
|
#ifndef LIB548
|
|
int counter = 0;
|
|
#endif
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
fprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
fprintf(stderr, "curl_easy_init() failed\n");
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
test_setopt(curl, CURLOPT_URL, URL);
|
|
test_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
test_setopt(curl, CURLOPT_HEADER, 1L);
|
|
#ifdef LIB548
|
|
/* set the data to POST with a mere pointer to a null-terminated string */
|
|
test_setopt(curl, CURLOPT_POSTFIELDS, UPLOADTHIS);
|
|
#else
|
|
/* 547 style, which means reading the POST data from a callback */
|
|
CURL_IGNORE_DEPRECATION(
|
|
test_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctlcallback);
|
|
test_setopt(curl, CURLOPT_IOCTLDATA, &counter);
|
|
)
|
|
test_setopt(curl, CURLOPT_READFUNCTION, readcallback);
|
|
test_setopt(curl, CURLOPT_READDATA, &counter);
|
|
/* We CANNOT do the POST fine without setting the size (or choose
|
|
chunked)! */
|
|
test_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)strlen(UPLOADTHIS));
|
|
#endif
|
|
test_setopt(curl, CURLOPT_POST, 1L);
|
|
test_setopt(curl, CURLOPT_PROXY, libtest_arg2);
|
|
test_setopt(curl, CURLOPT_PROXYUSERPWD, libtest_arg3);
|
|
test_setopt(curl, CURLOPT_PROXYAUTH,
|
|
(long) (CURLAUTH_NTLM | CURLAUTH_DIGEST | CURLAUTH_BASIC) );
|
|
|
|
res = curl_easy_perform(curl);
|
|
|
|
test_cleanup:
|
|
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
|
|
return (int)res;
|
|
}
|