tests/nghttpx.conf\
}"
-Hyper:
- - all:
- - changed-files:
- - any-glob-to-all-files: "{\
- docs/HYPER.md,\
- lib/c-hyper.*\
- }"
-
IMAP:
- all:
- changed-files:
d640923e45809a3fe277e0af90459d82d32603aacc7b8db88754fcb335bf98df ./tests/data/test1531
6f51bc318104fb5fe4b6013fc4e8e1c3c8dec1819202e8ea025bdbc4bbc8c02d ./tests/data/test1938
28a957ec3397881bbafd0d97879cedfd475bcd1ece903e531576affd7aa3865c ./tests/data/test2080
-db99126801fd5e7cb0c1ec1a0078e5599038c8c07073f3d62ed51f155e0e3d38 ./tests/data/test262
+33809cab2442488e5985b4939727bc4ead9fc65150f53008e3e4c93140675a94 ./tests/data/test262
2d073a52984bab1f196d80464ea8ab6dafd887bd5fee9ed58603f8510df0c6a5 ./tests/data/test35
4cc9fd6f31d0bb4dcb38e1565796e7ec5e48ea5ac9d3c1101de576be618786ba ./tests/data/test463
d655a29dcf2423b420b508c9e381b0fad0b88feb74caa8978725e22c9f7c374d ./tests/data/test467
dnl toggle off alt-svc too when HTTP is disabled
AC_DEFINE(CURL_DISABLE_ALTSVC, 1, [disable alt-svc])
AC_DEFINE(CURL_DISABLE_HSTS, 1, [disable HSTS])
- curl_h1_msg="no (--enable-http, --with-hyper)"
+ curl_h1_msg="no (--enable-http)"
curl_altsvc_msg="no";
curl_hsts_msg="no (--enable-hsts)";
enable_altsvc="no"
fi ]
)
-dnl **********************************************************************
-dnl Check for Hyper
-dnl **********************************************************************
-
-OPT_HYPER="no"
-
-AC_ARG_WITH(hyper,
-AS_HELP_STRING([--with-hyper=PATH],[Enable hyper usage])
-AS_HELP_STRING([--without-hyper],[Disable hyper usage]),
- [OPT_HYPER=$withval])
-case "$OPT_HYPER" in
- no)
- dnl --without-hyper option used
- want_hyper="no"
- ;;
- yes)
- dnl --with-hyper option used without path
- want_hyper="default"
- want_hyper_path=""
- ;;
- *)
- dnl --with-hyper option used with path
- want_hyper="yes"
- want_hyper_path="$withval"
- ;;
-esac
-
-if test X"$want_hyper" != Xno; then
- if test "x$disable_http" = "xyes"; then
- AC_MSG_ERROR([--with-hyper is not compatible with --disable-http])
- fi
-
- dnl backup the pre-hyper variables
- CLEANLDFLAGS="$LDFLAGS"
- CLEANCPPFLAGS="$CPPFLAGS"
- CLEANLIBS="$LIBS"
-
- CURL_CHECK_PKGCONFIG(hyper, $want_hyper_path)
-
- if test "$PKGCONFIG" != "no"; then
- LIB_HYPER=`CURL_EXPORT_PCDIR([$want_hyper_path])
- $PKGCONFIG --libs-only-l hyper`
- CPP_HYPER=`CURL_EXPORT_PCDIR([$want_hyper_path]) dnl
- $PKGCONFIG --cflags-only-I hyper`
- LD_HYPER=`CURL_EXPORT_PCDIR([$want_hyper_path])
- $PKGCONFIG --libs-only-L hyper`
- else
- dnl no hyper pkg-config found
- LIB_HYPER="-lhyper -ldl -lpthread -lm"
- if test X"$want_hyper" != Xdefault; then
- CPP_HYPER=-I"$want_hyper_path/capi/include"
- LD_HYPER="-L$want_hyper_path/target/release -L$want_hyper_path/target/debug"
- fi
- fi
- if test -n "$LIB_HYPER"; then
- AC_MSG_NOTICE([-l is $LIB_HYPER])
- AC_MSG_NOTICE([-I is $CPP_HYPER])
- AC_MSG_NOTICE([-L is $LD_HYPER])
-
- LDFLAGS="$LDFLAGS $LD_HYPER"
- CPPFLAGS="$CPPFLAGS $CPP_HYPER"
- LIBS="$LIB_HYPER $LIBS"
-
- if test "x$cross_compiling" != "xyes"; then
- dnl remove -L, separate with colon if more than one
- DIR_HYPER=`echo $LD_HYPER | $SED -e 's/^-L//' -e 's/ -L/:/g'`
- fi
-
- AC_CHECK_LIB(hyper, hyper_io_new,
- [
- AC_CHECK_HEADERS(hyper.h,
- experimental="$experimental Hyper"
- AC_MSG_NOTICE([Hyper support is experimental])
- curl_h1_msg="enabled (Hyper)"
- HYPER_ENABLED=1
- AC_DEFINE(USE_HYPER, 1, [if hyper is in use])
- AC_SUBST(USE_HYPER, [1])
- CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_HYPER"
- export CURL_LIBRARY_PATH
- AC_MSG_NOTICE([Added $DIR_HYPER to CURL_LIBRARY_PATH])
- LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE hyper"
- )
- ],
- for d in `echo $DIR_HYPER | $SED -e 's/:/ /'`; do
- if test -f "$d/libhyper.a"; then
- AC_MSG_ERROR([hyper was found in $d but was probably built with wrong flags. See docs/HYPER.md.])
- fi
- done
- AC_MSG_ERROR([--with-hyper but hyper was not found. See docs/HYPER.md.])
- )
- fi
-fi
-
-if test X"$want_hyper" != Xno; then
- AC_MSG_NOTICE([Disable RTSP support with hyper])
- AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
- CURL_DISABLE_RTSP=1
-else
- AC_MSG_CHECKING([whether to support rtsp])
- AC_ARG_ENABLE(rtsp,
+AC_MSG_CHECKING([whether to support rtsp])
+AC_ARG_ENABLE(rtsp,
AS_HELP_STRING([--enable-rtsp],[Enable RTSP support])
AS_HELP_STRING([--disable-rtsp],[Disable RTSP support]),
[ case "$enableval" in
- no)
+ no)
AC_MSG_RESULT(no)
AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
CURL_DISABLE_RTSP=1
else
AC_MSG_RESULT(no)
fi
- )
-fi
+)
AC_MSG_CHECKING([whether to support proxies])
AC_ARG_ENABLE(proxy,
OPT_H2="yes"
-if test "x$disable_http" = "xyes" -o X"$want_hyper" != Xno; then
- # without HTTP or with Hyper, nghttp2 is no use
+if test "x$disable_http" = "xyes"; then
+ # without HTTP nghttp2 is no use
OPT_H2="no"
fi
As of May 2024, the libraries that need to get fixed to remain supported after
May 2025 are: BearSSL and Secure Transport.
-## Hyper
-
-Hyper is an alternative HTTP backend for curl. It uses the hyper library and
-could in theory be used for HTTP/1, HTTP/2 and even HTTP/3 in the future with
-curl.
-
-The original plan and goal was that we would add this HTTP alternative (using
-a memory-safe library) and that users could eventually build and use libcurl
-exactly as previously but with parts of the core being more memory-safe.
-
-The hyper implementation ran into some snags and 10-15 tests and HTTP/2
-support have remained disabled with hyper. For these reasons, hyper support
-has remained tagged EXPERIMENTAL.
-
-It is undoubtedly hard work to fix these remaining problems, as they typically
-require both rust and C knowledge in addition to deep HTTP familiarity. There
-does not seem to be that many persons interested or available for this
-challenge. Meanwhile, there is little if any demand for hyper from existing
-(lib)curl users.
-
-Finally: having support for hyper in curl has a significant cost: we need to
-maintain and develop a lot of functionality and tests twice to make sure
-libcurl works identically using either HTTP backend.
-
-The only way to keep hyper support in curl is to give it a good polish by
-someone with time, skill and energy to spend on this task.
-
-Unless a significant overhaul has proven to be in progress, hyper support is
-removed from curl in January 2025.
-
## Past removals
- Pipelining
- MinGW v1
- NTLM_WB
- space-separated `NOPROXY` patterns
+ - hyper
## Experimental features right now
-### The Hyper HTTP backend
-
-Graduation requirements:
-
-- HTTP/1 and HTTP/2 support, including multiplexing
-
-(Hyper is marked for deprecation. It cannot graduate.)
-
### HTTP/3 support (non-ngtcp2 backends)
Graduation requirements:
internals/CONNECTION-FILTERS.md \
internals/DYNBUF.md \
internals/HASH.md \
- internals/HYPER.md \
internals/LLIST.md \
internals/MQTT.md \
internals/NEW-PROTOCOL.md \
# `--ignore-content-length`
-For HTTP, Ignore the Content-Length header. This is particularly useful for
-servers running Apache 1.x, which reports incorrect Content-Length for
-files larger than 2 gigabytes.
+For HTTP, ignore the Content-Length header. This is particularly useful for
+servers running Apache 1.x, which reports incorrect Content-Length for files
+larger than 2 gigabytes.
For FTP, this makes curl skip the SIZE command to figure out the size before
downloading a file (added in 7.46.0).
-
-This option does not work for HTTP if libcurl was built to use hyper.
+++ /dev/null
-<!--
-Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-
-SPDX-License-Identifier: curl
--->
-
-# Hyper
-
-Hyper is a separate HTTP library written in Rust. curl can be told to use this
-library as a backend to deal with HTTP.
-
-## EXPERIMENTAL
-
-Hyper support in curl is considered **EXPERIMENTAL** until further notice. It
-needs to be explicitly enabled at build-time.
-
-Further development and tweaking of the Hyper backend support in curl happens
-in the master branch using pull-requests, just like ordinary changes.
-
-## Hyper version
-
-The C API for Hyper is brand new and is still under development.
-
-## Build curl with hyper
-
-Using Rust 1.64.0 or later, build hyper and enable its C API like this:
-
- % git clone https://github.com/hyperium/hyper
- % cd hyper
- % RUSTFLAGS="--cfg hyper_unstable_ffi" cargo rustc --features client,http1,http2,ffi --crate-type cdylib
-
-Also, `--release` can be added for a release (optimized) build.
-
-Build curl to use hyper's C API:
-
- % git clone https://github.com/curl/curl
- % cd curl
- % autoreconf -fi
- % ./configure LDFLAGS="-Wl,-rpath,<hyper-dir>/target/debug -Wl,-rpath,<hyper-dir>/target/release" --with-openssl --with-hyper=<hyper-dir>
- % make
-
-# Using Hyper internally
-
-Hyper is a low level HTTP transport library. curl itself provides all HTTP
-headers and Hyper provides all received headers back to curl.
-
-Therefore, most of the "header logic" in curl as in responding to and acting
-on specific input and output headers are done the same way in curl code.
-
-The API in Hyper delivers received HTTP headers as (cleaned up) name=value
-pairs, making it impossible for curl to know the exact byte representation
-over the wire with Hyper.
-
-## Limitations
-
-The hyper backend does not support
-
-- `CURLOPT_IGNORE_CONTENT_LENGTH`
-- `--raw` and disabling `CURLOPT_HTTP_TRANSFER_DECODING`
-- RTSP
-- hyper is much stricter about what HTTP header contents it allows
-- leading whitespace in first HTTP/1 response header
-- HTTP/0.9
-- HTTP/2 upgrade using HTTP:// URLs. Aka 'h2c'
-- HTTP/2 in general. Hyper has support for HTTP/2 but the curl side
- needs changes so that a `hyper_clientconn` can last for the duration
- of a connection. Probably this means turning the Hyper HTTP/2 backend
- into a connection filter.
-
-## Remaining issues
-
-This backend is still not feature complete with the native backend. Areas that
-still need attention and verification include:
-
-- multiplexed HTTP/2
-- h2 Upgrade:
-- receiving HTTP/1 trailers
-- sending HTTP/1 trailers
- Verify the Sec-WebSocket-Accept response. It requires a sha-1 function.
- Verify Sec-WebSocket-Extensions and Sec-WebSocket-Protocol in the response
-- Make WebSocket work with hyper
- Consider a `curl_ws_poll()`
- Make sure WebSocket code paths are fuzzed
- Add client-side PING interval
transfer decoding is disabled, if set to 1 it is enabled (default). libcurl
does chunked transfer decoding by default unless this option is set to zero.
-# NOTES
-
-This option does not work with the hyper backend as that always has transfer
-decoding enabled.
-
# DEFAULT
1
Support for FTP added in 7.46.0.
-# NOTES
-
-This option is not working for HTTP when libcurl is built to use the hyper
-backend.
-
# %AVAILABILITY%
# RETURN VALUE
base64.c \
bufq.c \
bufref.c \
- c-hyper.c \
cf-h1-proxy.c \
cf-h2-proxy.c \
cf-haproxy.c \
asyn.h \
bufq.h \
bufref.h \
- c-hyper.h \
cf-h1-proxy.h \
cf-h2-proxy.h \
cf-haproxy.h \
+++ /dev/null
-/***************************************************************************
- * _ _ ____ _
- * 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.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.
- *
- * SPDX-License-Identifier: curl
- *
- ***************************************************************************/
-
-/* Curl's integration with Hyper. This replaces certain functions in http.c,
- * based on configuration #defines. This implementation supports HTTP/1.1 but
- * not HTTP/2.
- */
-#include "curl_setup.h"
-
-#if !defined(CURL_DISABLE_HTTP) && defined(USE_HYPER)
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NET_IF_H
-#include <net/if.h>
-#endif
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#include <hyper.h>
-#include "urldata.h"
-#include "cfilters.h"
-#include "sendf.h"
-#include "headers.h"
-#include "transfer.h"
-#include "multiif.h"
-#include "progress.h"
-#include "content_encoding.h"
-#include "ws.h"
-
-/* The last 3 #include files should be in this order */
-#include "curl_printf.h"
-#include "curl_memory.h"
-#include "memdebug.h"
-
-
-static CURLcode cr_hyper_add(struct Curl_easy *data);
-
-typedef enum {
- USERDATA_NOT_SET = 0, /* for tasks with no userdata set; must be zero */
- USERDATA_RESP_BODY
-} userdata_t;
-
-size_t Curl_hyper_recv(void *userp, hyper_context *ctx,
- uint8_t *buf, size_t buflen)
-{
- struct hyp_io_ctx *io_ctx = userp;
- struct Curl_easy *data = io_ctx->data;
- struct connectdata *conn = data->conn;
- CURLcode result;
- ssize_t nread;
- DEBUGASSERT(conn);
- (void)ctx;
-
- DEBUGF(infof(data, "Curl_hyper_recv(%zu)", buflen));
- result = Curl_conn_recv(data, io_ctx->sockindex,
- (char *)buf, buflen, &nread);
- if(result == CURLE_AGAIN) {
- /* would block, register interest */
- DEBUGF(infof(data, "Curl_hyper_recv(%zu) -> EAGAIN", buflen));
- if(data->hyp.read_waker)
- hyper_waker_free(data->hyp.read_waker);
- data->hyp.read_waker = hyper_context_waker(ctx);
- if(!data->hyp.read_waker) {
- failf(data, "Couldn't make the read hyper_context_waker");
- return HYPER_IO_ERROR;
- }
- return HYPER_IO_PENDING;
- }
- else if(result) {
- failf(data, "Curl_read failed");
- return HYPER_IO_ERROR;
- }
- DEBUGF(infof(data, "Curl_hyper_recv(%zu) -> %zd", buflen, nread));
- return (size_t)nread;
-}
-
-size_t Curl_hyper_send(void *userp, hyper_context *ctx,
- const uint8_t *buf, size_t buflen)
-{
- struct hyp_io_ctx *io_ctx = userp;
- struct Curl_easy *data = io_ctx->data;
- CURLcode result;
- size_t nwrote;
-
- DEBUGF(infof(data, "Curl_hyper_send(%zu)", buflen));
- result = Curl_conn_send(data, io_ctx->sockindex,
- (void *)buf, buflen, FALSE, &nwrote);
- if(result == CURLE_AGAIN) {
- DEBUGF(infof(data, "Curl_hyper_send(%zu) -> EAGAIN", buflen));
- /* would block, register interest */
- if(data->hyp.write_waker)
- hyper_waker_free(data->hyp.write_waker);
- data->hyp.write_waker = hyper_context_waker(ctx);
- if(!data->hyp.write_waker) {
- failf(data, "Couldn't make the write hyper_context_waker");
- return HYPER_IO_ERROR;
- }
- return HYPER_IO_PENDING;
- }
- else if(result) {
- failf(data, "Curl_write failed");
- return HYPER_IO_ERROR;
- }
- DEBUGF(infof(data, "Curl_hyper_send(%zu) -> %zd", buflen, nwrote));
- return (size_t)nwrote;
-}
-
-static int hyper_each_header(void *userdata,
- const uint8_t *name,
- size_t name_len,
- const uint8_t *value,
- size_t value_len)
-{
- struct Curl_easy *data = (struct Curl_easy *)userdata;
- size_t len;
- char *headp;
- CURLcode result;
- int writetype;
-
- if(name_len + value_len + 2 > CURL_MAX_HTTP_HEADER) {
- failf(data, "Too long response header");
- data->state.hresult = CURLE_TOO_LARGE;
- return HYPER_ITER_BREAK;
- }
-
- Curl_dyn_reset(&data->state.headerb);
- if(name_len) {
- if(Curl_dyn_addf(&data->state.headerb, "%.*s: %.*s\r\n",
- (int) name_len, name, (int) value_len, value))
- return HYPER_ITER_BREAK;
- }
- else {
- if(Curl_dyn_addn(&data->state.headerb, STRCONST("\r\n")))
- return HYPER_ITER_BREAK;
- }
- len = Curl_dyn_len(&data->state.headerb);
- headp = Curl_dyn_ptr(&data->state.headerb);
-
- result = Curl_http_header(data, headp, len);
- if(result) {
- data->state.hresult = result;
- return HYPER_ITER_BREAK;
- }
-
- Curl_debug(data, CURLINFO_HEADER_IN, headp, len);
-
- writetype = CLIENTWRITE_HEADER;
- if(data->state.hconnect)
- writetype |= CLIENTWRITE_CONNECT;
- if(data->req.httpcode/100 == 1)
- writetype |= CLIENTWRITE_1XX;
- result = Curl_client_write(data, writetype, headp, len);
- if(result) {
- data->state.hresult = CURLE_ABORTED_BY_CALLBACK;
- return HYPER_ITER_BREAK;
- }
-
- result = Curl_bump_headersize(data, len, FALSE);
- if(result) {
- data->state.hresult = result;
- return HYPER_ITER_BREAK;
- }
- return HYPER_ITER_CONTINUE;
-}
-
-static int hyper_body_chunk(void *userdata, const hyper_buf *chunk)
-{
- char *buf = (char *)hyper_buf_bytes(chunk);
- size_t len = hyper_buf_len(chunk);
- struct Curl_easy *data = (struct Curl_easy *)userdata;
- struct SingleRequest *k = &data->req;
- CURLcode result = CURLE_OK;
-
- if(!k->bodywritten) {
-#if defined(USE_NTLM)
- struct connectdata *conn = data->conn;
- if(conn->bits.close &&
- (((data->req.httpcode == 401) &&
- (conn->http_ntlm_state == NTLMSTATE_TYPE2)) ||
- ((data->req.httpcode == 407) &&
- (conn->proxy_ntlm_state == NTLMSTATE_TYPE2)))) {
- infof(data, "Connection closed while negotiating NTLM");
- data->state.authproblem = TRUE;
- Curl_safefree(data->req.newurl);
- }
-#endif
- if(Curl_http_exp100_is_selected(data)) {
- if(data->req.httpcode < 400) {
- Curl_http_exp100_got100(data);
- if(data->hyp.send_body_waker) {
- hyper_waker_wake(data->hyp.send_body_waker);
- data->hyp.send_body_waker = NULL;
- }
- }
- else { /* >= 4xx */
- Curl_req_abort_sending(data);
- }
- }
- if(data->state.hconnect && (data->req.httpcode/100 != 2) &&
- data->state.authproxy.done) {
- data->req.done = TRUE;
- result = CURLE_OK;
- }
- else
- result = Curl_http_firstwrite(data);
- if(result || data->req.done) {
- infof(data, "Return early from hyper_body_chunk");
- data->state.hresult = result;
- return HYPER_ITER_BREAK;
- }
- }
- result = Curl_client_write(data, CLIENTWRITE_BODY, buf, len);
-
- if(result) {
- data->state.hresult = result;
- return HYPER_ITER_BREAK;
- }
-
- return HYPER_ITER_CONTINUE;
-}
-
-/*
- * Hyper does not consider the status line, the first line in an HTTP/1
- * response, to be a header. The libcurl API does. This function sends the
- * status line in the header callback. */
-static CURLcode status_line(struct Curl_easy *data,
- struct connectdata *conn,
- uint16_t http_status,
- int http_version,
- const uint8_t *reason, size_t rlen)
-{
- CURLcode result;
- size_t len;
- const char *vstr;
- int writetype;
- vstr = http_version == HYPER_HTTP_VERSION_1_1 ? "1.1" :
- (http_version == HYPER_HTTP_VERSION_2 ? "2" : "1.0");
-
- /* We need to set 'httpcodeq' for functions that check the response code in
- a single place. */
- data->req.httpcode = http_status;
- data->req.httpversion = http_version == HYPER_HTTP_VERSION_1_1 ? 11 :
- (http_version == HYPER_HTTP_VERSION_2 ? 20 : 10);
- if(data->state.hconnect)
- /* CONNECT */
- data->info.httpproxycode = http_status;
- else {
- conn->httpversion = (unsigned char)data->req.httpversion;
- if(http_version == HYPER_HTTP_VERSION_1_0)
- data->state.httpwant = CURL_HTTP_VERSION_1_0;
-
- result = Curl_http_statusline(data, conn);
- if(result)
- return result;
- }
-
- Curl_dyn_reset(&data->state.headerb);
-
- result = Curl_dyn_addf(&data->state.headerb, "HTTP/%s %03d %.*s\r\n",
- vstr,
- (int)http_status,
- (int)rlen, reason);
- if(result)
- return result;
- len = Curl_dyn_len(&data->state.headerb);
- Curl_debug(data, CURLINFO_HEADER_IN, Curl_dyn_ptr(&data->state.headerb),
- len);
-
- writetype = CLIENTWRITE_HEADER|CLIENTWRITE_STATUS;
- if(data->state.hconnect)
- writetype |= CLIENTWRITE_CONNECT;
- result = Curl_client_write(data, writetype,
- Curl_dyn_ptr(&data->state.headerb), len);
- if(result)
- return result;
-
- result = Curl_bump_headersize(data, len, FALSE);
- return result;
-}
-
-/*
- * Hyper does not pass on the last empty response header. The libcurl API
- * does. This function sends an empty header in the header callback.
- */
-static CURLcode empty_header(struct Curl_easy *data)
-{
- CURLcode result = Curl_http_size(data);
- if(!result) {
- result = hyper_each_header(data, NULL, 0, NULL, 0) ?
- CURLE_WRITE_ERROR : CURLE_OK;
- if(result)
- failf(data, "hyperstream: could not pass blank header");
- /* Hyper does chunked decoding itself. If it was added during
- * response header processing, remove it again. */
- Curl_cwriter_remove_by_name(data, "chunked");
- }
- return result;
-}
-
-CURLcode Curl_hyper_stream(struct Curl_easy *data,
- struct connectdata *conn,
- int *didwhat,
- int select_res)
-{
- hyper_response *resp = NULL;
- uint16_t http_status;
- int http_version;
- hyper_headers *headers = NULL;
- hyper_body *resp_body = NULL;
- struct hyptransfer *h = &data->hyp;
- hyper_task *task;
- hyper_task *foreach;
- const uint8_t *reasonp;
- size_t reason_len;
- CURLcode result = CURLE_OK;
- struct SingleRequest *k = &data->req;
- (void)conn;
-
- if(data->hyp.send_body_waker) {
- /* If there is still something to upload, wake it to give it
- * another try. */
- hyper_waker_wake(data->hyp.send_body_waker);
- data->hyp.send_body_waker = NULL;
- }
-
- if(select_res & CURL_CSELECT_IN) {
- if(h->read_waker)
- hyper_waker_wake(h->read_waker);
- h->read_waker = NULL;
- }
- if(select_res & CURL_CSELECT_OUT) {
- if(h->write_waker)
- hyper_waker_wake(h->write_waker);
- h->write_waker = NULL;
- }
-
- while(1) {
- hyper_task_return_type t;
- task = hyper_executor_poll(h->exec);
- if(!task) {
- *didwhat = KEEP_RECV;
- break;
- }
- t = hyper_task_type(task);
- if(t == HYPER_TASK_ERROR) {
- hyper_error *hypererr = hyper_task_value(task);
- hyper_task_free(task);
- if(data->state.hresult) {
- /* override Hyper's view, might not even be an error */
- result = data->state.hresult;
- infof(data, "hyperstream is done (by early callback)");
- }
- else {
- uint8_t errbuf[256];
- size_t errlen = hyper_error_print(hypererr, errbuf, sizeof(errbuf));
- hyper_code code = hyper_error_code(hypererr);
- failf(data, "Hyper: [%d] %.*s", (int)code, (int)errlen, errbuf);
- switch(code) {
- case HYPERE_ABORTED_BY_CALLBACK:
- result = CURLE_OK;
- goto out;
- case HYPERE_UNEXPECTED_EOF:
- if(!data->req.bytecount)
- result = CURLE_GOT_NOTHING;
- else
- result = CURLE_RECV_ERROR;
- goto out;
- case HYPERE_INVALID_PEER_MESSAGE:
- /* bump headerbytecount to avoid the count remaining at zero and
- appearing to not having read anything from the peer at all */
- data->req.headerbytecount++;
- result = CURLE_UNSUPPORTED_PROTOCOL; /* maybe */
- goto out;
- default:
- result = CURLE_RECV_ERROR;
- goto out;
- }
- }
- data->req.done = TRUE;
- hyper_error_free(hypererr);
- break;
- }
- else if(t == HYPER_TASK_EMPTY) {
- void *userdata = hyper_task_userdata(task);
- hyper_task_free(task);
- if(userdata == (void *)USERDATA_RESP_BODY) {
- /* end of transfer */
- data->req.done = TRUE;
- infof(data, "hyperstream is done");
- if(!k->bodywritten) {
- /* hyper does not always call the body write callback */
- result = Curl_http_firstwrite(data);
- }
- break;
- }
- else {
- /* A background task for hyper; ignore */
- DEBUGF(infof(data, "hyper: some background task done"));
- continue;
- }
- }
- else if(t == HYPER_TASK_RESPONSE) {
- resp = hyper_task_value(task);
- hyper_task_free(task);
-
- *didwhat = KEEP_RECV;
- if(!resp) {
- failf(data, "hyperstream: could not get response");
- result = CURLE_RECV_ERROR;
- goto out;
- }
-
- http_status = hyper_response_status(resp);
- http_version = hyper_response_version(resp);
- reasonp = hyper_response_reason_phrase(resp);
- reason_len = hyper_response_reason_phrase_len(resp);
-
- if(http_status == 417 && Curl_http_exp100_is_selected(data)) {
- infof(data, "Got 417 while waiting for a 100");
- data->state.disableexpect = TRUE;
- data->req.newurl = strdup(data->state.url);
- Curl_req_abort_sending(data);
- }
-
- result = status_line(data, conn,
- http_status, http_version, reasonp, reason_len);
- if(result)
- goto out;
-
- headers = hyper_response_headers(resp);
- if(!headers) {
- failf(data, "hyperstream: could not get response headers");
- result = CURLE_RECV_ERROR;
- goto out;
- }
-
- /* the headers are already received */
- hyper_headers_foreach(headers, hyper_each_header, data);
- if(data->state.hresult) {
- result = data->state.hresult;
- goto out;
- }
-
- result = empty_header(data);
- if(result)
- goto out;
-
- k->deductheadercount =
- (100 <= http_status && 199 >= http_status) ? k->headerbytecount : 0;
-#ifndef CURL_DISABLE_WEBSOCKETS
- if(k->upgr101 == UPGR101_WS) {
- if(http_status == 101) {
- /* verify the response */
- result = Curl_ws_accept(data, NULL, 0);
- if(result)
- goto out;
- }
- else {
- failf(data, "Expected 101, got %u", k->httpcode);
- result = CURLE_HTTP_RETURNED_ERROR;
- goto out;
- }
- }
-#endif
-
- /* Curl_http_auth_act() checks what authentication methods that are
- * available and decides which one (if any) to use. It will set 'newurl'
- * if an auth method was picked. */
- result = Curl_http_auth_act(data);
- if(result)
- goto out;
-
- resp_body = hyper_response_body(resp);
- if(!resp_body) {
- failf(data, "hyperstream: could not get response body");
- result = CURLE_RECV_ERROR;
- goto out;
- }
- foreach = hyper_body_foreach(resp_body, hyper_body_chunk, data);
- if(!foreach) {
- failf(data, "hyperstream: body foreach failed");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- hyper_task_set_userdata(foreach, (void *)USERDATA_RESP_BODY);
- if(HYPERE_OK != hyper_executor_push(h->exec, foreach)) {
- failf(data, "Couldn't hyper_executor_push the body-foreach");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
-
- hyper_response_free(resp);
- resp = NULL;
- }
- else {
- DEBUGF(infof(data, "hyper: unhandled tasktype %x", t));
- }
- } /* while(1) */
-
- if(!result && Curl_xfer_needs_flush(data)) {
- DEBUGF(infof(data, "Curl_hyper_stream(), connection needs flush"));
- result = Curl_xfer_flush(data);
- }
-
-out:
- DEBUGF(infof(data, "Curl_hyper_stream() -> %d", result));
- if(resp)
- hyper_response_free(resp);
- return result;
-}
-
-static CURLcode debug_request(struct Curl_easy *data,
- const char *method,
- const char *path)
-{
- char *req = aprintf("%s %s HTTP/1.1\r\n", method, path);
- if(!req)
- return CURLE_OUT_OF_MEMORY;
- Curl_debug(data, CURLINFO_HEADER_OUT, req, strlen(req));
- free(req);
- return CURLE_OK;
-}
-
-/*
- * Given a full header line "name: value" (optional CRLF in the input, should
- * be in the output), add to Hyper and send to the debug callback.
- *
- * Supports multiple headers.
- */
-
-CURLcode Curl_hyper_header(struct Curl_easy *data, hyper_headers *headers,
- const char *line)
-{
- const char *p;
- const char *n;
- size_t nlen;
- const char *v;
- size_t vlen;
- bool newline = TRUE;
- int numh = 0;
-
- if(!line)
- return CURLE_OK;
- n = line;
- do {
- size_t linelen = 0;
-
- p = strchr(n, ':');
- if(!p)
- /* this is fine if we already added at least one header */
- return numh ? CURLE_OK : CURLE_BAD_FUNCTION_ARGUMENT;
- nlen = p - n;
- p++; /* move past the colon */
- while(*p == ' ')
- p++;
- v = p;
- p = strchr(v, '\r');
- if(!p) {
- p = strchr(v, '\n');
- if(p)
- linelen = 1; /* LF only */
- else {
- p = strchr(v, '\0');
- newline = FALSE; /* no newline */
- }
- }
- else
- linelen = 2; /* CRLF ending */
- linelen += (p - n);
- vlen = p - v;
-
- if(HYPERE_OK != hyper_headers_add(headers, (uint8_t *)n, nlen,
- (uint8_t *)v, vlen)) {
- failf(data, "hyper refused to add header '%s'", line);
- return CURLE_OUT_OF_MEMORY;
- }
- if(data->set.verbose) {
- char *ptr = NULL;
- if(!newline) {
- ptr = aprintf("%.*s\r\n", (int)linelen, line);
- if(!ptr)
- return CURLE_OUT_OF_MEMORY;
- Curl_debug(data, CURLINFO_HEADER_OUT, ptr, linelen + 2);
- free(ptr);
- }
- else
- Curl_debug(data, CURLINFO_HEADER_OUT, (char *)n, linelen);
- }
- numh++;
- n += linelen;
- } while(newline);
- return CURLE_OK;
-}
-
-static CURLcode request_target(struct Curl_easy *data,
- struct connectdata *conn,
- const char *method,
- hyper_request *req)
-{
- CURLcode result;
- struct dynbuf r;
-
- Curl_dyn_init(&r, DYN_HTTP_REQUEST);
-
- result = Curl_http_target(data, conn, &r);
- if(result)
- return result;
-
- if(hyper_request_set_uri(req, (uint8_t *)Curl_dyn_uptr(&r),
- Curl_dyn_len(&r))) {
- failf(data, "error setting uri to hyper");
- result = CURLE_OUT_OF_MEMORY;
- }
- else
- result = debug_request(data, method, Curl_dyn_ptr(&r));
-
- Curl_dyn_free(&r);
-
- return result;
-}
-
-static int uploadstreamed(void *userdata, hyper_context *ctx,
- hyper_buf **chunk)
-{
- size_t fillcount;
- struct Curl_easy *data = (struct Curl_easy *)userdata;
- CURLcode result;
- char *xfer_ulbuf;
- size_t xfer_ulblen;
- bool eos;
- int rc = HYPER_POLL_ERROR;
- (void)ctx;
-
- result = Curl_multi_xfer_ulbuf_borrow(data, &xfer_ulbuf, &xfer_ulblen);
- if(result)
- goto out;
-
- result = Curl_client_read(data, xfer_ulbuf, xfer_ulblen, &fillcount, &eos);
- if(result)
- goto out;
-
- if(fillcount) {
- hyper_buf *copy = hyper_buf_copy((uint8_t *)xfer_ulbuf, fillcount);
- if(copy)
- *chunk = copy;
- else {
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- /* increasing the writebytecount here is a little premature but we
- do not know exactly when the body is sent */
- data->req.writebytecount += fillcount;
- if(eos)
- data->req.eos_read = TRUE;
- Curl_pgrsSetUploadCounter(data, data->req.writebytecount);
- rc = HYPER_POLL_READY;
- }
- else if(eos) {
- data->req.eos_read = TRUE;
- *chunk = NULL;
- rc = HYPER_POLL_READY;
- }
- else {
- /* paused, save a waker */
- if(data->hyp.send_body_waker)
- hyper_waker_free(data->hyp.send_body_waker);
- data->hyp.send_body_waker = hyper_context_waker(ctx);
- rc = HYPER_POLL_PENDING;
- }
-
- if(!data->req.upload_done && data->req.eos_read) {
- DEBUGF(infof(data, "hyper: uploadstreamed(), upload is done"));
- result = Curl_req_set_upload_done(data);
- }
-
-out:
- Curl_multi_xfer_ulbuf_release(data, xfer_ulbuf);
- data->state.hresult = result;
- DEBUGF(infof(data, "hyper: uploadstreamed() -> %d", result));
- return rc;
-}
-
-/*
- * finalize_request() sets up last headers and optional body settings
- */
-static CURLcode finalize_request(struct Curl_easy *data,
- hyper_headers *headers,
- hyper_request *hyperreq,
- Curl_HttpReq httpreq)
-{
- CURLcode result = CURLE_OK;
- struct dynbuf req;
- if((httpreq == HTTPREQ_GET) || (httpreq == HTTPREQ_HEAD)) {
- Curl_pgrsSetUploadSize(data, 0); /* no request body */
- }
- else {
- hyper_body *body;
- Curl_dyn_init(&req, DYN_HTTP_REQUEST);
- result = Curl_http_req_complete(data, &req, httpreq);
- if(result)
- return result;
-
- /* if the "complete" above did produce more than the closing line,
- parse the added headers */
- if(Curl_dyn_len(&req) != 2 || strcmp(Curl_dyn_ptr(&req), "\r\n")) {
- result = Curl_hyper_header(data, headers, Curl_dyn_ptr(&req));
- if(result)
- return result;
- }
-
- Curl_dyn_free(&req);
-
- body = hyper_body_new();
- hyper_body_set_userdata(body, data);
- hyper_body_set_data_func(body, uploadstreamed);
-
- if(HYPERE_OK != hyper_request_set_body(hyperreq, body)) {
- /* fail */
- result = CURLE_OUT_OF_MEMORY;
- }
- }
-
- return cr_hyper_add(data);
-}
-
-static CURLcode cookies(struct Curl_easy *data,
- struct connectdata *conn,
- hyper_headers *headers)
-{
- struct dynbuf req;
- CURLcode result;
- Curl_dyn_init(&req, DYN_HTTP_REQUEST);
-
- result = Curl_http_cookies(data, conn, &req);
- if(!result)
- result = Curl_hyper_header(data, headers, Curl_dyn_ptr(&req));
- Curl_dyn_free(&req);
- return result;
-}
-
-/* called on 1xx responses */
-static void http1xx_cb(void *arg, struct hyper_response *resp)
-{
- struct Curl_easy *data = (struct Curl_easy *)arg;
- hyper_headers *headers = NULL;
- CURLcode result = CURLE_OK;
- uint16_t http_status;
- int http_version;
- const uint8_t *reasonp;
- size_t reason_len;
-
- infof(data, "Got HTTP 1xx informational");
-
- http_status = hyper_response_status(resp);
- http_version = hyper_response_version(resp);
- reasonp = hyper_response_reason_phrase(resp);
- reason_len = hyper_response_reason_phrase_len(resp);
-
- result = status_line(data, data->conn,
- http_status, http_version, reasonp, reason_len);
- if(!result) {
- headers = hyper_response_headers(resp);
- if(!headers) {
- failf(data, "hyperstream: could not get 1xx response headers");
- result = CURLE_RECV_ERROR;
- }
- }
- data->state.hresult = result;
-
- if(!result) {
- /* the headers are already received */
- hyper_headers_foreach(headers, hyper_each_header, data);
- /* this callback also sets data->state.hresult on error */
-
- if(empty_header(data))
- result = CURLE_OUT_OF_MEMORY;
- }
-
- if(data->state.hresult)
- infof(data, "ERROR in 1xx, bail out");
-}
-
-/*
- * Curl_http() gets called from the generic multi_do() function when an HTTP
- * request is to be performed. This creates and sends a properly constructed
- * HTTP request.
- */
-CURLcode Curl_http(struct Curl_easy *data, bool *done)
-{
- struct connectdata *conn = data->conn;
- struct hyptransfer *h = &data->hyp;
- hyper_io *io = NULL;
- hyper_clientconn_options *options = NULL;
- hyper_task *task = NULL; /* for the handshake */
- hyper_task *sendtask = NULL; /* for the send */
- hyper_clientconn *client = NULL;
- hyper_request *req = NULL;
- hyper_headers *headers = NULL;
- hyper_task *handshake = NULL;
- CURLcode result;
- const char *p_accept; /* Accept: string */
- const char *method;
- Curl_HttpReq httpreq;
- const char *te = NULL; /* transfer-encoding */
- hyper_code rc;
-
- /* Always consider the DO phase done after this function call, even if there
- may be parts of the request that is not yet sent, since we can deal with
- the rest of the request in the PERFORM phase. */
- *done = TRUE;
- result = Curl_client_start(data);
- if(result)
- goto out;
-
- /* Add collecting of headers written to client. For a new connection,
- * we might have done that already, but reuse
- * or multiplex needs it here as well. */
- result = Curl_headers_init(data);
- if(result)
- goto out;
-
- infof(data, "Time for the Hyper dance");
- memset(h, 0, sizeof(struct hyptransfer));
-
- result = Curl_http_host(data, conn);
- if(result)
- goto out;
-
- Curl_http_method(data, conn, &method, &httpreq);
-
- DEBUGASSERT(data->req.bytecount == 0);
-
- /* setup the authentication headers */
- {
- char *pq = NULL;
- if(data->state.up.query) {
- pq = aprintf("%s?%s", data->state.up.path, data->state.up.query);
- if(!pq) {
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- }
- result = Curl_http_output_auth(data, conn, method, httpreq,
- (pq ? pq : data->state.up.path), FALSE);
- free(pq);
- if(result)
- goto out;
- }
-
- result = Curl_http_req_set_reader(data, httpreq, &te);
- if(result)
- goto out;
-
- result = Curl_http_range(data, httpreq);
- if(result)
- goto out;
-
- result = Curl_http_useragent(data);
- if(result)
- goto out;
-
- io = hyper_io_new();
- if(!io) {
- failf(data, "Couldn't create hyper IO");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- /* tell Hyper how to read/write network data */
- h->io_ctx.data = data;
- h->io_ctx.sockindex = FIRSTSOCKET;
- hyper_io_set_userdata(io, &h->io_ctx);
- hyper_io_set_read(io, Curl_hyper_recv);
- hyper_io_set_write(io, Curl_hyper_send);
-
- /* create an executor to poll futures */
- if(!h->exec) {
- h->exec = hyper_executor_new();
- if(!h->exec) {
- failf(data, "Couldn't create hyper executor");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- }
-
- options = hyper_clientconn_options_new();
- if(!options) {
- failf(data, "Couldn't create hyper client options");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- if(conn->alpn == CURL_HTTP_VERSION_2) {
- failf(data, "ALPN protocol h2 not supported with Hyper");
- result = CURLE_UNSUPPORTED_PROTOCOL;
- goto out;
- }
- hyper_clientconn_options_set_preserve_header_case(options, 1);
- hyper_clientconn_options_set_preserve_header_order(options, 1);
- hyper_clientconn_options_http1_allow_multiline_headers(options, 1);
-
- hyper_clientconn_options_exec(options, h->exec);
-
- /* "Both the `io` and the `options` are consumed in this function call" */
- handshake = hyper_clientconn_handshake(io, options);
- if(!handshake) {
- failf(data, "Couldn't create hyper client handshake");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- io = NULL;
- options = NULL;
-
- if(HYPERE_OK != hyper_executor_push(h->exec, handshake)) {
- failf(data, "Couldn't hyper_executor_push the handshake");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- handshake = NULL; /* ownership passed on */
-
- task = hyper_executor_poll(h->exec);
- if(!task) {
- failf(data, "Couldn't hyper_executor_poll the handshake");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
-
- client = hyper_task_value(task);
- hyper_task_free(task);
-
- req = hyper_request_new();
- if(!req) {
- failf(data, "Couldn't hyper_request_new");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
-
- if(!Curl_use_http_1_1plus(data, conn)) {
- if(HYPERE_OK != hyper_request_set_version(req,
- HYPER_HTTP_VERSION_1_0)) {
- failf(data, "error setting HTTP version");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- }
-
- if(hyper_request_set_method(req, (uint8_t *)method, strlen(method))) {
- failf(data, "error setting method");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
-
- result = request_target(data, conn, method, req);
- if(result)
- goto out;
-
- headers = hyper_request_headers(req);
- if(!headers) {
- failf(data, "hyper_request_headers");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
-
- rc = hyper_request_on_informational(req, http1xx_cb, data);
- if(rc) {
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
-
- if(data->state.aptr.host) {
- result = Curl_hyper_header(data, headers, data->state.aptr.host);
- if(result)
- goto out;
- }
-
-#ifndef CURL_DISABLE_PROXY
- if(data->state.aptr.proxyuserpwd) {
- result = Curl_hyper_header(data, headers, data->state.aptr.proxyuserpwd);
- if(result)
- goto out;
- }
-#endif
-
- if(data->state.aptr.userpwd) {
- result = Curl_hyper_header(data, headers, data->state.aptr.userpwd);
- if(result)
- goto out;
- }
-
- if((data->state.use_range && data->state.aptr.rangeline)) {
- result = Curl_hyper_header(data, headers, data->state.aptr.rangeline);
- if(result)
- goto out;
- }
-
- if(data->set.str[STRING_USERAGENT] &&
- *data->set.str[STRING_USERAGENT] &&
- data->state.aptr.uagent) {
- result = Curl_hyper_header(data, headers, data->state.aptr.uagent);
- if(result)
- goto out;
- }
-
- p_accept = Curl_checkheaders(data,
- STRCONST("Accept")) ? NULL : "Accept: */*\r\n";
- if(p_accept) {
- result = Curl_hyper_header(data, headers, p_accept);
- if(result)
- goto out;
- }
- if(te) {
- result = Curl_hyper_header(data, headers, te);
- if(result)
- goto out;
- }
-
-#ifndef CURL_DISABLE_ALTSVC
- if(conn->bits.altused && !Curl_checkheaders(data, STRCONST("Alt-Used"))) {
- char *altused = aprintf("Alt-Used: %s:%d\r\n",
- conn->conn_to_host.name, conn->conn_to_port);
- if(!altused) {
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- result = Curl_hyper_header(data, headers, altused);
- if(result)
- goto out;
- free(altused);
- }
-#endif
-
-#ifndef CURL_DISABLE_PROXY
- if(conn->bits.httpproxy && !conn->bits.tunnel_proxy &&
- !Curl_checkheaders(data, STRCONST("Proxy-Connection")) &&
- !Curl_checkProxyheaders(data, conn, STRCONST("Proxy-Connection"))) {
- result = Curl_hyper_header(data, headers, "Proxy-Connection: Keep-Alive");
- if(result)
- goto out;
- }
-#endif
-
- Curl_safefree(data->state.aptr.ref);
- if(data->state.referer && !Curl_checkheaders(data, STRCONST("Referer"))) {
- data->state.aptr.ref = aprintf("Referer: %s\r\n", data->state.referer);
- if(!data->state.aptr.ref)
- result = CURLE_OUT_OF_MEMORY;
- else
- result = Curl_hyper_header(data, headers, data->state.aptr.ref);
- if(result)
- goto out;
- }
-
-#ifdef HAVE_LIBZ
- /* we only consider transfer-encoding magic if libz support is built-in */
- result = Curl_transferencode(data);
- if(result)
- goto out;
- result = Curl_hyper_header(data, headers, data->state.aptr.te);
- if(result)
- goto out;
-#endif
-
- if(!Curl_checkheaders(data, STRCONST("Accept-Encoding")) &&
- data->set.str[STRING_ENCODING]) {
- Curl_safefree(data->state.aptr.accept_encoding);
- data->state.aptr.accept_encoding =
- aprintf("Accept-Encoding: %s\r\n", data->set.str[STRING_ENCODING]);
- if(!data->state.aptr.accept_encoding)
- result = CURLE_OUT_OF_MEMORY;
- else
- result = Curl_hyper_header(data, headers,
- data->state.aptr.accept_encoding);
- if(result)
- goto out;
- }
- else
- Curl_safefree(data->state.aptr.accept_encoding);
-
- result = cookies(data, conn, headers);
- if(result)
- goto out;
-
- if(!result && conn->handler->protocol&(CURLPROTO_WS|CURLPROTO_WSS))
- result = Curl_ws_request(data, headers);
-
- result = Curl_add_timecondition(data, headers);
- if(result)
- goto out;
-
- result = Curl_add_custom_headers(data, FALSE, headers);
- if(result)
- goto out;
-
- result = finalize_request(data, headers, req, httpreq);
- if(result)
- goto out;
-
- Curl_debug(data, CURLINFO_HEADER_OUT, (char *)"\r\n", 2);
-
- if(data->req.upload_chunky && data->req.authneg) {
- data->req.upload_chunky = TRUE;
- }
- else {
- data->req.upload_chunky = FALSE;
- }
- sendtask = hyper_clientconn_send(client, req);
- if(!sendtask) {
- failf(data, "hyper_clientconn_send");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- req = NULL;
-
- if(HYPERE_OK != hyper_executor_push(h->exec, sendtask)) {
- failf(data, "Couldn't hyper_executor_push the send");
- result = CURLE_OUT_OF_MEMORY;
- goto out;
- }
- sendtask = NULL; /* ownership passed on */
-
- hyper_clientconn_free(client);
- client = NULL;
-
- if((httpreq == HTTPREQ_GET) || (httpreq == HTTPREQ_HEAD)) {
- /* HTTP GET/HEAD download */
- Curl_pgrsSetUploadSize(data, 0); /* nothing */
- result = Curl_req_set_upload_done(data);
- if(result)
- goto out;
- }
-
- Curl_xfer_setup1(data, CURL_XFER_SENDRECV, -1, TRUE);
- conn->datastream = Curl_hyper_stream;
-
- /* clear userpwd and proxyuserpwd to avoid reusing old credentials
- * from reused connections */
- Curl_safefree(data->state.aptr.userpwd);
-#ifndef CURL_DISABLE_PROXY
- Curl_safefree(data->state.aptr.proxyuserpwd);
-#endif
-
-out:
- if(result) {
- if(io)
- hyper_io_free(io);
- if(options)
- hyper_clientconn_options_free(options);
- if(handshake)
- hyper_task_free(handshake);
- if(client)
- hyper_clientconn_free(client);
- if(req)
- hyper_request_free(req);
- }
- return result;
-}
-
-void Curl_hyper_done(struct Curl_easy *data)
-{
- struct hyptransfer *h = &data->hyp;
- if(h->exec) {
- hyper_executor_free(h->exec);
- h->exec = NULL;
- }
- if(h->read_waker) {
- hyper_waker_free(h->read_waker);
- h->read_waker = NULL;
- }
- if(h->write_waker) {
- hyper_waker_free(h->write_waker);
- h->write_waker = NULL;
- }
- if(h->send_body_waker) {
- hyper_waker_free(h->send_body_waker);
- h->send_body_waker = NULL;
- }
-}
-
-static CURLcode cr_hyper_unpause(struct Curl_easy *data,
- struct Curl_creader *reader)
-{
- (void)reader;
- if(data->hyp.send_body_waker) {
- hyper_waker_wake(data->hyp.send_body_waker);
- data->hyp.send_body_waker = NULL;
- }
- return CURLE_OK;
-}
-
-/* Hyper client reader, handling unpausing */
-static const struct Curl_crtype cr_hyper_protocol = {
- "cr-hyper",
- Curl_creader_def_init,
- Curl_creader_def_read,
- Curl_creader_def_close,
- Curl_creader_def_needs_rewind,
- Curl_creader_def_total_length,
- Curl_creader_def_resume_from,
- Curl_creader_def_rewind,
- cr_hyper_unpause,
- Curl_creader_def_is_paused,
- Curl_creader_def_done,
- sizeof(struct Curl_creader)
-};
-
-static CURLcode cr_hyper_add(struct Curl_easy *data)
-{
- struct Curl_creader *reader = NULL;
- CURLcode result;
-
- result = Curl_creader_create(&reader, data, &cr_hyper_protocol,
- CURL_CR_PROTOCOL);
- if(!result)
- result = Curl_creader_add(data, reader);
-
- if(result && reader)
- Curl_creader_free(data, reader);
- return result;
-}
-
-#endif /* !defined(CURL_DISABLE_HTTP) && defined(USE_HYPER) */
+++ /dev/null
-#ifndef HEADER_CURL_HYPER_H
-#define HEADER_CURL_HYPER_H
-/***************************************************************************
- * _ _ ____ _
- * 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.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.
- *
- * SPDX-License-Identifier: curl
- *
- ***************************************************************************/
-#include "curl_setup.h"
-
-#if !defined(CURL_DISABLE_HTTP) && defined(USE_HYPER)
-
-#include <hyper.h>
-
-struct hyp_io_ctx {
- struct Curl_easy *data;
- int sockindex;
-};
-
-/* per-transfer data for the Hyper backend */
-struct hyptransfer {
- hyper_waker *write_waker;
- hyper_waker *read_waker;
- const hyper_executor *exec;
- hyper_waker *send_body_waker;
- struct hyp_io_ctx io_ctx;
-};
-
-size_t Curl_hyper_recv(void *userp, hyper_context *ctx,
- uint8_t *buf, size_t buflen);
-size_t Curl_hyper_send(void *userp, hyper_context *ctx,
- const uint8_t *buf, size_t buflen);
-CURLcode Curl_hyper_stream(struct Curl_easy *data,
- struct connectdata *conn,
- int *didwhat,
- int select_res);
-
-CURLcode Curl_hyper_header(struct Curl_easy *data, hyper_headers *headers,
- const char *line);
-void Curl_hyper_done(struct Curl_easy *);
-
-#else
-#define Curl_hyper_done(x)
-
-#endif /* !defined(CURL_DISABLE_HTTP) && defined(USE_HYPER) */
-#endif /* HEADER_CURL_HYPER_H */
#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
#include <curl/curl.h>
-#ifdef USE_HYPER
-#include <hyper.h>
-#endif
#include "urldata.h"
#include "dynbuf.h"
#include "sendf.h"
make sure that it is not accidentally used for the document request
after we have connected. So let's free and clear it here. */
Curl_safefree(data->state.aptr.proxyuserpwd);
-#ifdef USE_HYPER
- data->state.hconnect = FALSE;
-#endif
break;
}
}
return (ts->tunnel_state == H1_TUNNEL_CONNECT);
}
-#ifndef USE_HYPER
static CURLcode start_CONNECT(struct Curl_cfilter *cf,
struct Curl_easy *data,
struct h1_tunnel_state *ts)
return result;
}
-#else /* USE_HYPER */
-
-static CURLcode CONNECT_host(struct Curl_cfilter *cf,
- struct Curl_easy *data,
- char **pauthority,
- char **phost_header)
-{
- const char *hostname;
- int port;
- bool ipv6_ip;
- CURLcode result;
- char *authority; /* for CONNECT, the destination host + port */
- char *host_header = NULL; /* Host: authority */
-
- result = Curl_http_proxy_get_destination(cf, &hostname, &port, &ipv6_ip);
- if(result)
- return result;
-
- authority = aprintf("%s%s%s:%d", ipv6_ip ? "[":"", hostname,
- ipv6_ip ? "]" : "", port);
- if(!authority)
- return CURLE_OUT_OF_MEMORY;
-
- /* If user is not overriding the Host header later */
- if(!Curl_checkProxyheaders(data, cf->conn, STRCONST("Host"))) {
- host_header = aprintf("Host: %s\r\n", authority);
- if(!host_header) {
- free(authority);
- return CURLE_OUT_OF_MEMORY;
- }
- }
- *pauthority = authority;
- *phost_header = host_header;
- return CURLE_OK;
-}
-
-/* The Hyper version of CONNECT */
-static CURLcode start_CONNECT(struct Curl_cfilter *cf,
- struct Curl_easy *data,
- struct h1_tunnel_state *ts)
-{
- struct connectdata *conn = cf->conn;
- struct hyptransfer *h = &data->hyp;
- curl_socket_t tunnelsocket = Curl_conn_cf_get_socket(cf, data);
- hyper_io *io = NULL;
- hyper_request *req = NULL;
- hyper_headers *headers = NULL;
- hyper_clientconn_options *options = NULL;
- hyper_task *handshake = NULL;
- hyper_task *task = NULL; /* for the handshake */
- hyper_clientconn *client = NULL;
- hyper_task *sendtask = NULL; /* for the send */
- char *authority = NULL; /* for CONNECT */
- char *host_header = NULL; /* Host: */
- CURLcode result = CURLE_OUT_OF_MEMORY;
- (void)ts;
-
- io = hyper_io_new();
- if(!io) {
- failf(data, "Couldn't create hyper IO");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- /* tell Hyper how to read/write network data */
- h->io_ctx.data = data;
- h->io_ctx.sockindex = cf->sockindex;
- hyper_io_set_userdata(io, &h->io_ctx);
- hyper_io_set_read(io, Curl_hyper_recv);
- hyper_io_set_write(io, Curl_hyper_send);
- conn->sockfd = tunnelsocket;
-
- data->state.hconnect = TRUE;
-
- /* create an executor to poll futures */
- if(!h->exec) {
- h->exec = hyper_executor_new();
- if(!h->exec) {
- failf(data, "Couldn't create hyper executor");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- }
-
- options = hyper_clientconn_options_new();
- if(!options) {
- failf(data, "Couldn't create hyper client options");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- hyper_clientconn_options_set_preserve_header_case(options, 1);
- hyper_clientconn_options_set_preserve_header_order(options, 1);
-
- hyper_clientconn_options_exec(options, h->exec);
-
- /* "Both the `io` and the `options` are consumed in this function
- call" */
- handshake = hyper_clientconn_handshake(io, options);
- if(!handshake) {
- failf(data, "Couldn't create hyper client handshake");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- io = NULL;
- options = NULL;
-
- if(HYPERE_OK != hyper_executor_push(h->exec, handshake)) {
- failf(data, "Couldn't hyper_executor_push the handshake");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- handshake = NULL; /* ownership passed on */
-
- task = hyper_executor_poll(h->exec);
- if(!task) {
- failf(data, "Couldn't hyper_executor_poll the handshake");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
-
- client = hyper_task_value(task);
- hyper_task_free(task);
-
- req = hyper_request_new();
- if(!req) {
- failf(data, "Couldn't hyper_request_new");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- if(hyper_request_set_method(req, (uint8_t *)"CONNECT",
- strlen("CONNECT"))) {
- failf(data, "error setting method");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
-
- /* This only happens if we have looped here due to authentication
- reasons, and we do not really use the newly cloned URL here
- then. Just free() it. */
- Curl_safefree(data->req.newurl);
-
- result = CONNECT_host(cf, data, &authority, &host_header);
- if(result)
- goto error;
-
- infof(data, "Establish HTTP proxy tunnel to %s", authority);
-
- if(hyper_request_set_uri(req, (uint8_t *)authority,
- strlen(authority))) {
- failf(data, "error setting path");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- if(data->set.verbose) {
- char *se = aprintf("CONNECT %s HTTP/1.1\r\n", authority);
- if(!se) {
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- Curl_debug(data, CURLINFO_HEADER_OUT, se, strlen(se));
- free(se);
- }
- /* Setup the proxy-authorization header, if any */
- result = Curl_http_output_auth(data, conn, "CONNECT", HTTPREQ_GET,
- authority, TRUE);
- if(result)
- goto error;
- Curl_safefree(authority);
-
- /* default is 1.1 */
- if((conn->http_proxy.proxytype == CURLPROXY_HTTP_1_0) &&
- (HYPERE_OK != hyper_request_set_version(req,
- HYPER_HTTP_VERSION_1_0))) {
- failf(data, "error setting HTTP version");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
-
- headers = hyper_request_headers(req);
- if(!headers) {
- failf(data, "hyper_request_headers");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- if(host_header) {
- result = Curl_hyper_header(data, headers, host_header);
- if(result)
- goto error;
- Curl_safefree(host_header);
- }
-
- if(data->state.aptr.proxyuserpwd) {
- result = Curl_hyper_header(data, headers,
- data->state.aptr.proxyuserpwd);
- if(result)
- goto error;
- }
-
- if(!Curl_checkProxyheaders(data, conn, STRCONST("User-Agent")) &&
- data->set.str[STRING_USERAGENT] && *data->set.str[STRING_USERAGENT]) {
- struct dynbuf ua;
- Curl_dyn_init(&ua, DYN_HTTP_REQUEST);
- result = Curl_dyn_addf(&ua, "User-Agent: %s\r\n",
- data->set.str[STRING_USERAGENT]);
- if(result)
- goto error;
- result = Curl_hyper_header(data, headers, Curl_dyn_ptr(&ua));
- if(result)
- goto error;
- Curl_dyn_free(&ua);
- }
-
- if(!Curl_checkProxyheaders(data, conn, STRCONST("Proxy-Connection"))) {
- result = Curl_hyper_header(data, headers,
- "Proxy-Connection: Keep-Alive");
- if(result)
- goto error;
- }
-
- result = Curl_add_custom_headers(data, TRUE, headers);
- if(result)
- goto error;
-
- result = Curl_creader_set_null(data);
- if(result)
- goto error;
-
- sendtask = hyper_clientconn_send(client, req);
- if(!sendtask) {
- failf(data, "hyper_clientconn_send");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- req = NULL;
-
- if(HYPERE_OK != hyper_executor_push(h->exec, sendtask)) {
- failf(data, "Couldn't hyper_executor_push the send");
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- sendtask = NULL; /* ownership passed on */
-
- hyper_clientconn_free(client);
- client = NULL;
-
-error:
- free(host_header);
- free(authority);
- if(io)
- hyper_io_free(io);
- if(options)
- hyper_clientconn_options_free(options);
- if(handshake)
- hyper_task_free(handshake);
- if(client)
- hyper_clientconn_free(client);
- if(req)
- hyper_request_free(req);
-
- return result;
-}
-
-static CURLcode send_CONNECT(struct Curl_cfilter *cf,
- struct Curl_easy *data,
- struct h1_tunnel_state *ts,
- bool *done)
-{
- struct hyptransfer *h = &data->hyp;
- struct connectdata *conn = cf->conn;
- hyper_task *task = NULL;
- hyper_error *hypererr = NULL;
- CURLcode result = CURLE_OK;
-
- (void)ts;
- (void)conn;
- do {
- task = hyper_executor_poll(h->exec);
- if(task) {
- bool error = hyper_task_type(task) == HYPER_TASK_ERROR;
- if(error)
- hypererr = hyper_task_value(task);
- hyper_task_free(task);
- if(error) {
- /* this could probably use a better error code? */
- result = CURLE_OUT_OF_MEMORY;
- goto error;
- }
- }
- } while(task);
-error:
- *done = (result == CURLE_OK);
- if(hypererr) {
- uint8_t errbuf[256];
- size_t errlen = hyper_error_print(hypererr, errbuf, sizeof(errbuf));
- failf(data, "Hyper: %.*s", (int)errlen, errbuf);
- hyper_error_free(hypererr);
- }
- return result;
-}
-
-static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,
- struct Curl_easy *data,
- struct h1_tunnel_state *ts,
- bool *done)
-{
- struct hyptransfer *h = &data->hyp;
- CURLcode result;
- int didwhat;
-
- (void)ts;
- result = Curl_hyper_stream(data, cf->conn, &didwhat,
- CURL_CSELECT_IN | CURL_CSELECT_OUT);
- *done = data->req.done;
- if(result || !*done)
- return result;
- if(h->exec) {
- hyper_executor_free(h->exec);
- h->exec = NULL;
- }
- if(h->read_waker) {
- hyper_waker_free(h->read_waker);
- h->read_waker = NULL;
- }
- if(h->write_waker) {
- hyper_waker_free(h->write_waker);
- h->write_waker = NULL;
- }
- return result;
-}
-
-#endif /* USE_HYPER */
-
static CURLcode H1_CONNECT(struct Curl_cfilter *cf,
struct Curl_easy *data,
struct h1_tunnel_state *ts)
#include "curl_setup.h"
-#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER)
+#if !defined(CURL_DISABLE_HTTP)
#include "urldata.h"
#include <curl/curl.h>
return result;
}
-#endif /* !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER) */
+#endif /* !defined(CURL_DISABLE_HTTP) */
***************************************************************************/
#include "curl_setup.h"
-#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER)
+#if !defined(CURL_DISABLE_HTTP)
struct Curl_cfilter;
struct Curl_easy;
const struct Curl_dns_entry *remotehost);
-#endif /* !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER) */
+#endif /* !defined(CURL_DISABLE_HTTP) */
#endif /* HEADER_CURL_CF_HTTP_H */
DEBUGASSERT(data);
DEBUGASSERT(conn->handler);
-#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER)
+#if !defined(CURL_DISABLE_HTTP)
if(!conn->cfilter[sockindex] &&
conn->handler->protocol == CURLPROTO_HTTPS) {
DEBUGASSERT(ssl_mode != CURL_CF_SSL_DISABLE);
if(result)
goto out;
}
-#endif /* !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER) */
+#endif /* !defined(CURL_DISABLE_HTTP) */
/* Still no cfilter set, apply default. */
if(!conn->cfilter[sockindex]) {
#define UNITTEST static
#endif
-/* Hyper supports HTTP2 also, but Curl's integration with Hyper does not */
#if defined(USE_NGHTTP2)
#define USE_HTTP2
#endif
#ifdef USE_HTTP3
{ &Curl_cft_http3, TRC_CT_PROTOCOL },
#endif
-#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER)
+#if !defined(CURL_DISABLE_HTTP)
{ &Curl_cft_http_connect, TRC_CT_PROTOCOL },
#endif
};
#include <sys/param.h>
#endif
-#ifdef USE_HYPER
-#include <hyper.h>
-#endif
-
#include "urldata.h"
#include <curl/curl.h>
#include "transfer.h"
#include "altsvc.h"
#include "hsts.h"
#include "ws.h"
-#include "c-hyper.h"
#include "curl_ctype.h"
/* The last 3 #include files should be in this order */
static bool http_exp100_is_waiting(struct Curl_easy *data);
static CURLcode http_exp100_add_reader(struct Curl_easy *data);
static void http_exp100_send_anyway(struct Curl_easy *data);
+static bool http_exp100_is_selected(struct Curl_easy *data);
+static void http_exp100_got100(struct Curl_easy *data);
+static CURLcode http_firstwrite(struct Curl_easy *data);
+static CURLcode http_header(struct Curl_easy *data,
+ const char *hd, size_t hdlen);
+static CURLcode http_host(struct Curl_easy *data, struct connectdata *conn);
+static CURLcode http_range(struct Curl_easy *data,
+ Curl_HttpReq httpreq);
+static CURLcode http_req_complete(struct Curl_easy *data,
+ struct dynbuf *r, Curl_HttpReq httpreq);
+static CURLcode http_req_set_reader(struct Curl_easy *data,
+ Curl_HttpReq httpreq,
+ const char **tep);
+static CURLcode http_size(struct Curl_easy *data);
+static CURLcode http_statusline(struct Curl_easy *data,
+ struct connectdata *conn);
+static CURLcode http_target(struct Curl_easy *data, struct connectdata *conn,
+ struct dynbuf *req);
+static CURLcode http_useragent(struct Curl_easy *data);
+#ifdef HAVE_LIBZ
+static CURLcode http_transferencode(struct Curl_easy *data);
+#endif
+static bool use_http_1_1plus(const struct Curl_easy *data,
+ const struct connectdata *conn);
+
/*
* HTTP handler interface.
data->state.authproxy.multipass = FALSE;
Curl_dyn_reset(&data->state.headerb);
- Curl_hyper_done(data);
if(status)
return status;
* - if any server previously contacted to handle this request only supports
* 1.0.
*/
-bool Curl_use_http_1_1plus(const struct Curl_easy *data,
- const struct connectdata *conn)
+static bool use_http_1_1plus(const struct Curl_easy *data,
+ const struct connectdata *conn)
{
if((data->state.httpversion == 10) || (conn->httpversion == 10))
return FALSE;
(data->state.httpwant >= CURL_HTTP_VERSION_1_1));
}
-#ifndef USE_HYPER
static const char *get_http_string(const struct Curl_easy *data,
const struct connectdata *conn)
{
return "3";
if(Curl_conn_is_http2(data, conn, FIRSTSOCKET))
return "2";
- if(Curl_use_http_1_1plus(data, conn))
+ if(use_http_1_1plus(data, conn))
return "1.1";
return "1.0";
}
-#endif
CURLcode Curl_add_custom_headers(struct Curl_easy *data,
bool is_connect,
-#ifndef USE_HYPER
- struct dynbuf *req
-#else
- void *req
-#endif
- )
+ struct dynbuf *req)
{
struct connectdata *conn = data->conn;
char *ptr;
/* copy the source */
semicolonp = strdup(headers->data);
if(!semicolonp) {
-#ifndef USE_HYPER
Curl_dyn_free(req);
-#endif
return CURLE_OUT_OF_MEMORY;
}
/* put a colon where the semicolon is */
!Curl_auth_allowed_to_host(data))
;
else {
-#ifdef USE_HYPER
- result = Curl_hyper_header(data, req, compare);
-#else
result = Curl_dyn_addf(req, "%s\r\n", compare);
-#endif
}
if(semicolonp)
free(semicolonp);
#ifndef CURL_DISABLE_PARSEDATE
CURLcode Curl_add_timecondition(struct Curl_easy *data,
-#ifndef USE_HYPER
- struct dynbuf *req
-#else
- void *req
-#endif
- )
+ struct dynbuf *req)
{
const struct tm *tm;
struct tm keeptime;
tm->tm_min,
tm->tm_sec);
-#ifndef USE_HYPER
result = Curl_dyn_add(req, datestr);
-#else
- result = Curl_hyper_header(data, req, datestr);
-#endif
-
return result;
}
#else
*reqp = httpreq;
}
-CURLcode Curl_http_useragent(struct Curl_easy *data)
+static CURLcode http_useragent(struct Curl_easy *data)
{
/* The User-Agent string might have been allocated in url.c already, because
it might have been used in the proxy connect, but if we have got a header
}
-CURLcode Curl_http_host(struct Curl_easy *data, struct connectdata *conn)
+static CURLcode http_host(struct Curl_easy *data, struct connectdata *conn)
{
const char *ptr;
struct dynamically_allocated_data *aptr = &data->state.aptr;
/*
* Append the request-target to the HTTP request
*/
-CURLcode Curl_http_target(struct Curl_easy *data,
- struct connectdata *conn,
- struct dynbuf *r)
+static CURLcode http_target(struct Curl_easy *data,
+ struct connectdata *conn,
+ struct dynbuf *r)
{
CURLcode result = CURLE_OK;
const char *path = data->state.up.path;
return CURLE_OK;
}
-CURLcode Curl_http_req_set_reader(struct Curl_easy *data,
- Curl_HttpReq httpreq,
- const char **tep)
+static CURLcode http_req_set_reader(struct Curl_easy *data,
+ Curl_HttpReq httpreq,
+ const char **tep)
{
CURLcode result = CURLE_OK;
const char *ptr;
Curl_compareheader(ptr,
STRCONST("Transfer-Encoding:"), STRCONST("chunked"));
if(data->req.upload_chunky &&
- Curl_use_http_1_1plus(data, data->conn) &&
+ use_http_1_1plus(data, data->conn) &&
(data->conn->httpversion >= 20)) {
infof(data, "suppressing chunked transfer encoding on connection "
"using HTTP version 2 or higher");
if(req_clen < 0) {
/* indeterminate request content length */
- if(Curl_use_http_1_1plus(data, data->conn)) {
+ if(use_http_1_1plus(data, data->conn)) {
/* On HTTP/1.1, enable chunked, on HTTP/2 and later we do not
* need it */
data->req.upload_chunky = (data->conn->httpversion < 20);
Curl_compareheader(ptr, STRCONST("Expect:"), STRCONST("100-continue"));
}
else if(!data->state.disableexpect &&
- Curl_use_http_1_1plus(data, data->conn) &&
+ use_http_1_1plus(data, data->conn) &&
(data->conn->httpversion < 20)) {
/* if not doing HTTP 1.0 or version 2, or disabled explicitly, we add an
Expect: 100-continue to the headers which actually speeds up post
return CURLE_OK;
}
-CURLcode Curl_http_req_complete(struct Curl_easy *data,
- struct dynbuf *r, Curl_HttpReq httpreq)
+static CURLcode http_req_complete(struct Curl_easy *data,
+ struct dynbuf *r, Curl_HttpReq httpreq)
{
CURLcode result = CURLE_OK;
curl_off_t req_clen;
bool announced_exp100 = FALSE;
DEBUGASSERT(data->conn);
-#ifndef USE_HYPER
if(data->req.upload_chunky) {
result = Curl_httpchunk_add_reader(data);
if(result)
return result;
}
-#endif
/* Get the request body length that has been set up */
req_clen = Curl_creader_total_length(data);
#if !defined(CURL_DISABLE_COOKIES)
-CURLcode Curl_http_cookies(struct Curl_easy *data,
- struct connectdata *conn,
- struct dynbuf *r)
+static CURLcode http_cookies(struct Curl_easy *data,
+ struct connectdata *conn,
+ struct dynbuf *r)
{
CURLcode result = CURLE_OK;
char *addcookies = NULL;
}
#endif
-CURLcode Curl_http_range(struct Curl_easy *data,
- Curl_HttpReq httpreq)
+static CURLcode http_range(struct Curl_easy *data,
+ Curl_HttpReq httpreq)
{
if(data->state.use_range) {
/*
return CURLE_OK;
}
-CURLcode Curl_http_firstwrite(struct Curl_easy *data)
+static CURLcode http_firstwrite(struct Curl_easy *data)
{
struct connectdata *conn = data->conn;
struct SingleRequest *k = &data->req;
}
#ifdef HAVE_LIBZ
-CURLcode Curl_transferencode(struct Curl_easy *data)
+static CURLcode http_transferencode(struct Curl_easy *data)
{
if(!Curl_checkheaders(data, STRCONST("TE")) &&
data->set.http_transfer_encoding) {
}
#endif
-#ifndef USE_HYPER
/*
* Curl_http() gets called from the generic multi_do() function when an HTTP
* request is to be performed. This creates and sends a properly constructed
if(result)
goto fail;
- result = Curl_http_host(data, conn);
+ result = http_host(data, conn);
if(result)
goto fail;
- result = Curl_http_useragent(data);
+ result = http_useragent(data);
if(result)
goto fail;
#ifdef HAVE_LIBZ
/* we only consider transfer-encoding magic if libz support is built-in */
- result = Curl_transferencode(data);
+ result = http_transferencode(data);
if(result)
goto fail;
#endif
- result = Curl_http_req_set_reader(data, httpreq, &te);
+ result = http_req_set_reader(data, httpreq, &te);
if(result)
goto fail;
p_accept = Curl_checkheaders(data,
STRCONST("Accept")) ? NULL : "Accept: */*\r\n";
- result = Curl_http_range(data, httpreq);
+ result = http_range(data, httpreq);
if(result)
goto fail;
/* GET/HEAD/POST/PUT */
result = Curl_dyn_addf(&req, "%s ", request);
if(!result)
- result = Curl_http_target(data, conn, &req);
+ result = http_target(data, conn, &req);
if(result) {
Curl_dyn_free(&req);
goto fail;
}
}
- result = Curl_http_cookies(data, conn, &req);
+ result = http_cookies(data, conn, &req);
#ifndef CURL_DISABLE_WEBSOCKETS
if(!result && conn->handler->protocol&(CURLPROTO_WS|CURLPROTO_WSS))
result = Curl_ws_request(data, &req);
if(!result) {
/* req_send takes ownership of the 'req' memory on success */
- result = Curl_http_req_complete(data, &req, httpreq);
+ result = http_req_complete(data, &req, httpreq);
if(!result)
result = Curl_req_send(data, &req);
}
return result;
}
-#endif /* USE_HYPER */
-
typedef enum {
STATUS_UNKNOWN, /* not enough data to tell yet */
STATUS_DONE, /* a status line was read */
Curl_compareheader(hd, STRCONST(n), STRCONST(v)))
/*
- * Curl_http_header() parses a single response header.
+ * http_header() parses a single response header.
*/
-CURLcode Curl_http_header(struct Curl_easy *data,
- const char *hd, size_t hdlen)
+static CURLcode http_header(struct Curl_easy *data,
+ const char *hd, size_t hdlen)
{
struct connectdata *conn = data->conn;
CURLcode result;
* Called after the first HTTP response line (the status line) has been
* received and parsed.
*/
-CURLcode Curl_http_statusline(struct Curl_easy *data,
- struct connectdata *conn)
+static CURLcode http_statusline(struct Curl_easy *data,
+ struct connectdata *conn)
{
struct SingleRequest *k = &data->req;
figured out here after all headers have been received but before the final
call to the user's header callback, so that a valid content length can be
retrieved by the user in the final call. */
-CURLcode Curl_http_size(struct Curl_easy *data)
+static CURLcode http_size(struct Curl_easy *data)
{
struct SingleRequest *k = &data->req;
if(data->req.ignore_cl || k->chunk) {
* that tells us that the server is OK with this and ready
* to receive the data.
*/
- Curl_http_exp100_got100(data);
+ http_exp100_got100(data);
break;
case 101:
/* Switching Protocols only allowed from HTTP/1.1 */
* connection for closure after we have read the entire response.
*/
if(!Curl_req_done_sending(data)) {
- if((k->httpcode == 417) && Curl_http_exp100_is_selected(data)) {
+ if((k->httpcode == 417) && http_exp100_is_selected(data)) {
/* 417 Expectation Failed - try again without the Expect
header */
if(!k->writebytecount && http_exp100_is_waiting(data)) {
k->download_done = TRUE;
/* final response without error, prepare to receive the body */
- result = Curl_http_firstwrite(data);
+ result = http_firstwrite(data);
if(!result)
/* This is the last response that we get for the current request.
* Check on the body size and determine if the response is complete.
*/
- result = Curl_http_size(data);
+ result = http_size(data);
out:
if(last_hd) {
}
if(fine_statusline) {
- result = Curl_http_statusline(data, data->conn);
+ result = http_statusline(data, data->conn);
if(result)
return result;
writetype |= CLIENTWRITE_STATUS;
if(result)
return result;
- result = Curl_http_header(data, hd, hdlen);
+ result = http_header(data, hd, hdlen);
if(result)
return result;
return result;
}
-void Curl_http_exp100_got100(struct Curl_easy *data)
+static void http_exp100_got100(struct Curl_easy *data)
{
struct Curl_creader *r = Curl_creader_get_by_type(data, &cr_exp100);
if(r)
http_exp100_continue(data, r);
}
-bool Curl_http_exp100_is_selected(struct Curl_easy *data)
+static bool http_exp100_is_selected(struct Curl_easy *data)
{
struct Curl_creader *r = Curl_creader_get_by_type(data, &cr_exp100);
return !!r;
const char *thisheader,
const size_t thislen);
-CURLcode Curl_add_timecondition(struct Curl_easy *data,
-#ifndef USE_HYPER
- struct dynbuf *req
-#else
- void *headers
-#endif
- );
-CURLcode Curl_add_custom_headers(struct Curl_easy *data,
- bool is_connect,
-#ifndef USE_HYPER
- struct dynbuf *req
-#else
- void *headers
-#endif
- );
+CURLcode Curl_add_timecondition(struct Curl_easy *data, struct dynbuf *req);
+CURLcode Curl_add_custom_headers(struct Curl_easy *data, bool is_connect,
+ struct dynbuf *req);
+CURLcode Curl_dynhds_add_custom(struct Curl_easy *data, bool is_connect,
+ struct dynhds *hds);
void Curl_http_method(struct Curl_easy *data, struct connectdata *conn,
const char **method, Curl_HttpReq *);
-CURLcode Curl_http_useragent(struct Curl_easy *data);
-CURLcode Curl_http_host(struct Curl_easy *data, struct connectdata *conn);
-CURLcode Curl_http_target(struct Curl_easy *data, struct connectdata *conn,
- struct dynbuf *req);
-CURLcode Curl_http_statusline(struct Curl_easy *data,
- struct connectdata *conn);
-CURLcode Curl_http_header(struct Curl_easy *data,
- const char *hd, size_t hdlen);
-CURLcode Curl_transferencode(struct Curl_easy *data);
-CURLcode Curl_http_req_set_reader(struct Curl_easy *data,
- Curl_HttpReq httpreq,
- const char **tep);
-CURLcode Curl_http_req_complete(struct Curl_easy *data,
- struct dynbuf *r, Curl_HttpReq httpreq);
-bool Curl_use_http_1_1plus(const struct Curl_easy *data,
- const struct connectdata *conn);
#ifndef CURL_DISABLE_COOKIES
CURLcode Curl_http_cookies(struct Curl_easy *data,
struct connectdata *conn,
#else
#define Curl_http_cookies(a,b,c) CURLE_OK
#endif
-CURLcode Curl_http_range(struct Curl_easy *data,
- Curl_HttpReq httpreq);
-CURLcode Curl_http_firstwrite(struct Curl_easy *data);
/* protocol-specific functions set up to be called by the main engine */
CURLcode Curl_http_setup_conn(struct Curl_easy *data,
version. This count includes CONNECT response headers. */
#define MAX_HTTP_RESP_HEADER_SIZE (300*1024)
-bool Curl_http_exp100_is_selected(struct Curl_easy *data);
-void Curl_http_exp100_got100(struct Curl_easy *data);
#endif /* CURL_DISABLE_HTTP */
* HTTP unique setup
***************************************************************************/
-CURLcode Curl_http_size(struct Curl_easy *data);
-
CURLcode Curl_http_write_resp_hds(struct Curl_easy *data,
const char *buf, size_t blen,
size_t *pconsumed);
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
#include <curl/curl.h>
-#ifdef USE_HYPER
-#include <hyper.h>
-#endif
#include "sendf.h"
#include "http.h"
#include "url.h"
req->no_body = data->set.opt_no_body;
req->authneg = FALSE;
req->shutdown = FALSE;
-#ifdef USE_HYPER
- req->bodywritten = FALSE;
-#endif
}
void Curl_req_free(struct SingleRequest *req, struct Curl_easy *data)
return result;
}
-CURLcode Curl_req_set_upload_done(struct Curl_easy *data)
+static CURLcode req_set_upload_done(struct Curl_easy *data)
{
DEBUGASSERT(!data->req.upload_done);
data->req.upload_done = TRUE;
if(!done)
return CURLE_AGAIN;
}
- return Curl_req_set_upload_done(data);
+ return req_set_upload_done(data);
}
return CURLE_OK;
}
return (ssize_t)nread;
}
-#ifndef USE_HYPER
-
static CURLcode req_send_buffer_add(struct Curl_easy *data,
const char *buf, size_t blen,
size_t hds_len)
}
return CURLE_OK;
}
-#endif /* !USE_HYPER */
bool Curl_req_sendbuf_empty(struct Curl_easy *data)
{
data->req.upload_aborted = TRUE;
/* no longer KEEP_SEND and KEEP_SEND_PAUSE */
data->req.keepon &= ~KEEP_SENDBITS;
- return Curl_req_set_upload_done(data);
+ return req_set_upload_done(data);
}
return CURLE_OK;
}
BIT(sendbuf_init); /* sendbuf is initialized */
BIT(shutdown); /* request end will shutdown connection */
BIT(shutdown_err_ignore); /* errors in shutdown will not fail request */
-#ifdef USE_HYPER
- BIT(bodywritten);
-#endif
};
/**
*/
void Curl_req_hard_reset(struct SingleRequest *req, struct Curl_easy *data);
-#ifndef USE_HYPER
/**
* Send request headers. If not all could be sent
* they will be buffered. Use `Curl_req_flush()` to make sure
*/
CURLcode Curl_req_send(struct Curl_easy *data, struct dynbuf *buf);
-#endif /* !USE_HYPER */
-
/**
* TRUE iff the request has sent all request headers and data.
*/
#include "curl_setup.h"
-#if !defined(CURL_DISABLE_RTSP) && !defined(USE_HYPER)
+#if !defined(CURL_DISABLE_RTSP)
#include "urldata.h"
#include <curl/curl.h>
}
-#endif /* CURL_DISABLE_RTSP or using Hyper */
+#endif /* CURL_DISABLE_RTSP */
* SPDX-License-Identifier: curl
*
***************************************************************************/
-#ifdef USE_HYPER
-#define CURL_DISABLE_RTSP 1
-#endif
#ifndef CURL_DISABLE_RTSP
}
/* Update stats, write and report progress */
data->req.bytecount += nwrite;
-#ifdef USE_HYPER
- data->req.bodywritten = TRUE;
-#endif
result = Curl_pgrsSetDownloadCounter(data, data->req.bytecount);
if(result)
return result;
return NULL;
}
-void Curl_cwriter_remove_by_name(struct Curl_easy *data,
- const char *name)
-{
- struct Curl_cwriter **anchor = &data->req.writer_stack;
-
- while(*anchor) {
- if(!strcmp(name, (*anchor)->cwt->name)) {
- struct Curl_cwriter *w = (*anchor);
- *anchor = w->next;
- Curl_cwriter_free(data, w);
- continue;
- }
- anchor = &((*anchor)->next);
- }
-}
-
bool Curl_cwriter_is_paused(struct Curl_easy *data)
{
return Curl_cw_out_is_paused(data);
struct Curl_cwriter *Curl_cwriter_get_by_type(struct Curl_easy *data,
const struct Curl_cwtype *cwt);
-void Curl_cwriter_remove_by_name(struct Curl_easy *data,
- const char *name);
-
struct Curl_cwriter *Curl_cwriter_get_by_name(struct Curl_easy *data,
const char *name);
break;
case CURLOPT_HTTP09_ALLOWED:
-#ifdef USE_HYPER
- /* Hyper does not support HTTP/0.9 */
- if(enabled)
- return CURLE_BAD_FUNCTION_ARGUMENT;
-#else
data->set.http09_allowed = enabled;
-#endif
break;
#endif /* ! CURL_DISABLE_HTTP */
data->state.select_bits = 0;
}
-#ifdef USE_HYPER
- if(data->conn->datastream) {
- result = data->conn->datastream(data, data->conn, &didwhat,
- CURL_CSELECT_OUT|CURL_CSELECT_IN);
- if(result || data->req.done)
- goto out;
- }
- else {
-#endif
/* We go ahead and do a read if we have a readable socket or if the stream
was rewound (in which case we have data in a buffer) */
if(k->keepon & KEEP_RECV) {
if(result)
goto out;
}
-#ifdef USE_HYPER
- }
-#endif
if(!didwhat) {
/* Transfer wanted to send/recv, but nothing was possible. */
size_t len, /* max amount to read */
CURLcode *err); /* error to return */
-#ifdef USE_HYPER
-typedef CURLcode (*Curl_datastream)(struct Curl_easy *data,
- struct connectdata *conn,
- int *didwhat,
- int select_res);
-#endif
-
#include "mime.h"
#include "imap.h"
#include "pop3.h"
#include "mqtt.h"
#include "ftplistparser.h"
#include "multihandle.h"
-#include "c-hyper.h"
#include "cf-socket.h"
#ifdef HAVE_GSSAPI
#ifdef USE_UNIX_SOCKETS
char *unix_domain_socket;
#endif
-#ifdef USE_HYPER
- /* if set, an alternative data transfer function */
- Curl_datastream datastream;
-#endif
+
/* When this connection is created, store the conditions for the local end
bind. This is stored before the actual bind and before any connection is
made and will serve the purpose of being used for comparison reasons so
struct curl_slist *cookielist; /* list of cookie files set by
curl_easy_setopt(COOKIEFILE) calls */
#endif
-#ifdef USE_HYPER
- bool hconnect; /* set if a CONNECT request */
- CURLcode hresult; /* used to pass return codes back from hyper callbacks */
-#endif
#ifndef CURL_DISABLE_VERBOSE_STRINGS
struct curl_trc_feat *feat; /* opt. trace feature transfer is part of */
struct PureInfo info; /* stats, reports and info data */
struct curl_tlssessioninfo tsi; /* Information about the TLS session, only
valid after a client has asked for it */
-#ifdef USE_HYPER
- struct hyptransfer hyp;
-#endif
};
#define LIBCURL_NAME "libcurl"
#ifdef USE_LIBRTMP
char rtmp_version[30];
#endif
-#ifdef USE_HYPER
- char hyper_buf[30];
-#endif
#ifdef USE_GSASL
char gsasl_buf[30];
#endif
Curl_rtmp_version(rtmp_version, sizeof(rtmp_version));
src[i++] = rtmp_version;
#endif
-#ifdef USE_HYPER
- msnprintf(hyper_buf, sizeof(hyper_buf), "Hyper/%s", hyper_version());
- src[i++] = hyper_buf;
-#endif
#ifdef USE_GSASL
msnprintf(gsasl_buf, sizeof(gsasl_buf), "libgsasl/%s",
gsasl_check_version(NULL));
}
#endif
-#ifdef USE_HYPER
- {
- static char hyper_buffer[30];
- msnprintf(hyper_buffer, sizeof(hyper_buffer), "Hyper/%s", hyper_version());
- version_info.hyper_version = hyper_buffer;
- }
-#endif
-
#ifdef USE_GSASL
{
version_info.gsasl_version = gsasl_check_version(NULL);
const char *val;
};
-CURLcode Curl_ws_request(struct Curl_easy *data, REQTYPE *req)
+CURLcode Curl_ws_request(struct Curl_easy *data, struct dynbuf *req)
{
unsigned int i;
CURLcode result = CURLE_OK;
free(randstr);
for(i = 0; !result && (i < sizeof(heads)/sizeof(heads[0])); i++) {
if(!Curl_checkheaders(data, STRCONST(heads[i].name))) {
-#ifdef USE_HYPER
- char field[128];
- msnprintf(field, sizeof(field), "%s %s", heads[i].name,
- heads[i].val);
- result = Curl_hyper_header(data, req, field);
-#else
- (void)data;
result = Curl_dyn_addf(req, "%s %s\r\n", heads[i].name,
heads[i].val);
-#endif
}
}
k->upgr101 = UPGR101_WS;
#if !defined(CURL_DISABLE_WEBSOCKETS) && !defined(CURL_DISABLE_HTTP)
-#ifdef USE_HYPER
-#define REQTYPE void
-#else
-#define REQTYPE struct dynbuf
-#endif
-
/* a client-side WS frame decoder, parsing frame headers and
* payload, keeping track of current position and stats */
enum ws_dec_state {
struct curl_ws_frame frame; /* the current WS FRAME received */
};
-CURLcode Curl_ws_request(struct Curl_easy *data, REQTYPE *req);
+CURLcode Curl_ws_request(struct Curl_easy *data, struct dynbuf *req);
CURLcode Curl_ws_accept(struct Curl_easy *data, const char *mem, size_t len);
extern const struct Curl_handler Curl_handler_ws;
for users to skip certain classes of tests, if desired, but a few are treated
specially by the test harness or build system.
-When using curl built with Hyper, the keywords must include `HTTP` or `HTTPS`
-for 'hyper mode' to kick in and make line ending checks work for tests.
-
When running a unit test and the keywords include `unittest`, the `<tool>`
section can be left empty to use the standard unit test tool name `unitN` where
`N` is the test number.
- `http/2`
- `http/3`
- `HTTPS-proxy`
-- `hyper`
- `IDN`
- `IPv6`
- `Kerberos`
# https://github.com/curl/curl/issues/380
1801
#
-#
-# Tests that are disabled here for Hyper are SUPPOSED to work but
-# still need adjustments in tests or code. Tests that cannot be
-# fixed for hyper should be adjusted for it in the test file.
-#
-# hyper support remains EXPERIMENTAL as long as there's a test number
-# listed below
-#
-# Several tests fail due to hyper's lack of trailers support: 266, 1417, 1540,
-# 1591, 1943. See https://github.com/hyperium/hyper/issues/2699 for details.
-%if hyper
-266
-477
-500
-579
-587
-# 1021 re-added here due to flakiness
-1021
-1060
-1417
-1460
-1533
-1540
-1591
-1598
-1943
-2301
-2302
-2305
-# response body seem not to be handled by hyper
-2307
-%endif
2043
# The CRL test doesn't work with wolfSSL
%if wolfssl
Transfer-Encoding: chunked\r
Expect: 100-continue\r
\r
-%if hyper
-7A\r
-%else
7a\r
-%endif
This is data we upload with PUT
it comes from stdin so MUST be sent
with chunked encoding
Transfer-Encoding: chunked\r
Expect: 100-continue\r
\r
-%if hyper
-7A\r
-%else
7a\r
-%endif
This is data we upload with PUT
it comes from stdin so MUST be sent
with chunked encoding
cccccccccccccccccccccccccccccccc
\r
0\r
-%if !hyper
chunky-trailer: header data\r
another-header: yes\r
-%endif
\r
</data>
<datacheck>
Connection: mooo\r
\r
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
-%if !hyper
chunky-trailer: header data\r
another-header: yes\r
-%endif
</datacheck>
<servercmd>
writedelay: 10
Transfer-Encoding: chunked\r
Connection: mooo\r
\r
-%if !hyper
chunky-trailer: header data\r
another-header: yes\r
-%endif
</file>
</verify>
#
# Client-side
<client>
-# hyper doesn't support HTTP/0.9
-<features>
-!hyper
-</features>
<server>
http
</server>
Two: 2
no-colon
-%if !hyper
And A Funny One : wohoo
-%endif
User-Agent:
</file>
<command>
Accept: */*\r
One: 1\r
Two: 2\r
-%if !hyper
And A Funny One : wohoo\r
-%endif
\r
</protocol>
</verify>
#
# Client-side
<client>
-# hyper doesn't support HTTP/0.9
-<features>
-!hyper
-</features>
<server>
http
</server>
#
# Client-side
<client>
-# hyper doesn't grok HTTP/0.9
-<features>
-!hyper
-</features>
<server>
http
</server>
#
# Client-side
<client>
-# hyper doesn't grok HTTP/0.9
-<features>
-!hyper
-</features>
<server>
http
</server>
<file name="%LOGDIR/out%TESTNUMBER">
HTTP/1.1 200 OK\r
Date: Tue, 09 Nov 2010 14:49:00 GMT\r
-%if hyper
-Server: test-server/ fake folded\r
-%else
Server: test-server/\r
fake\r
folded\r
-%endif
Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
ETag: "21025-dc7-39462498"\r
Content-Length: 6\r
-%if hyper
-Connection: close\r
-%else
Connection: \r
close\r
-%endif
\r
</file>
</verify>
\r
</protocol>
<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
-%if !hyper
* Ignoring Content-Length in CONNECT 200 response
* Ignoring Transfer-Encoding in CONNECT 200 response
-%endif
</file>
<stripfile>
s/^.*(?=\* Ignoring (?:Content-Length|Transfer-Encoding) )// or $_ = ''
#
# Client-side
<client>
-# hyper doesn't support the added crazy header
<features>
Debug
-!hyper
</features>
<server>
http
Accept: */*\r
\r
</protocol>
-%if hyper
-# curl: (1) Hyper: [6] invalid HTTP header parsed
-<errorcode>
-1
-</errorcode>
-%endif
</verify>
</testcase>
Accept: */*\r
\r
</protocol>
-
-# Hyper curl returns unsupported protocol
-# built-in curl returns weird_server_reply
+# weird_server_reply
<errorcode>
-%if hyper
-1
-%else
8
-%endif
</errorcode>
</verify>
</testcase>
\r
</protocol>
-# Hyper curl returns unsupported protocol
-# built-in curl returns weird_server_reply
+# weird_server_reply
<errorcode>
-%if hyper
-1
-%else
8
-%endif
</errorcode>
</verify>
</testcase>
cccccccccccccccccccccccccccccccc
\r
0\r
-%if !hyper
chunky-trailer: header data\r
another-header: yes\r
-%endif
\r
</data>
<datacheck>
Connection: mooo\r
\r
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
-%if !hyper
chunky-trailer: header data\r
another-header: yes\r
-%endif
</datacheck>
<servercmd>
writedelay: 10
Transfer-Encoding: chunked, chunked\r
Connection: mooo\r
\r
-%if !hyper
chunky-trailer: header data\r
another-header: yes\r
-%endif
</file>
</verify>
cccccccccccccccccccccccccccccccc
\r
0\r
-%if !hyper
chunky-trailer: header data\r
another-header: yes\r
-%endif
\r
</data>
<datacheck>
Connection: mooo\r
\r
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
-%if !hyper
chunky-trailer: header data\r
another-header: yes\r
-%endif
</datacheck>
<servercmd>
writedelay: 10
Transfer-Encoding: chunked\r
Connection: mooo\r
\r
-%if !hyper
chunky-trailer: header data\r
another-header: yes\r
-%endif
</file>
</verify>
Trailer: my-super-awesome-trailer, my-other-awesome-trailer\r
Expect: 100-continue\r
\r
-%if hyper
-E\r
-%else
e\r
-%endif
Hello Cloud!\r
\r
0\r
moooooooooooo
</data>
<datacheck>
-%if hyper
-%else
HTTP/1.1 200 OK swsclose
Date: Tue, 09 Nov 2010 14:49:00 GMT
-%endif
</datacheck>
</reply>
Accept: */*\r
\r
</protocol>
-
-# Hyper curl returns unsupported protocol
-# built-in curl returns weird_server_reply
+# weird_server_reply
<errorcode>
-%if hyper
-1
-%else
8
-%endif
</errorcode>
</verify>
</testcase>
# curl: (18) transfer closed with outstanding read data remaining
# 18 == CURLE_PARTIAL_FILE
-# 56 == CURLE_RECV_ERROR
<errorcode>
-%if hyper
-56
-%else
18
-%endif
</errorcode>
</verify>
</testcase>
Accept: */*\r
Transfer-Encoding: chunked\r
\r
-%if hyper
-1E\r
-%else
1e\r
-%endif
just some tiny teeny contents
\r
0\r
#
# Verify data after the test has been "shot"
<verify>
-# hyper doesn't like the bad header in the second request
-<errorcode>
-%if hyper
-1
-%else
-0
-%endif
-</errorcode>
<protocol>
GET /%TESTNUMBER HTTP/1.1\r
Host: %HOSTIP:%HTTPPORT\r
<features>
Debug
ws
-!hyper
</features>
<server>
http
#
# Client-side
<client>
-<features>
-!hyper
-</features>
<server>
http
</server>
HTTP/1.1 301 This is a weirdo text message swsclose
Date: Tue, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
-%if hyper
-Location: /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
-%else
Location: /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
-%endif
Connection: close
HTTP/1.1 200 Followed here fine swsclose
<server>
http
</server>
-<features>
-!hyper
-</features>
<name>
CURLOPT_HTTP200ALIASES
</name>
<client>
<features>
SSL
-!hyper
</features>
<server>
https
</info>
# Server-side
#
-# The cookies set come in two versions. This is because when curl is built
-# with Hyper, the API provides the headers already "sanitized" so we cannot
-# compare with the exact server contents unless it too sends the data
-# "clean".
<reply>
<data>
Content-Type: text/html\r
Funny-head: yesyes\r
Set-Cookie: blankdomain=sure; domain=; path=/
-%if !hyper
Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure\r
Set-Cookie:ismatch=this ; domain=test31.curl; path=/silly/\r
Set-Cookie:ISMATCH=this ; domain=test31.curl; path=/silly/\r
Set-Cookie: withspaces2 =before equals;\r
Set-Cookie: prespace= yes before;\r
Set-Cookie: securewithspace=after ; secure =\r
-%else
-Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure\r
-Set-Cookie: ismatch=this ; domain=test31.curl; path=/silly/\r
-Set-Cookie:ISMATCH=this ; domain=test31.curl; path=/silly/\r
-Set-Cookie: overwrite=this ; domain=test31.curl; path=/overwrite/\r
-Set-Cookie: overwrite=this2 ; domain=test31.curl; path=/overwrite\r
-Set-Cookie: sec1value=secure1 ; domain=test31.curl; path=/secure1/ ; secure\r
-Set-Cookie: sec2value=secure2 ; domain=test31.curl; path=/secure2/ ; secure=\r
-Set-Cookie: sec3value=secure3 ; domain=test31.curl; path=/secure3/ ; secure=\r
-Set-Cookie: sec4value=secure4 ; secure=; domain=test31.curl; path=/secure4/ ;\r
-Set-Cookie: sec5value=secure5 ; secure; domain=test31.curl; path=/secure5/ ;\r
-Set-Cookie: sec6value=secure6 ; secure ; domain=test31.curl; path=/secure6/ ;\r
-Set-Cookie: sec7value=secure7 ; secure ; domain=test31.curl; path=/secure7/ ;\r
-Set-Cookie: sec8value=secure8 ; secure= ; domain=test31.curl; path=/secure8/ ;\r
-Set-Cookie: secure=very1 ; secure=; domain=test31.curl; path=/secure9/;\r
-Set-Cookie: httpo1=value1 ; domain=test31.curl; path=/p1/; httponly\r
-Set-Cookie: httpo2=value2 ; domain=test31.curl; path=/p2/; httponly=\r
-Set-Cookie: httpo3=value3 ; httponly; domain=test31.curl; path=/p3/;\r
-Set-Cookie: httpo4=value4 ; httponly=; domain=test31.curl; path=/p4/;\r
-Set-Cookie: httponly=myvalue1 ; domain=test31.curl; path=/p4/; httponly\r
-Set-Cookie: httpandsec=myvalue2 ; domain=test31.curl; path=/p4/; httponly; secure\r
-Set-Cookie: httpandsec2=myvalue3; domain=test31.curl; path=/p4/; httponly=; secure\r
-Set-Cookie: httpandsec3=myvalue4 ; domain=test31.curl; path=/p4/; httponly; secure=\r
-Set-Cookie: httpandsec4=myvalue5 ; domain=test31.curl; path=/p4/; httponly=; secure=\r
-Set-Cookie: httpandsec5=myvalue6 ; domain=test31.curl; path=/p4/; secure; httponly=\r
-Set-Cookie: httpandsec6=myvalue7 ; domain=test31.curl; path=/p4/; secure=; httponly=\r
-Set-Cookie: httpandsec7=myvalue8 ; domain=test31.curl; path=/p4/; secure; httponly\r
-Set-Cookie: httpandsec8=myvalue9; domain=test31.curl; path=/p4/; secure=; httponly\r
-Set-Cookie: partmatch=present; domain=test31.curl ; path=/;\r
-Set-Cookie: eat=this; domain=moo.foo.moo;\r
-Set-Cookie: eat=this-too; domain=.foo.moo;\r
-Set-Cookie: nodomainnovalue\r
-%if large-time
-Set-Cookie: nodomain=value; expires=Fri Feb 13 11:56:27 GMT 2525\r
-Set-Cookie: novalue; domain=reallysilly\r
-Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2525\r
-Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2525\r
-%else
-Set-Cookie: nodomain=value; expires=Fri Feb 13 11:56:27 GMT 2037\r
-Set-Cookie: novalue; domain=reallysilly\r
-Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030\r
-Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030\r
-%endif
-Set-Cookie: magic=yessir; path=/silly/; HttpOnly\r
-Set-Cookie: blexp=yesyes; domain=test31.curl; domain=test31.curl; expiry=totally bad;\r
-Set-Cookie: partialip=nono; domain=.0.0.1;\r
-Set-Cookie: withspaces= yes within and around ;\r
-Set-Cookie: withspaces2 =before equals;\r
-Set-Cookie: prespace= yes before;\r
-Set-Cookie: securewithspace=after ; secure =\r
-%endif
\r
boo
</data>
#
# Client-side
<client>
-<features>
-!hyper
-</features>
<server>
http
</server>
</client>
#
-# Verify data after the test has been "shot". hyper doesn't do error 18
+# Verify data after the test has been "shot"
<verify>
<errorcode>
-%if hyper
-56
-%else
18
-%endif
</errorcode>
<protocol>
GET /%TESTNUMBER HTTP/1.1\r
</client>
#
-# Verify data after the test has been "shot". hyper doesn't do error 18
+# Verify data after the test has been "shot".
<verify>
<errorcode>
-%if hyper
-56
-%else
18
-%endif
</errorcode>
<protocol>
GET /%TESTNUMBER HTTP/1.1\r
Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
ETag: "21025-dc7-39462498"
Accept-Ranges: bytes
-%if hyper
-Content-Length: 3689348814741910323
-%else
Content-Length: 36893488147419103232
-%endif
Connection: close
Content-Type: text/html
Funny-head: yesyes
# Verify data after the test has been "shot"
<verify>
<errorcode>
-%if hyper
-1
-%else
8
-%endif
</errorcode>
<protocol>
GET /%TESTNUMBER HTTP/1.1\r
Accept: */*\r
\r
</protocol>
-
-# hyper cannot work with too-large content-length
-%if hyper
-<errorcode>
-1
-</errorcode>
-%endif
</verify>
</testcase>
\r
</protocol>
<errorcode>
-%if hyper
-1
-%else
8
-%endif
</errorcode>
</verify>
</testcase>
</data2>
<datacheck>
HTTP/1.1 302 OK swsclose\r
-%if !hyper
Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002 \r
-%else
-Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002\r
-%endif
Date: Tue, 09 Nov 2010 14:49:00 GMT\r
Connection: close\r
\r
moooooooooooo
</data>
<datacheck>
-%if hyper
-%else
HTTP/1.1 200 OK swsclose
Date: Tue, 09 Nov 2010 14:49:00 GMT
-%endif
</datacheck>
</reply>
\r
</protocol>
-# Hyper curl returns unsupported protocol
# built-in curl returns weird_server_reply
<errorcode>
-%if hyper
-1
-%else
8
-%endif
</errorcode>
</verify>
</testcase>
</data2>
<datacheck>
HTTP/1.1 302 OK swsclose\r
-%if !hyper
Location: ../m o o.html/%TESTNUMBER0002 \r
-%else
-Location: ../m o o.html/%TESTNUMBER0002\r
-%endif
Date: Tue, 09 Nov 2010 14:49:00 GMT\r
Connection: close\r
\r
#
# Client-side
<client>
-<features>
-!hyper
-</features>
<server>
http
</server>
</protocol>
# curl: (56) Too large response headers: 307215 > 307200
-# hyper returns a generic error that libcurl converts to an even more
-# generic error
<errorcode>
-%if hyper
-1
-%else
56
-%endif
</errorcode>
</verify>
</testcase>
# Verify data after the test has been "shot"
<verify>
# curl: (56) Too large response headers: 6144086 > 6144000
-# hyper returns a generic error that libcurl converts to an even more
-# generic error
<errorcode>
-%if hyper
-1
-%else
56
-%endif
</errorcode>
</verify>
</testcase>
two\r
5\r
three\r
-%if hyper
-1D\r
-%else
1d\r
-%endif
and a final longer crap: four\r
0\r
\r
Transfer-Encoding: chunked\r
Content-Type: application/x-www-form-urlencoded\r
\r
-%if hyper
-C\r
-%else
c\r
-%endif
we post this\r
0\r
\r
two\r
5\r
three\r
-%if hyper
-1D\r
-%else
1d\r
-%endif
and a final longer crap: four\r
0\r
\r
User-Agent: curl/%VERSION\r
Accept: */*\r
Transfer-Encoding: chunked\r
-%if !hyper
Content-Length: 1\r
-%endif
Expect: 100-continue\r
\r
13\r
Content-Type: multipart/form-data; boundary=----------------------------\r
Expect: 100-continue\r
\r
-%if hyper
-7C\r
-%else
7c\r
-%endif
------------------------------\r
Content-Disposition: form-data; name="sendfile"; filename="postit2.c"\r
\r
1\r
\r
-%if hyper
-6B\r
-%else
6b\r
-%endif
\r
------------------------------\r
Content-Disposition: form-data; name="callbackdata"\r
1\r
\r
-%if hyper
-1B2\r
-%else
1b2\r
-%endif
\r
------------------------------\r
Content-Disposition: form-data; name="filename"\r
Content-Type: multipart/form-data; boundary=----------------------------\r
Expect: 100-continue\r
\r
-%if hyper
-8A\r
-%else
8a\r
-%endif
------------------------------\r
Content-Disposition: form-data; name="sendfile alternative"; filename="file name 2"\r
\r
1\r
\r
-%if hyper
-6B\r
-%else
6b\r
-%endif
\r
------------------------------\r
Content-Disposition: form-data; name="callbackdata"\r
1\r
\r
-%if hyper
-1B2\r
-%else
1b2\r
-%endif
\r
------------------------------\r
Content-Disposition: form-data; name="filename"\r
Content-Type: text/whatever\r
\r
\r
-%if hyper
-AB\r
-%else
ab\r
-%endif
This is data from a file.
\r
------------------------------\r
Content-Type: text/whatever\r
\r
\r
-%if hyper
-BB\r
-%else
bb\r
-%endif
This is data from a file.
\r
--------------------------------\r
Content-Disposition: form-data; name="filecontents"\r
\r
\r
-%if hyper
-11B\r
-%else
11b\r
-%endif
This is data from a file.
\r
------------------------------\r
Content-Type: text/whatever\r
\r
\r
-%if hyper
-AB\r
-%else
ab\r
-%endif
This is data from a file.
\r
------------------------------\r
Content-Type: text/whatever\r
\r
\r
-%if hyper
-BB\r
-%else
bb\r
-%endif
This is data from a file.
\r
--------------------------------\r
Content-Disposition: form-data; name="filecontents"\r
\r
\r
-%if hyper
-11B\r
-%else
11b\r
-%endif
This is data from a file.
\r
------------------------------\r
Content-Type: multipart/form-data; boundary=----------------------------\r
Expect: 100-continue\r
\r
-%if hyper
-1C1\r
-%else
1c1\r
-%endif
------------------------------\r
Content-Disposition: form-data; name="greeting"\r
Content-Type: application/X-Greeting\r
# Client-side
<client>
-<features>
-!hyper
-</features>
<server>
http
</server>
\r
4\r
ZHVt\r
-%if hyper
-3A\r
-%else
3a\r
-%endif
bXk=\r
--------------------------------\r
\r
Content-Type: multipart/form-data; boundary=----------------------------\r
Expect: 100-continue\r
\r
-%if hyper
-CD\r
-%else
cd\r
-%endif
------------------------------\r
Content-Disposition: form-data; name="field1"\r
\r
Content-Type: text/plain\r
\r
\r
-%if hyper
-4F\r
-%else
4f\r
-%endif
This is data from a file
\r
--------------------------------\r
p['name'] = 'h2'
if not self.env.have_h2_curl():
raise ScoreCardError('curl does not support HTTP/2')
- for lib in ['nghttp2', 'hyper']:
+ for lib in ['nghttp2']:
if self.env.curl_uses_lib(lib):
p['implementation'] = lib
break
elif self.protocol == 'h1' or self.protocol == 'http/1.1':
proto = 'http/1.1'
p['name'] = proto
- p['implementation'] = 'hyper' if self.env.curl_uses_lib('hyper')\
- else 'native'
+ p['implementation'] = 'native'
else:
raise ScoreCardError(f"unknown protocol: {self.protocol}")
# The processor does CRLF replacements in the <data*> sections if
# necessary since those parts might be read by separate servers.
if($s =~ /^ *<data(.*)\>/) {
- if($1 =~ /crlf="yes"/ ||
- ($feature{"hyper"} && ($keywords{"HTTP"} || $keywords{"HTTPS"}))) {
+ if($1 =~ /crlf="yes"/) {
$data_crlf = 1;
}
}
$feature{"c-ares"} = 1;
$resolver="c-ares";
}
- if ($libcurl =~ /Hyper/i) {
- $feature{"hyper"} = 1;
- }
if ($libcurl =~ /nghttp2/i) {
- # nghttp2 supports h2c, hyper does not
+ # nghttp2 supports h2c
$feature{"h2c"} = 1;
}
if ($libcurl =~ /AppleIDN/) {
chomp($validstdout[-1]);
}
- if($hash{'crlf'} ||
- ($feature{"hyper"} && ($keywords{"HTTP"}
- || $keywords{"HTTPS"}))) {
+ if($hash{'crlf'}) {
subnewlines(0, \$_) for @validstdout;
}
# get the mode attribute
my $filemode=$hash{'mode'};
- if($filemode && ($filemode eq "text") && $feature{"hyper"}) {
- # text mode check in hyper-mode. Sometimes necessary if the stderr
- # data *looks* like HTTP and thus has gotten CRLF newlines
- # mistakenly
- normalize_text(\@validstderr);
- }
if($filemode && ($filemode eq "text")) {
normalize_text(\@validstderr);
normalize_text(\@actual);
# of the datacheck
chomp($replycheckpart[-1]);
}
- if($replycheckpartattr{'crlf'} ||
- ($feature{"hyper"} && ($keywords{"HTTP"}
- || $keywords{"HTTPS"}))) {
+ if($replycheckpartattr{'crlf'}) {
subnewlines(0, \$_) for @replycheckpart;
}
push(@reply, @replycheckpart);
if($filemode && ($filemode eq "text")) {
normalize_text(\@reply);
}
- if($replyattr{'crlf'} ||
- ($feature{"hyper"} && ($keywords{"HTTP"}
- || $keywords{"HTTPS"}))) {
+ if($replyattr{'crlf'}) {
subnewlines(0, \$_) for @reply;
}
}
}
}
- if($hash{'crlf'} ||
- ($feature{"hyper"} && ($keywords{"HTTP"} || $keywords{"HTTPS"}))) {
+ if($hash{'crlf'}) {
subnewlines(0, \$_) for @proxyprot;
}
normalize_text(\@outfile);
normalize_text(\@generated);
}
- if($hash{'crlf'} ||
- ($feature{"hyper"} && ($keywords{"HTTP"}
- || $keywords{"HTTPS"}))) {
+ if($hash{'crlf'}) {
subnewlines(0, \$_) for @outfile;
}
return;
}
- # When curl is built with Hyper, it gets all response headers delivered as
- # name/value pairs and curl "invents" the newlines when it saves the
- # headers. Therefore, curl will always save headers with CRLF newlines
- # when built to use Hyper. By making sure we deliver all tests using CRLF
- # as well, all test comparisons will survive without knowing about this
- # little quirk.
-
if(($$thing =~ /^HTTP\/(1.1|1.0|2|3) [1-5][^\x0d]*\z/) ||
($$thing =~ /^(GET|POST|PUT|DELETE) \S+ HTTP\/\d+(\.\d+)?/) ||
(($$thing =~ /^[a-z0-9_-]+: [^\x0d]*\z/i) &&
-{
- zstd_decompression-1.3.3-on-Ubuntu-18.04_with_hyper
- Memcheck:Cond
- fun:ZSTD_decompressStream
- fun:zstd_unencode_write
- fun:Curl_unencode_write
- fun:hyper_body_chunk
-}
-
{
zstd_decompression-1.3.3-on-Ubuntu-18.04
Memcheck:Cond
projects / thirdparty / curl.git / commitdiff
