mirror/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-01-27 01:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: disable TCP_NODELAY for emscripten

Browse Source 
In WebAssembly, using `TCP_NODELAY` fails with:
```
* Could not set TCP_NODELAY: Protocol not available
```

Add a new feature macro in `curl_setup.h` telling whether `TCP_NODELAY`
is known to be supported at runtime, when defined at compile-time.

Keep `TCP_NODELAY` guards at their current positions to ensure the
necessary headers (e.g. `netinet/tcp.h` and `netinet/in.h`) define it.

Reported-by: Jeroen Ooms
Fixes #17974
Closes #18155
This commit is contained in:
Viktor Szakats 2025-08-03 23:48:53 +02:00
parent 74ba04f5b2
commit 06c12cc08b
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cf-socket.c
View File

@ -109,7 +109,7 @@ static void set_ipv6_v6only(curl_socket_t sockfd, int on)
static void tcpnodelay(struct Curl_easy *data, curl_socket_t sockfd)
{
#ifdef TCP_NODELAY
#if defined(TCP_NODELAY) && defined(CURL_TCP_NODELAY_SUPPORTED)
curl_socklen_t onoff = (curl_socklen_t) 1;
int level = IPPROTO_TCP;
char buffer[STRERROR_LEN];

5
lib/curl_setup.h
View File

@ -1125,6 +1125,11 @@ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf,
#define USE_HTTP3
#endif
/* WebAssembly builds have TCP_NODELAY, but runtime support is missing. */
#ifndef __EMSCRIPTEN__
#define CURL_TCP_NODELAY_SUPPORTED
#endif
/* Certain Windows implementations are not aligned with what curl expects,
so always use the local one on this platform. E.g. the mingw-w64
implementation can return wrong results for non-ASCII inputs. */

2
tests/server/rtspd.c
View File

@ -1224,7 +1224,7 @@ static int test_rtspd(int argc, char *argv[])
logmsg("====> Client connect");
#ifdef TCP_NODELAY
#if defined(TCP_NODELAY) && !defined(__EMSCRIPTEN__)
/*
* Disable the Nagle algorithm to make it easier to send out a large
* response in many small segments to torture the clients more.

8
tests/server/sws.c
View File

@ -158,7 +158,7 @@ static const char *doc404 = "HTTP/1.1 404 Not Found\r\n"
/* work around for handling trailing headers */
static int already_recv_zeroed_chunk = FALSE;
#ifdef TCP_NODELAY
#if defined(TCP_NODELAY) && defined(CURL_TCP_NODELAY_SUPPORTED)
/* returns true if the current socket is an IP one */
static bool socket_domain_is_ip(void)
{
@ -1239,7 +1239,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
return CURL_SOCKET_BAD;
}
#ifdef TCP_NODELAY
#if defined(TCP_NODELAY) && defined(CURL_TCP_NODELAY_SUPPORTED)
if(socket_domain_is_ip()) {
/* Disable the Nagle algorithm */
curl_socklen_t flag = 1;
@ -1545,7 +1545,7 @@ static void http_connect(curl_socket_t *infdp,
}
memset(req2, 0, sizeof(*req2));
logmsg("====> Client connect DATA");
#ifdef TCP_NODELAY
#if defined(TCP_NODELAY) && defined(CURL_TCP_NODELAY_SUPPORTED)
if(socket_domain_is_ip()) {
/* Disable the Nagle algorithm */
curl_socklen_t flag = 1;
@ -1871,7 +1871,7 @@ static curl_socket_t accept_connection(curl_socket_t sock)
all_sockets[num_sockets] = msgsock;
num_sockets += 1;
#ifdef TCP_NODELAY
#if defined(TCP_NODELAY) && defined(CURL_TCP_NODELAY_SUPPORTED)
if(socket_domain_is_ip()) {
/*
* Disable the Nagle algorithm to make it easier to send out a large