diff options
| author | Florian Dold <florian.dold@gmail.com> | 2019-05-02 00:49:13 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2019-05-02 00:49:13 +0200 |
| commit | aac2101603f351d5bd2748c0e2d9227813e99fb1 (patch) | |
| tree | cfa5b3bfa0cc7a9c36a1d16d6f17a6755d7153b2 | |
| parent | 215b25da476d1547c6cde242e1efc742e8a39ecd (diff) | |
| download | gnurl-old-tfo.tar.gz gnurl-old-tfo.tar.bz2 gnurl-old-tfo.zip | |
Temporarily remove the new way to to TFO.old-tfo
| -rw-r--r-- | lib/connect.c | 11 | ||||
| -rw-r--r-- | lib/sendf.c | 2 | ||||
| -rw-r--r-- | lib/setopt.c | 3 |
3 files changed, 2 insertions, 14 deletions
diff --git a/lib/connect.c b/lib/connect.c index a53d79c21..ce97b75a2 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -1005,9 +1005,6 @@ static CURLcode singleipconnect(struct connectdata *conn, char ipaddress[MAX_IPADR_LEN]; long port; bool is_tcp; -#ifdef TCP_FASTOPEN_CONNECT - int optval = 1; -#endif char buffer[STRERROR_LEN]; *sockp = CURL_SOCKET_BAD; @@ -1114,14 +1111,6 @@ static CURLcode singleipconnect(struct connectdata *conn, # else rc = connect(sockfd, &addr.sa_addr, addr.addrlen); # endif /* HAVE_BUILTIN_AVAILABLE */ -#elif defined(TCP_FASTOPEN_CONNECT) /* Linux >= 4.11 */ - if(setsockopt(sockfd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT, - (void *)&optval, sizeof(optval)) < 0) - infof(data, "Failed to enable TCP Fast Open on fd %d\n", sockfd); - else - infof(data, "TCP_FASTOPEN_CONNECT set\n"); - - rc = connect(sockfd, &addr.sa_addr, addr.addrlen); #elif defined(MSG_FASTOPEN) /* old Linux */ if(conn->given->flags & PROTOPT_SSL) rc = connect(sockfd, &addr.sa_addr, addr.addrlen); diff --git a/lib/sendf.c b/lib/sendf.c index 9a04b4af2..df56992f5 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -380,7 +380,7 @@ ssize_t Curl_send_plain(struct connectdata *conn, int num, available. */ pre_receive_plain(conn, num); -#if defined(MSG_FASTOPEN) && !defined(TCP_FASTOPEN_CONNECT) /* Linux */ +#if defined(MSG_FASTOPEN) /* Linux */ if(conn->bits.tcp_fastopen) { bytes_written = sendto(sockfd, mem, len, MSG_FASTOPEN, conn->ip_addr->ai_addr, conn->ip_addr->ai_addrlen); diff --git a/lib/setopt.c b/lib/setopt.c index b5f74a93d..7fd15132e 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -2555,8 +2555,7 @@ static CURLcode vsetopt(struct Curl_easy *data, CURLoption option, data->set.tcp_keepintvl = arg; break; case CURLOPT_TCP_FASTOPEN: -#if defined(CONNECT_DATA_IDEMPOTENT) || defined(MSG_FASTOPEN) || \ - defined(TCP_FASTOPEN_CONNECT) +#if defined(CONNECT_DATA_IDEMPOTENT) || defined(MSG_FASTOPEN) data->set.tcp_fastopen = (0 != va_arg(param, long))?TRUE:FALSE; #else result = CURLE_NOT_BUILT_IN; |