From: Daniel Stenberg Date: Sat, 21 Dec 2024 10:33:05 +0000 (+0100) Subject: hyper: drop support X-Git-Tag: curl-8_12_0~306 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc3e1cbc508;p=thirdparty%2Fcurl.git hyper: drop support lib : remove all hyper code configure: stop detecting hyper docs: no more mention of hyper tests: mo more special-handling of hyper builds CI: no jobs using hyper Closes #15120 --- diff --git a/.github/labeler.yml b/.github/labeler.yml index b2085fbf9e..f37d7833f0 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -292,14 +292,6 @@ HTTP/3: tests/nghttpx.conf\ }" -Hyper: - - all: - - changed-files: - - any-glob-to-all-files: "{\ - docs/HYPER.md,\ - lib/c-hyper.*\ - }" - IMAP: - all: - changed-files: diff --git a/.github/scripts/binarycheck.sums b/.github/scripts/binarycheck.sums index 8d542f79c6..6e80cd6d28 100644 --- a/.github/scripts/binarycheck.sums +++ b/.github/scripts/binarycheck.sums @@ -18,7 +18,7 @@ b967734c9bfe3d7a1a7795f348f0bce4d9ba15ca9590697ef2d4d15b92822db0 ./tests/certs/ 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 diff --git a/configure.ac b/configure.ac index a5560cc82b..d1e87f101a 100644 --- a/configure.ac +++ b/configure.ac @@ -677,7 +677,7 @@ AS_HELP_STRING([--disable-http],[Disable HTTP support]), 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" @@ -800,110 +800,12 @@ AS_HELP_STRING([--disable-ldaps],[Disable LDAPS support]), 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 @@ -923,8 +825,7 @@ AS_HELP_STRING([--disable-rtsp],[Disable RTSP support]), else AC_MSG_RESULT(no) fi - ) -fi +) AC_MSG_CHECKING([whether to support proxies]) AC_ARG_ENABLE(proxy, @@ -2989,8 +2890,8 @@ dnl ********************************************************************** 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 diff --git a/docs/DEPRECATE.md b/docs/DEPRECATE.md index 5e3551a45c..2ea16e0f89 100644 --- a/docs/DEPRECATE.md +++ b/docs/DEPRECATE.md @@ -23,36 +23,6 @@ and use TLS 1.3, or else it is not good enough. 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 @@ -65,3 +35,4 @@ removed from curl in January 2025. - MinGW v1 - NTLM_WB - space-separated `NOPROXY` patterns + - hyper diff --git a/docs/EXPERIMENTAL.md b/docs/EXPERIMENTAL.md index e880942426..00e267a960 100644 --- a/docs/EXPERIMENTAL.md +++ b/docs/EXPERIMENTAL.md @@ -34,14 +34,6 @@ Experimental support in curl means: ## 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: diff --git a/docs/Makefile.am b/docs/Makefile.am index 02c4dcc017..6e005246b8 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -50,7 +50,6 @@ INTERNALDOCS = \ internals/CONNECTION-FILTERS.md \ internals/DYNBUF.md \ internals/HASH.md \ - internals/HYPER.md \ internals/LLIST.md \ internals/MQTT.md \ internals/NEW-PROTOCOL.md \ diff --git a/docs/cmdline-opts/ignore-content-length.md b/docs/cmdline-opts/ignore-content-length.md index b9f7522da5..01ff43b06e 100644 --- a/docs/cmdline-opts/ignore-content-length.md +++ b/docs/cmdline-opts/ignore-content-length.md @@ -15,11 +15,9 @@ Example: # `--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. diff --git a/docs/internals/HYPER.md b/docs/internals/HYPER.md deleted file mode 100644 index bbaa4e4d59..0000000000 --- a/docs/internals/HYPER.md +++ /dev/null @@ -1,78 +0,0 @@ - - -# 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,/target/debug -Wl,-rpath,/target/release" --with-openssl --with-hyper= - % 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 diff --git a/docs/internals/WEBSOCKET.md b/docs/internals/WEBSOCKET.md index 14caec2405..2f9f5cb24d 100644 --- a/docs/internals/WEBSOCKET.md +++ b/docs/internals/WEBSOCKET.md @@ -99,7 +99,6 @@ Ideas: - 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 diff --git a/docs/libcurl/opts/CURLOPT_HTTP_TRANSFER_DECODING.md b/docs/libcurl/opts/CURLOPT_HTTP_TRANSFER_DECODING.md index 52cee575b0..72eaa970c8 100644 --- a/docs/libcurl/opts/CURLOPT_HTTP_TRANSFER_DECODING.md +++ b/docs/libcurl/opts/CURLOPT_HTTP_TRANSFER_DECODING.md @@ -31,11 +31,6 @@ Pass a long to tell libcurl how to act on transfer decoding. If set to zero, 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 diff --git a/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.md b/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.md index 4b8228b40e..b1f1d34528 100644 --- a/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.md +++ b/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.md @@ -69,11 +69,6 @@ int main(void) 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 diff --git a/lib/Makefile.inc b/lib/Makefile.inc index e22094a926..12bf70e9e1 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -114,7 +114,6 @@ LIB_CFILES = \ base64.c \ bufq.c \ bufref.c \ - c-hyper.c \ cf-h1-proxy.c \ cf-h2-proxy.c \ cf-haproxy.c \ @@ -248,7 +247,6 @@ LIB_HFILES = \ asyn.h \ bufq.h \ bufref.h \ - c-hyper.h \ cf-h1-proxy.h \ cf-h2-proxy.h \ cf-haproxy.h \ diff --git a/lib/c-hyper.c b/lib/c-hyper.c deleted file mode 100644 index 2b8eb95707..0000000000 --- a/lib/c-hyper.c +++ /dev/null @@ -1,1254 +0,0 @@ -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) Daniel Stenberg, , 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 -#endif - -#ifdef HAVE_NETDB_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NET_IF_H -#include -#endif -#ifdef HAVE_SYS_IOCTL_H -#include -#endif - -#ifdef HAVE_SYS_PARAM_H -#include -#endif - -#include -#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) */ diff --git a/lib/c-hyper.h b/lib/c-hyper.h deleted file mode 100644 index 89dd53b8fd..0000000000 --- a/lib/c-hyper.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef HEADER_CURL_HYPER_H -#define HEADER_CURL_HYPER_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) Daniel Stenberg, , 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 - -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 */ diff --git a/lib/cf-h1-proxy.c b/lib/cf-h1-proxy.c index 6b7f9831bc..943b10cfdb 100644 --- a/lib/cf-h1-proxy.c +++ b/lib/cf-h1-proxy.c @@ -27,9 +27,6 @@ #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP) #include -#ifdef USE_HYPER -#include -#endif #include "urldata.h" #include "dynbuf.h" #include "sendf.h" @@ -184,9 +181,6 @@ static void h1_tunnel_go_state(struct Curl_cfilter *cf, 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; } } @@ -212,7 +206,6 @@ static bool tunnel_want_send(struct h1_tunnel_state *ts) 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) @@ -529,337 +522,6 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf, 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) diff --git a/lib/cf-https-connect.c b/lib/cf-https-connect.c index dd7cdcb051..9eb38f415c 100644 --- a/lib/cf-https-connect.c +++ b/lib/cf-https-connect.c @@ -24,7 +24,7 @@ #include "curl_setup.h" -#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER) +#if !defined(CURL_DISABLE_HTTP) #include "urldata.h" #include @@ -617,4 +617,4 @@ out: return result; } -#endif /* !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER) */ +#endif /* !defined(CURL_DISABLE_HTTP) */ diff --git a/lib/cf-https-connect.h b/lib/cf-https-connect.h index 6a39527317..4ff9ef8d37 100644 --- a/lib/cf-https-connect.h +++ b/lib/cf-https-connect.h @@ -25,7 +25,7 @@ ***************************************************************************/ #include "curl_setup.h" -#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER) +#if !defined(CURL_DISABLE_HTTP) struct Curl_cfilter; struct Curl_easy; @@ -54,5 +54,5 @@ CURLcode Curl_cf_https_setup(struct Curl_easy *data, 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 */ diff --git a/lib/connect.c b/lib/connect.c index ee3b4c8a69..f21bb8e4f8 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -1485,7 +1485,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data, 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); @@ -1493,7 +1493,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data, 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]) { diff --git a/lib/curl_setup.h b/lib/curl_setup.h index f722e330f8..43da46ac19 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -939,7 +939,6 @@ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf, #define UNITTEST static #endif -/* Hyper supports HTTP2 also, but Curl's integration with Hyper does not */ #if defined(USE_NGHTTP2) #define USE_HTTP2 #endif diff --git a/lib/curl_trc.c b/lib/curl_trc.c index a3a107a4dc..2776d0d119 100644 --- a/lib/curl_trc.c +++ b/lib/curl_trc.c @@ -319,7 +319,7 @@ static struct trc_cft_def trc_cfts[] = { #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 }; diff --git a/lib/http.c b/lib/http.c index 50fae23720..83efb64679 100644 --- a/lib/http.c +++ b/lib/http.c @@ -47,10 +47,6 @@ #include #endif -#ifdef USE_HYPER -#include -#endif - #include "urldata.h" #include #include "transfer.h" @@ -88,7 +84,6 @@ #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 */ @@ -104,6 +99,31 @@ static bool http_should_fail(struct Curl_easy *data, int httpcode); 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. @@ -1169,7 +1189,6 @@ CURLcode Curl_http_done(struct Curl_easy *data, data->state.authproxy.multipass = FALSE; Curl_dyn_reset(&data->state.headerb); - Curl_hyper_done(data); if(status) return status; @@ -1202,8 +1221,8 @@ CURLcode Curl_http_done(struct Curl_easy *data, * - 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; @@ -1214,7 +1233,6 @@ bool Curl_use_http_1_1plus(const struct Curl_easy *data, (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) { @@ -1222,21 +1240,15 @@ static const char *get_http_string(const struct Curl_easy *data, 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; @@ -1303,9 +1315,7 @@ CURLcode Curl_add_custom_headers(struct Curl_easy *data, /* 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 */ @@ -1364,11 +1374,7 @@ CURLcode Curl_add_custom_headers(struct Curl_easy *data, !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); @@ -1385,12 +1391,7 @@ CURLcode Curl_add_custom_headers(struct Curl_easy *data, #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; @@ -1453,12 +1454,7 @@ CURLcode Curl_add_timecondition(struct Curl_easy *data, 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 @@ -1512,7 +1508,7 @@ void Curl_http_method(struct Curl_easy *data, struct connectdata *conn, *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 @@ -1526,7 +1522,7 @@ CURLcode Curl_http_useragent(struct Curl_easy *data) } -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; @@ -1616,9 +1612,9 @@ CURLcode Curl_http_host(struct Curl_easy *data, struct connectdata *conn) /* * 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; @@ -1898,9 +1894,9 @@ static CURLcode http_resume(struct Curl_easy *data, Curl_HttpReq httpreq) 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; @@ -1920,7 +1916,7 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, 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"); @@ -1932,7 +1928,7 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, 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); @@ -1974,7 +1970,7 @@ static CURLcode addexpect(struct Curl_easy *data, struct dynbuf *r, 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 @@ -1990,21 +1986,19 @@ static CURLcode addexpect(struct Curl_easy *data, struct dynbuf *r, 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); @@ -2079,9 +2073,9 @@ out: #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; @@ -2157,8 +2151,8 @@ CURLcode Curl_http_cookies(struct Curl_easy *data, } #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) { /* @@ -2214,7 +2208,7 @@ CURLcode Curl_http_range(struct Curl_easy *data, 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; @@ -2277,7 +2271,7 @@ CURLcode Curl_http_firstwrite(struct Curl_easy *data) } #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) { @@ -2309,7 +2303,6 @@ CURLcode Curl_transferencode(struct Curl_easy *data) } #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 @@ -2370,11 +2363,11 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) 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; @@ -2415,19 +2408,19 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) #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; @@ -2444,7 +2437,7 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) /* 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; @@ -2538,7 +2531,7 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) } } - 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); @@ -2550,7 +2543,7 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) 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); } @@ -2569,8 +2562,6 @@ fail: return result; } -#endif /* USE_HYPER */ - typedef enum { STATUS_UNKNOWN, /* not enough data to tell yet */ STATUS_DONE, /* a status line was read */ @@ -2657,10 +2648,10 @@ checkprotoprefix(struct Curl_easy *data, struct connectdata *conn, 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; @@ -3022,8 +3013,8 @@ CURLcode Curl_http_header(struct Curl_easy *data, * 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; @@ -3116,7 +3107,7 @@ CURLcode Curl_http_statusline(struct Curl_easy *data, 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) { @@ -3264,7 +3255,7 @@ static CURLcode http_on_response(struct Curl_easy *data, * 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 */ @@ -3423,7 +3414,7 @@ static CURLcode http_on_response(struct Curl_easy *data, * 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)) { @@ -3486,13 +3477,13 @@ static CURLcode http_on_response(struct Curl_easy *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) { @@ -3645,7 +3636,7 @@ static CURLcode http_rw_hd(struct Curl_easy *data, } if(fine_statusline) { - result = Curl_http_statusline(data, data->conn); + result = http_statusline(data, data->conn); if(result) return result; writetype |= CLIENTWRITE_STATUS; @@ -3660,7 +3651,7 @@ static CURLcode http_rw_hd(struct Curl_easy *data, if(result) return result; - result = Curl_http_header(data, hd, hdlen); + result = http_header(data, hd, hdlen); if(result) return result; @@ -4359,7 +4350,7 @@ static CURLcode http_exp100_add_reader(struct Curl_easy *data) 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) @@ -4383,7 +4374,7 @@ static void http_exp100_send_anyway(struct Curl_easy *data) 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; diff --git a/lib/http.h b/lib/http.h index 7056e8a8ed..c187e9a11a 100644 --- a/lib/http.h +++ b/lib/http.h @@ -74,40 +74,14 @@ char *Curl_checkProxyheaders(struct Curl_easy *data, 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, @@ -115,9 +89,6 @@ CURLcode Curl_http_cookies(struct Curl_easy *data, #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, @@ -175,8 +146,6 @@ CURLcode Curl_http_auth_act(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 */ @@ -184,8 +153,6 @@ void Curl_http_exp100_got100(struct Curl_easy *data); * 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); diff --git a/lib/http_proxy.c b/lib/http_proxy.c index b1dbe98427..154dc31963 100644 --- a/lib/http_proxy.c +++ b/lib/http_proxy.c @@ -29,9 +29,6 @@ #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) #include -#ifdef USE_HYPER -#include -#endif #include "sendf.h" #include "http.h" #include "url.h" diff --git a/lib/request.c b/lib/request.c index 310e4eac00..b1298a0387 100644 --- a/lib/request.c +++ b/lib/request.c @@ -162,9 +162,6 @@ void Curl_req_hard_reset(struct SingleRequest *req, struct Curl_easy *data) 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) @@ -261,7 +258,7 @@ static CURLcode req_send_buffer_flush(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; @@ -339,7 +336,7 @@ static CURLcode req_flush(struct Curl_easy *data) if(!done) return CURLE_AGAIN; } - return Curl_req_set_upload_done(data); + return req_set_upload_done(data); } return CURLE_OK; } @@ -360,8 +357,6 @@ static ssize_t add_from_client(void *reader_ctx, 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) @@ -411,7 +406,6 @@ CURLcode Curl_req_send(struct Curl_easy *data, struct dynbuf *req) } return CURLE_OK; } -#endif /* !USE_HYPER */ bool Curl_req_sendbuf_empty(struct Curl_easy *data) { @@ -464,7 +458,7 @@ CURLcode Curl_req_abort_sending(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; } diff --git a/lib/request.h b/lib/request.h index bb72247788..b760c2634d 100644 --- a/lib/request.h +++ b/lib/request.h @@ -152,9 +152,6 @@ struct SingleRequest { 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 }; /** @@ -196,7 +193,6 @@ void Curl_req_free(struct SingleRequest *req, struct Curl_easy *data); */ 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 @@ -207,8 +203,6 @@ void Curl_req_hard_reset(struct SingleRequest *req, struct Curl_easy *data); */ 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. */ diff --git a/lib/rtsp.c b/lib/rtsp.c index ecefd132d2..f6f4a33f1c 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -24,7 +24,7 @@ #include "curl_setup.h" -#if !defined(CURL_DISABLE_RTSP) && !defined(USE_HYPER) +#if !defined(CURL_DISABLE_RTSP) #include "urldata.h" #include @@ -1043,4 +1043,4 @@ CURLcode rtsp_parse_transport(struct Curl_easy *data, const char *transport) } -#endif /* CURL_DISABLE_RTSP or using Hyper */ +#endif /* CURL_DISABLE_RTSP */ diff --git a/lib/rtsp.h b/lib/rtsp.h index 41b09503ff..68f6f4fe01 100644 --- a/lib/rtsp.h +++ b/lib/rtsp.h @@ -23,9 +23,6 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#ifdef USE_HYPER -#define CURL_DISABLE_RTSP 1 -#endif #ifndef CURL_DISABLE_RTSP diff --git a/lib/sendf.c b/lib/sendf.c index 30a3517206..bffbd6401e 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -316,9 +316,6 @@ static CURLcode cw_download_write(struct Curl_easy *data, } /* 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; @@ -497,22 +494,6 @@ struct Curl_cwriter *Curl_cwriter_get_by_type(struct Curl_easy *data, 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); diff --git a/lib/sendf.h b/lib/sendf.h index dc1b82edfe..41ca8659c3 100644 --- a/lib/sendf.h +++ b/lib/sendf.h @@ -166,9 +166,6 @@ CURLcode Curl_cwriter_add(struct Curl_easy *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); diff --git a/lib/setopt.c b/lib/setopt.c index 5b7b4af7b3..7366d4a3e6 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -644,13 +644,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option, 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 */ diff --git a/lib/transfer.c b/lib/transfer.c index 92370065e3..6fbe4487f3 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -435,15 +435,6 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp) 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) { @@ -458,9 +449,6 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp) if(result) goto out; } -#ifdef USE_HYPER - } -#endif if(!didwhat) { /* Transfer wanted to send/recv, but nothing was possible. */ diff --git a/lib/urldata.h b/lib/urldata.h index 3f2ee4302e..4e89d98106 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -180,13 +180,6 @@ typedef ssize_t (Curl_recv)(struct Curl_easy *data, /* transfer */ 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" @@ -200,7 +193,6 @@ typedef CURLcode (*Curl_datastream)(struct Curl_easy *data, #include "mqtt.h" #include "ftplistparser.h" #include "multihandle.h" -#include "c-hyper.h" #include "cf-socket.h" #ifdef HAVE_GSSAPI @@ -930,10 +922,7 @@ struct connectdata { #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 @@ -1276,10 +1265,6 @@ struct UrlState { 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 */ @@ -1923,9 +1908,6 @@ struct Curl_easy { 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" diff --git a/lib/version.c b/lib/version.c index 033349b511..6898b4255c 100644 --- a/lib/version.c +++ b/lib/version.c @@ -210,9 +210,6 @@ char *curl_version(void) #ifdef USE_LIBRTMP char rtmp_version[30]; #endif -#ifdef USE_HYPER - char hyper_buf[30]; -#endif #ifdef USE_GSASL char gsasl_buf[30]; #endif @@ -277,10 +274,6 @@ char *curl_version(void) 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)); @@ -676,14 +669,6 @@ curl_version_info_data *curl_version_info(CURLversion stamp) } #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); diff --git a/lib/ws.c b/lib/ws.c index 3d739a538a..0c5479b964 100644 --- a/lib/ws.c +++ b/lib/ws.c @@ -676,7 +676,7 @@ struct wsfield { 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; @@ -729,16 +729,8 @@ CURLcode Curl_ws_request(struct Curl_easy *data, REQTYPE *req) 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; diff --git a/lib/ws.h b/lib/ws.h index 186cc2c63a..e438528359 100644 --- a/lib/ws.h +++ b/lib/ws.h @@ -27,12 +27,6 @@ #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 { @@ -73,7 +67,7 @@ struct websocket { 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; diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md index 4ee907273e..f336f772eb 100644 --- a/tests/FILEFORMAT.md +++ b/tests/FILEFORMAT.md @@ -208,9 +208,6 @@ together as a single identifier. Most keywords are only there to provide a way 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 `` section can be left empty to use the standard unit test tool name `unitN` where `N` is the test number. @@ -447,7 +444,6 @@ Features testable here are: - `http/2` - `http/3` - `HTTPS-proxy` -- `hyper` - `IDN` - `IPv6` - `Kerberos` diff --git a/tests/data/DISABLED b/tests/data/DISABLED index cb666d992f..d80b43d04a 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -54,38 +54,6 @@ # 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 diff --git a/tests/data/test1072 b/tests/data/test1072 index f0390fb7f3..49d2c4f9fe 100644 --- a/tests/data/test1072 +++ b/tests/data/test1072 @@ -63,11 +63,7 @@ Accept: */* Transfer-Encoding: chunked Expect: 100-continue -%if hyper -7A -%else 7a -%endif This is data we upload with PUT it comes from stdin so MUST be sent with chunked encoding diff --git a/tests/data/test1073 b/tests/data/test1073 index 2bc40f0577..f415f0b271 100644 --- a/tests/data/test1073 +++ b/tests/data/test1073 @@ -57,11 +57,7 @@ Accept: */* Transfer-Encoding: chunked Expect: 100-continue -%if hyper -7A -%else 7a -%endif This is data we upload with PUT it comes from stdin so MUST be sent with chunked encoding diff --git a/tests/data/test1116 b/tests/data/test1116 index af323fad68..8feed326ea 100644 --- a/tests/data/test1116 +++ b/tests/data/test1116 @@ -24,10 +24,8 @@ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccc 0 -%if !hyper chunky-trailer: header data another-header: yes -%endif @@ -37,10 +35,8 @@ Transfer-Encoding: chunked Connection: mooo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc -%if !hyper chunky-trailer: header data another-header: yes -%endif writedelay: 10 @@ -77,10 +73,8 @@ Server: fakeit/0.9 fakeitbad/1.0 Transfer-Encoding: chunked Connection: mooo -%if !hyper chunky-trailer: header data another-header: yes -%endif diff --git a/tests/data/test1144 b/tests/data/test1144 index 1881a5190b..be51dae13d 100644 --- a/tests/data/test1144 +++ b/tests/data/test1144 @@ -40,10 +40,6 @@ verify # # Client-side -# hyper doesn't support HTTP/0.9 - -!hyper - http diff --git a/tests/data/test1147 b/tests/data/test1147 index a85aeddb9c..9298e48a18 100644 --- a/tests/data/test1147 +++ b/tests/data/test1147 @@ -40,9 +40,7 @@ One: 1 Two: 2 no-colon -%if !hyper And A Funny One : wohoo -%endif User-Agent: @@ -59,9 +57,7 @@ Host: %HOSTIP:%HTTPPORT Accept: */* One: 1 Two: 2 -%if !hyper And A Funny One : wohoo -%endif diff --git a/tests/data/test1164 b/tests/data/test1164 index d16b98bbf7..f182183501 100644 --- a/tests/data/test1164 +++ b/tests/data/test1164 @@ -22,10 +22,6 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== # # Client-side -# hyper doesn't support HTTP/0.9 - -!hyper - http diff --git a/tests/data/test1266 b/tests/data/test1266 index 913c96cd55..83975116dc 100644 --- a/tests/data/test1266 +++ b/tests/data/test1266 @@ -19,10 +19,6 @@ swsclose # # Client-side -# hyper doesn't grok HTTP/0.9 - -!hyper - http diff --git a/tests/data/test1267 b/tests/data/test1267 index 11b53650cb..d94a330b2c 100644 --- a/tests/data/test1267 +++ b/tests/data/test1267 @@ -19,10 +19,6 @@ swsclose # # Client-side -# hyper doesn't grok HTTP/0.9 - -!hyper - http diff --git a/tests/data/test1274 b/tests/data/test1274 index db37f656d6..1568c1aa6f 100644 --- a/tests/data/test1274 +++ b/tests/data/test1274 @@ -53,22 +53,14 @@ Accept: */* HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT -%if hyper -Server: test-server/ fake folded -%else Server: test-server/ fake folded -%endif Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT ETag: "21025-dc7-39462498" Content-Length: 6 -%if hyper -Connection: close -%else Connection: close -%endif diff --git a/tests/data/test1287 b/tests/data/test1287 index c4815314bf..48d71038ad 100644 --- a/tests/data/test1287 +++ b/tests/data/test1287 @@ -83,10 +83,8 @@ Accept: */* -%if !hyper * Ignoring Content-Length in CONNECT 200 response * Ignoring Transfer-Encoding in CONNECT 200 response -%endif s/^.*(?=\* Ignoring (?:Content-Length|Transfer-Encoding) )// or $_ = '' diff --git a/tests/data/test1294 b/tests/data/test1294 index b16ecb1424..17562fe678 100644 --- a/tests/data/test1294 +++ b/tests/data/test1294 @@ -28,10 +28,8 @@ Funny-head: yesyes # # Client-side -# hyper doesn't support the added crazy header Debug -!hyper http diff --git a/tests/data/test1473 b/tests/data/test1473 index 5e4d18348b..4c0190cea0 100644 --- a/tests/data/test1473 +++ b/tests/data/test1473 @@ -46,11 +46,5 @@ User-Agent: curl/%VERSION Accept: */* -%if hyper -# curl: (1) Hyper: [6] invalid HTTP header parsed - -1 - -%endif diff --git a/tests/data/test1479 b/tests/data/test1479 index 9e22e77f4c..3677b67380 100644 --- a/tests/data/test1479 +++ b/tests/data/test1479 @@ -53,15 +53,9 @@ User-Agent: curl/%VERSION Accept: */* - -# Hyper curl returns unsupported protocol -# built-in curl returns weird_server_reply +# weird_server_reply -%if hyper -1 -%else 8 -%endif diff --git a/tests/data/test1480 b/tests/data/test1480 index 65e0d4a408..0f51f12b64 100644 --- a/tests/data/test1480 +++ b/tests/data/test1480 @@ -45,14 +45,9 @@ Accept: */* -# Hyper curl returns unsupported protocol -# built-in curl returns weird_server_reply +# weird_server_reply -%if hyper -1 -%else 8 -%endif diff --git a/tests/data/test1482 b/tests/data/test1482 index 027ccf2537..2a322f6a86 100644 --- a/tests/data/test1482 +++ b/tests/data/test1482 @@ -24,10 +24,8 @@ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccc 0 -%if !hyper chunky-trailer: header data another-header: yes -%endif @@ -37,10 +35,8 @@ Transfer-Encoding: chunked, chunked Connection: mooo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc -%if !hyper chunky-trailer: header data another-header: yes -%endif writedelay: 10 @@ -77,10 +73,8 @@ Server: fakeit/0.9 fakeitbad/1.0 Transfer-Encoding: chunked, chunked Connection: mooo -%if !hyper chunky-trailer: header data another-header: yes -%endif diff --git a/tests/data/test1483 b/tests/data/test1483 index 5bb59a9c9f..60ff2104b2 100644 --- a/tests/data/test1483 +++ b/tests/data/test1483 @@ -25,10 +25,8 @@ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccc 0 -%if !hyper chunky-trailer: header data another-header: yes -%endif @@ -39,10 +37,8 @@ Transfer-Encoding: chunked Connection: mooo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc -%if !hyper chunky-trailer: header data another-header: yes -%endif writedelay: 10 @@ -80,10 +76,8 @@ Transfer-Encoding: chunked Transfer-Encoding: chunked Connection: mooo -%if !hyper chunky-trailer: header data another-header: yes -%endif diff --git a/tests/data/test1591 b/tests/data/test1591 index 4bc02dd130..738696db1c 100644 --- a/tests/data/test1591 +++ b/tests/data/test1591 @@ -48,11 +48,7 @@ Transfer-Encoding: chunked Trailer: my-super-awesome-trailer, my-other-awesome-trailer Expect: 100-continue -%if hyper -E -%else e -%endif Hello Cloud! 0 diff --git a/tests/data/test178 b/tests/data/test178 index 94ea47ecb3..afff507273 100644 --- a/tests/data/test178 +++ b/tests/data/test178 @@ -19,11 +19,8 @@ Funny-head: yesyes moooooooooooo -%if hyper -%else HTTP/1.1 200 OK swsclose Date: Tue, 09 Nov 2010 14:49:00 GMT -%endif @@ -51,15 +48,9 @@ User-Agent: curl/%VERSION Accept: */* - -# Hyper curl returns unsupported protocol -# built-in curl returns weird_server_reply +# weird_server_reply -%if hyper -1 -%else 8 -%endif diff --git a/tests/data/test207 b/tests/data/test207 index 0c9bcaeb67..4c0e0c72ea 100644 --- a/tests/data/test207 +++ b/tests/data/test207 @@ -58,13 +58,8 @@ Accept: */* # curl: (18) transfer closed with outstanding read data remaining # 18 == CURLE_PARTIAL_FILE -# 56 == CURLE_RECV_ERROR -%if hyper -56 -%else 18 -%endif diff --git a/tests/data/test218 b/tests/data/test218 index cf9c41ad49..b5e2b08b2f 100644 --- a/tests/data/test218 +++ b/tests/data/test218 @@ -46,11 +46,7 @@ User-Agent: curl/%VERSION Accept: */* Transfer-Encoding: chunked -%if hyper -1E -%else 1e -%endif just some tiny teeny contents 0 diff --git a/tests/data/test2306 b/tests/data/test2306 index da2f25a213..620f7b5ecc 100644 --- a/tests/data/test2306 +++ b/tests/data/test2306 @@ -54,14 +54,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 # # Verify data after the test has been "shot" -# hyper doesn't like the bad header in the second request - -%if hyper -1 -%else -0 -%endif - GET /%TESTNUMBER HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2307 b/tests/data/test2307 index 7c9f625b0b..b51b08db22 100644 --- a/tests/data/test2307 +++ b/tests/data/test2307 @@ -31,7 +31,6 @@ upgrade Debug ws -!hyper http diff --git a/tests/data/test262 b/tests/data/test262 index ef9c731f5e..a74e80ff26 100644 Binary files a/tests/data/test262 and b/tests/data/test262 differ diff --git a/tests/data/test269 b/tests/data/test269 index 724fa4dc97..e9e7843d44 100644 --- a/tests/data/test269 +++ b/tests/data/test269 @@ -26,9 +26,6 @@ muahahaha # # Client-side - -!hyper - http diff --git a/tests/data/test28 b/tests/data/test28 index 24815a2c2c..667d8f97f6 100644 --- a/tests/data/test28 +++ b/tests/data/test28 @@ -30,11 +30,7 @@ If this is received, the location following worked 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 diff --git a/tests/data/test3025 b/tests/data/test3025 index eaff47ce74..82d168c0ca 100644 --- a/tests/data/test3025 +++ b/tests/data/test3025 @@ -23,9 +23,6 @@ MooMoo http - -!hyper - CURLOPT_HTTP200ALIASES diff --git a/tests/data/test306 b/tests/data/test306 index a7e477e4de..463558e5ee 100644 --- a/tests/data/test306 +++ b/tests/data/test306 @@ -37,7 +37,6 @@ verify SSL -!hyper https diff --git a/tests/data/test31 b/tests/data/test31 index 2d411b5cd9..4517054861 100644 --- a/tests/data/test31 +++ b/tests/data/test31 @@ -9,10 +9,6 @@ cookiejar # 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". @@ -23,7 +19,6 @@ Content-Length: 4 Content-Type: text/html Funny-head: yesyes Set-Cookie: blankdomain=sure; domain=; path=/ -%if !hyper Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure Set-Cookie:ismatch=this ; domain=test31.curl; path=/silly/ Set-Cookie:ISMATCH=this ; domain=test31.curl; path=/silly/ @@ -73,57 +68,6 @@ Set-Cookie: withspaces= yes within and around ; Set-Cookie: withspaces2 =before equals; Set-Cookie: prespace= yes before; Set-Cookie: securewithspace=after ; secure = -%else -Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure -Set-Cookie: ismatch=this ; domain=test31.curl; path=/silly/ -Set-Cookie:ISMATCH=this ; domain=test31.curl; path=/silly/ -Set-Cookie: overwrite=this ; domain=test31.curl; path=/overwrite/ -Set-Cookie: overwrite=this2 ; domain=test31.curl; path=/overwrite -Set-Cookie: sec1value=secure1 ; domain=test31.curl; path=/secure1/ ; secure -Set-Cookie: sec2value=secure2 ; domain=test31.curl; path=/secure2/ ; secure= -Set-Cookie: sec3value=secure3 ; domain=test31.curl; path=/secure3/ ; secure= -Set-Cookie: sec4value=secure4 ; secure=; domain=test31.curl; path=/secure4/ ; -Set-Cookie: sec5value=secure5 ; secure; domain=test31.curl; path=/secure5/ ; -Set-Cookie: sec6value=secure6 ; secure ; domain=test31.curl; path=/secure6/ ; -Set-Cookie: sec7value=secure7 ; secure ; domain=test31.curl; path=/secure7/ ; -Set-Cookie: sec8value=secure8 ; secure= ; domain=test31.curl; path=/secure8/ ; -Set-Cookie: secure=very1 ; secure=; domain=test31.curl; path=/secure9/; -Set-Cookie: httpo1=value1 ; domain=test31.curl; path=/p1/; httponly -Set-Cookie: httpo2=value2 ; domain=test31.curl; path=/p2/; httponly= -Set-Cookie: httpo3=value3 ; httponly; domain=test31.curl; path=/p3/; -Set-Cookie: httpo4=value4 ; httponly=; domain=test31.curl; path=/p4/; -Set-Cookie: httponly=myvalue1 ; domain=test31.curl; path=/p4/; httponly -Set-Cookie: httpandsec=myvalue2 ; domain=test31.curl; path=/p4/; httponly; secure -Set-Cookie: httpandsec2=myvalue3; domain=test31.curl; path=/p4/; httponly=; secure -Set-Cookie: httpandsec3=myvalue4 ; domain=test31.curl; path=/p4/; httponly; secure= -Set-Cookie: httpandsec4=myvalue5 ; domain=test31.curl; path=/p4/; httponly=; secure= -Set-Cookie: httpandsec5=myvalue6 ; domain=test31.curl; path=/p4/; secure; httponly= -Set-Cookie: httpandsec6=myvalue7 ; domain=test31.curl; path=/p4/; secure=; httponly= -Set-Cookie: httpandsec7=myvalue8 ; domain=test31.curl; path=/p4/; secure; httponly -Set-Cookie: httpandsec8=myvalue9; domain=test31.curl; path=/p4/; secure=; httponly -Set-Cookie: partmatch=present; domain=test31.curl ; path=/; -Set-Cookie: eat=this; domain=moo.foo.moo; -Set-Cookie: eat=this-too; domain=.foo.moo; -Set-Cookie: nodomainnovalue -%if large-time -Set-Cookie: nodomain=value; expires=Fri Feb 13 11:56:27 GMT 2525 -Set-Cookie: novalue; domain=reallysilly -Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2525 -Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2525 -%else -Set-Cookie: nodomain=value; expires=Fri Feb 13 11:56:27 GMT 2037 -Set-Cookie: novalue; domain=reallysilly -Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030 -Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030 -%endif -Set-Cookie: magic=yessir; path=/silly/; HttpOnly -Set-Cookie: blexp=yesyes; domain=test31.curl; domain=test31.curl; expiry=totally bad; -Set-Cookie: partialip=nono; domain=.0.0.1; -Set-Cookie: withspaces= yes within and around ; -Set-Cookie: withspaces2 =before equals; -Set-Cookie: prespace= yes before; -Set-Cookie: securewithspace=after ; secure = -%endif boo diff --git a/tests/data/test326 b/tests/data/test326 index f2f25ef34c..920a9c1af6 100644 --- a/tests/data/test326 +++ b/tests/data/test326 @@ -39,9 +39,6 @@ line 1 # # Client-side - -!hyper - http diff --git a/tests/data/test376 b/tests/data/test376 index 991077caf7..6913788a3b 100644 --- a/tests/data/test376 +++ b/tests/data/test376 @@ -40,14 +40,10 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-err # -# Verify data after the test has been "shot". hyper doesn't do error 18 +# Verify data after the test has been "shot" -%if hyper -56 -%else 18 -%endif GET /%TESTNUMBER HTTP/1.1 diff --git a/tests/data/test379 b/tests/data/test379 index 964cbdf055..0d727ccf26 100644 --- a/tests/data/test379 +++ b/tests/data/test379 @@ -43,14 +43,10 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clob # -# Verify data after the test has been "shot". hyper doesn't do error 18 +# Verify data after the test has been "shot". -%if hyper -56 -%else 18 -%endif GET /%TESTNUMBER HTTP/1.1 diff --git a/tests/data/test393 b/tests/data/test393 index 0cbbf2d2dc..a9cad70792 100644 --- a/tests/data/test393 +++ b/tests/data/test393 @@ -18,11 +18,7 @@ Server: test-server/fake 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 diff --git a/tests/data/test394 b/tests/data/test394 index 2154297d2f..3533447f57 100644 --- a/tests/data/test394 +++ b/tests/data/test394 @@ -44,11 +44,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER # Verify data after the test has been "shot" -%if hyper -1 -%else 8 -%endif GET /%TESTNUMBER HTTP/1.1 diff --git a/tests/data/test395 b/tests/data/test395 index 9bdb2e24a6..8dbd4e964d 100644 --- a/tests/data/test395 +++ b/tests/data/test395 @@ -49,12 +49,5 @@ User-Agent: curl/%VERSION Accept: */* - -# hyper cannot work with too-large content-length -%if hyper - -1 - -%endif diff --git a/tests/data/test398 b/tests/data/test398 index 227478b5b5..eab125272c 100644 --- a/tests/data/test398 +++ b/tests/data/test398 @@ -54,11 +54,7 @@ Accept: */* -%if hyper -1 -%else 8 -%endif diff --git a/tests/data/test40 b/tests/data/test40 index 3f56956583..16e9426c86 100644 --- a/tests/data/test40 +++ b/tests/data/test40 @@ -26,11 +26,7 @@ body HTTP/1.1 302 OK swsclose -%if !hyper Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002 -%else -Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002 -%endif Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close diff --git a/tests/data/test415 b/tests/data/test415 index 08d60482d2..f0cecd267f 100644 --- a/tests/data/test415 +++ b/tests/data/test415 @@ -19,11 +19,8 @@ Funny-head: yesyes moooooooooooo -%if hyper -%else HTTP/1.1 200 OK swsclose Date: Tue, 09 Nov 2010 14:49:00 GMT -%endif @@ -52,14 +49,9 @@ Accept: */* -# Hyper curl returns unsupported protocol # built-in curl returns weird_server_reply -%if hyper -1 -%else 8 -%endif diff --git a/tests/data/test42 b/tests/data/test42 index 50e5018066..85a4c88c65 100644 --- a/tests/data/test42 +++ b/tests/data/test42 @@ -26,11 +26,7 @@ body HTTP/1.1 302 OK swsclose -%if !hyper Location: ../m o o.html/%TESTNUMBER0002 -%else -Location: ../m o o.html/%TESTNUMBER0002 -%endif Date: Tue, 09 Nov 2010 14:49:00 GMT Connection: close diff --git a/tests/data/test470 b/tests/data/test470 index 70e50e621d..a3f05f8cbe 100644 --- a/tests/data/test470 +++ b/tests/data/test470 @@ -28,9 +28,6 @@ Funny-head: yesyes # # Client-side - -!hyper - http diff --git a/tests/data/test497 b/tests/data/test497 index 4935d3e50e..3966ab2256 100644 --- a/tests/data/test497 +++ b/tests/data/test497 @@ -49,14 +49,8 @@ Accept: */* # curl: (56) Too large response headers: 307215 > 307200 -# hyper returns a generic error that libcurl converts to an even more -# generic error -%if hyper -1 -%else 56 -%endif diff --git a/tests/data/test498 b/tests/data/test498 index b1fc02380b..6d9454c066 100644 --- a/tests/data/test498 +++ b/tests/data/test498 @@ -43,14 +43,8 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-redirs 400 --location # Verify data after the test has been "shot" # curl: (56) Too large response headers: 6144086 > 6144000 -# hyper returns a generic error that libcurl converts to an even more -# generic error -%if hyper -1 -%else 56 -%endif diff --git a/tests/data/test510 b/tests/data/test510 index 36d6c1f137..ed16920dd7 100644 --- a/tests/data/test510 +++ b/tests/data/test510 @@ -56,11 +56,7 @@ one two 5 three -%if hyper -1D -%else 1d -%endif and a final longer crap: four 0 diff --git a/tests/data/test56 b/tests/data/test56 index 8e4a12a902..32590f27c7 100644 --- a/tests/data/test56 +++ b/tests/data/test56 @@ -52,11 +52,7 @@ Accept: */* Transfer-Encoding: chunked Content-Type: application/x-www-form-urlencoded -%if hyper -C -%else c -%endif we post this 0 diff --git a/tests/data/test565 b/tests/data/test565 index 2587c68d6b..cd398a7435 100644 --- a/tests/data/test565 +++ b/tests/data/test565 @@ -100,11 +100,7 @@ one two 5 three -%if hyper -1D -%else 1d -%endif and a final longer crap: four 0 diff --git a/tests/data/test60 b/tests/data/test60 index 14338b4401..164b2189e3 100644 --- a/tests/data/test60 +++ b/tests/data/test60 @@ -43,9 +43,7 @@ Host: %HOSTIP:%HTTPPORT User-Agent: curl/%VERSION Accept: */* Transfer-Encoding: chunked -%if !hyper Content-Length: 1 -%endif Expect: 100-continue 13 diff --git a/tests/data/test645 b/tests/data/test645 index 82ee1d0a2a..68c78ce9a1 100644 --- a/tests/data/test645 +++ b/tests/data/test645 @@ -76,11 +76,7 @@ Transfer-Encoding: chunked Content-Type: multipart/form-data; boundary=---------------------------- Expect: 100-continue -%if hyper -7C -%else 7c -%endif ------------------------------ Content-Disposition: form-data; name="sendfile"; filename="postit2.c" @@ -96,11 +92,7 @@ y 1 -%if hyper -6B -%else 6b -%endif ------------------------------ Content-Disposition: form-data; name="callbackdata" @@ -119,11 +111,7 @@ y 1 -%if hyper -1B2 -%else 1b2 -%endif ------------------------------ Content-Disposition: form-data; name="filename" @@ -149,11 +137,7 @@ Transfer-Encoding: chunked Content-Type: multipart/form-data; boundary=---------------------------- Expect: 100-continue -%if hyper -8A -%else 8a -%endif ------------------------------ Content-Disposition: form-data; name="sendfile alternative"; filename="file name 2" @@ -169,11 +153,7 @@ y 1 -%if hyper -6B -%else 6b -%endif ------------------------------ Content-Disposition: form-data; name="callbackdata" @@ -192,11 +172,7 @@ y 1 -%if hyper -1B2 -%else 1b2 -%endif ------------------------------ Content-Disposition: form-data; name="filename" diff --git a/tests/data/test650 b/tests/data/test650 index 02876fbca1..acd2c5f194 100644 --- a/tests/data/test650 +++ b/tests/data/test650 @@ -104,11 +104,7 @@ Content-Disposition: attachment; filename="test%TESTNUMBER.filedata" Content-Type: text/whatever -%if hyper -AB -%else ab -%endif This is data from a file. ------------------------------ @@ -116,11 +112,7 @@ Content-Disposition: attachment; filename="test%TESTNUMBER.filedata" Content-Type: text/whatever -%if hyper -BB -%else bb -%endif This is data from a file. -------------------------------- @@ -129,11 +121,7 @@ This is data from a file. Content-Disposition: form-data; name="filecontents" -%if hyper -11B -%else 11b -%endif This is data from a file. ------------------------------ @@ -188,11 +176,7 @@ Content-Disposition: attachment; filename="test%TESTNUMBER.filedata" Content-Type: text/whatever -%if hyper -AB -%else ab -%endif This is data from a file. ------------------------------ @@ -200,11 +184,7 @@ Content-Disposition: attachment; filename="test%TESTNUMBER.filedata" Content-Type: text/whatever -%if hyper -BB -%else bb -%endif This is data from a file. -------------------------------- @@ -213,11 +193,7 @@ This is data from a file. Content-Disposition: form-data; name="filecontents" -%if hyper -11B -%else 11b -%endif This is data from a file. ------------------------------ diff --git a/tests/data/test654 b/tests/data/test654 index 47415e209b..df960f29e1 100644 --- a/tests/data/test654 +++ b/tests/data/test654 @@ -84,11 +84,7 @@ Transfer-Encoding: chunked Content-Type: multipart/form-data; boundary=---------------------------- Expect: 100-continue -%if hyper -1C1 -%else 1c1 -%endif ------------------------------ Content-Disposition: form-data; name="greeting" Content-Type: application/X-Greeting diff --git a/tests/data/test66 b/tests/data/test66 index 13aa08384f..d4e20c0fe4 100644 --- a/tests/data/test66 +++ b/tests/data/test66 @@ -15,9 +15,6 @@ no headers swsclose # Client-side - -!hyper - http diff --git a/tests/data/test667 b/tests/data/test667 index d62a81d0fb..e7298094d0 100644 --- a/tests/data/test667 +++ b/tests/data/test667 @@ -77,11 +77,7 @@ Content-Transfer-Encoding: base64 4 ZHVt -%if hyper -3A -%else 3a -%endif bXk= -------------------------------- diff --git a/tests/data/test668 b/tests/data/test668 index 14905ddc60..e71475b682 100644 --- a/tests/data/test668 +++ b/tests/data/test668 @@ -72,11 +72,7 @@ Transfer-Encoding: chunked Content-Type: multipart/form-data; boundary=---------------------------- Expect: 100-continue -%if hyper -CD -%else cd -%endif ------------------------------ Content-Disposition: form-data; name="field1" @@ -94,11 +90,7 @@ Content-Disposition: form-data; name="field3"; filename="file%TESTNUMBER.txt" Content-Type: text/plain -%if hyper -4F -%else 4f -%endif This is data from a file -------------------------------- diff --git a/tests/http/scorecard.py b/tests/http/scorecard.py index c675d9c5ee..f19db34cad 100644 --- a/tests/http/scorecard.py +++ b/tests/http/scorecard.py @@ -450,15 +450,14 @@ class ScoreCard: 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}") diff --git a/tests/runner.pm b/tests/runner.pm index 1ee773eb8e..198da68668 100644 --- a/tests/runner.pm +++ b/tests/runner.pm @@ -356,8 +356,7 @@ sub prepro { # The processor does CRLF replacements in the sections if # necessary since those parts might be read by separate servers. if($s =~ /^ */) { - if($1 =~ /crlf="yes"/ || - ($feature{"hyper"} && ($keywords{"HTTP"} || $keywords{"HTTPS"}))) { + if($1 =~ /crlf="yes"/) { $data_crlf = 1; } } diff --git a/tests/runtests.pl b/tests/runtests.pl index 7cfbd65479..3d3a1a8603 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -591,11 +591,8 @@ sub checksystemfeatures { $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/) { @@ -1286,9 +1283,7 @@ sub singletest_check { chomp($validstdout[-1]); } - if($hash{'crlf'} || - ($feature{"hyper"} && ($keywords{"HTTP"} - || $keywords{"HTTPS"}))) { + if($hash{'crlf'}) { subnewlines(0, \$_) for @validstdout; } @@ -1326,12 +1321,6 @@ sub singletest_check { # 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); @@ -1434,9 +1423,7 @@ sub singletest_check { # 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); @@ -1457,9 +1444,7 @@ sub singletest_check { if($filemode && ($filemode eq "text")) { normalize_text(\@reply); } - if($replyattr{'crlf'} || - ($feature{"hyper"} && ($keywords{"HTTP"} - || $keywords{"HTTPS"}))) { + if($replyattr{'crlf'}) { subnewlines(0, \$_) for @reply; } } @@ -1552,8 +1537,7 @@ sub singletest_check { } } - if($hash{'crlf'} || - ($feature{"hyper"} && ($keywords{"HTTP"} || $keywords{"HTTPS"}))) { + if($hash{'crlf'}) { subnewlines(0, \$_) for @proxyprot; } @@ -1611,9 +1595,7 @@ sub singletest_check { normalize_text(\@outfile); normalize_text(\@generated); } - if($hash{'crlf'} || - ($feature{"hyper"} && ($keywords{"HTTP"} - || $keywords{"HTTPS"}))) { + if($hash{'crlf'}) { subnewlines(0, \$_) for @outfile; } diff --git a/tests/testutil.pm b/tests/testutil.pm index bccf75185e..71b1495bc3 100644 --- a/tests/testutil.pm +++ b/tests/testutil.pm @@ -150,13 +150,6 @@ sub subnewlines { 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) && diff --git a/tests/valgrind.supp b/tests/valgrind.supp index 787943eaa7..aad7255248 100644 --- a/tests/valgrind.supp +++ b/tests/valgrind.supp @@ -1,12 +1,3 @@ -{ - 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