mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 18:03:30 -04:00
5d5e35fb9b
## Problem Windows builds break with a current local toolchain (Scoop LLVM 22.1.8, CMake 4.4.0, VS 2026), in two independent ways: 1. The build stops at curl's deliberate guard: `#error "no non-blocking method was found/used/set"` in `third-party/curl/lib/nonblock.c`. 2. From the second configure onward, `cmake --build` re-runs CMake in an endless loop (observed 42 consecutive reconfigure cycles in a single build). Likely the same mechanism behind the "endlessly building" VS 2026 note in `docs/setup/dev/vs.md`. ## Root cause 1. `third-party/curl/CMake/CurlTests.c` passes `int *` to `ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes `-Wincompatible-pointer-types` to a hard error in C, so the `HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and `curl_config.h` never defines it. Upstream CI does not see this because the windows-2022 runner image ships an older LLVM. GCC 14 promotes the same warning to a hard error, which is very likely the `CurlTests.c.obj` failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0 (curl/curl#13578). 2. The root CMakeLists copies the build tree's `compile_commands.json` into `<src>/build/` for clangd using `configure_file()`, which registers its input as a configure dependency. CMake rewrites `compile_commands.json` late in every generation, after `CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same Ninja regen rule), so once the dependency is registered the rule is deterministically dirty and every `ninja` invocation re-runs CMake. A pristine first configure is safe (the file does not exist yet, so the `if(EXISTS ...)` guard skips the copy), which is why the loop looks machine- or IDE-specific. ## Fix 1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag (previously `curl-8_3_0`), which carries the upstream probe fix plus two years of upstream development; `vendor.yaml` updated to match. Adjustments the version jump forced: - curl 8.15 removed the native macOS Secure Transport backend (`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like Linux. The two macOS workflows install Homebrew `openssl@3` and export `OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same two lines. - `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10; pinned OFF to keep the previous no-compression behavior and avoid silently linking whatever the CI images happen to have. - curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked into discord-rpc's identically named option and broke configure at a nonexistent `examples/send-presence` directory; pinned OFF ahead of the third-party subdirectories. The diff is dominated by the mechanical tag-tree swap under `third-party/curl` (linguist-vendored, collapsed in review). The hand-written changes are `CMakeLists.txt`, the two macOS workflows, `docs/setup/system/macos.md`, and `vendor.yaml`. 2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy with no configure dependency registered. (`file(COPY_FILE ... ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21, above the declared `cmake_minimum_required(VERSION 3.10)`.) ## Test plan - [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache seeding) completes and logs `Enabled SSL backends: Schannel`; the FIONBIO probe passes without the previous `#error` - [x] Full Windows Release build from scratch in the branch worktree (all 1422 targets) - [x] goalc-test suite: 1509 passed, 0 failed - [x] Second consecutive configure with `compile_commands.json` present: the regen rule in `build.ninja` has no `compile_commands.json` input; `<src>/build/compile_commands.json` is still refreshed for clangd - [x] Repeated `ninja` invocations after a full build no longer re-run CMake - [x] macOS Intel and ARM CI green (first exercise of the OpenSSL backend switch) --- I work off a self-hosted forge, so this GitHub account is quiet; the configure logs and ninja dirty-node traces from the investigation are available if anyone wants the raw data. (AI-assisted)
147 lines
5.1 KiB
C
Vendored
Generated
147 lines
5.1 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_HTTP_CHUNKS_H
|
|
#define HEADER_CURL_HTTP_CHUNKS_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.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"
|
|
|
|
#ifndef CURL_DISABLE_HTTP
|
|
|
|
#include "curlx/dynbuf.h"
|
|
|
|
struct connectdata;
|
|
|
|
/*
|
|
* The longest possible hexadecimal number we support in a chunked transfer.
|
|
* Neither RFC2616 nor the later HTTP specs define a maximum chunk size.
|
|
* For 64-bit curl_off_t we support 16 digits. For 32-bit, 8 digits.
|
|
*/
|
|
#define CHUNK_MAXNUM_LEN (SIZEOF_CURL_OFF_T * 2)
|
|
|
|
typedef enum {
|
|
/* await and buffer all hexadecimal digits until we get one that is not a
|
|
hexadecimal digit. When done, we go CHUNK_LF */
|
|
CHUNK_HEX,
|
|
|
|
/* wait for LF, ignore all else */
|
|
CHUNK_LF,
|
|
|
|
/* We eat the amount of data specified. When done, we move on to the
|
|
POST_CR state. */
|
|
CHUNK_DATA,
|
|
|
|
/* POSTLF should get a CR and then an LF and nothing else, then move back to
|
|
HEX as the CRLF combination marks the end of a chunk. A missing CR is no
|
|
big deal. */
|
|
CHUNK_POSTLF,
|
|
|
|
/* Used to mark that we are out of the game. NOTE: that there is a
|
|
'datasize' field in the struct that will tell how many bytes that were
|
|
not passed to the client in the end of the last buffer! */
|
|
CHUNK_STOP,
|
|
|
|
/* At this point optional trailer headers can be found, unless the next line
|
|
is CRLF */
|
|
CHUNK_TRAILER,
|
|
|
|
/* A trailer CR has been found - next state is CHUNK_TRAILER_POSTCR.
|
|
Next char must be an LF */
|
|
CHUNK_TRAILER_CR,
|
|
|
|
/* A trailer LF must be found now, otherwise CHUNKE_BAD_CHUNK will be
|
|
signalled If this is an empty trailer CHUNKE_STOP will be signalled.
|
|
Otherwise the trailer will be broadcasted via Curl_client_write() and the
|
|
next state will be CHUNK_TRAILER */
|
|
CHUNK_TRAILER_POSTCR,
|
|
|
|
/* Successfully de-chunked everything */
|
|
CHUNK_DONE,
|
|
|
|
/* Failed on seeing a bad or not correctly terminated chunk */
|
|
CHUNK_FAILED
|
|
} ChunkyState;
|
|
|
|
typedef enum {
|
|
CHUNKE_OK = 0,
|
|
CHUNKE_TOO_LONG_HEX = 1,
|
|
CHUNKE_ILLEGAL_HEX,
|
|
CHUNKE_BAD_CHUNK,
|
|
CHUNKE_BAD_ENCODING,
|
|
CHUNKE_OUT_OF_MEMORY,
|
|
CHUNKE_PASSTHRU_ERROR /* Curl_httpchunk_read() returns a CURLcode to use */
|
|
} CHUNKcode;
|
|
|
|
struct Curl_chunker {
|
|
curl_off_t datasize;
|
|
ChunkyState state;
|
|
CHUNKcode last_code;
|
|
struct dynbuf trailer; /* for chunked-encoded trailer */
|
|
unsigned char hexindex;
|
|
char hexbuffer[CHUNK_MAXNUM_LEN + 1]; /* +1 for null-terminator */
|
|
BIT(ignore_body); /* never write response body data */
|
|
};
|
|
|
|
/* The following functions are defined in http_chunks.c */
|
|
void Curl_httpchunk_init(struct Curl_easy *data, struct Curl_chunker *ch,
|
|
bool ignore_body);
|
|
void Curl_httpchunk_free(struct Curl_easy *data, struct Curl_chunker *ch);
|
|
void Curl_httpchunk_reset(struct Curl_easy *data, struct Curl_chunker *ch,
|
|
bool ignore_body);
|
|
|
|
/*
|
|
* Read BODY bytes in HTTP/1.1 chunked encoding from `buf` and return
|
|
* the amount of bytes consumed. The actual response bytes and trailer
|
|
* headers are written out to the client.
|
|
* On success, this will consume all bytes up to the end of the response,
|
|
* e.g. the last chunk, has been processed.
|
|
* @param data the transfer involved
|
|
* @param ch the chunker instance keeping state across calls
|
|
* @param buf the response data
|
|
* @param blen amount of bytes in `buf`
|
|
* @param pconsumed on successful return, the number of bytes in `buf`
|
|
* consumed
|
|
*
|
|
* This function always uses ASCII hex values to accommodate non-ASCII hosts.
|
|
* For example, 0x0d and 0x0a are used instead of '\r' and '\n'.
|
|
*/
|
|
CURLcode Curl_httpchunk_read(struct Curl_easy *data, struct Curl_chunker *ch,
|
|
char *buf, size_t blen, size_t *pconsumed);
|
|
|
|
/**
|
|
* @return TRUE iff chunked decoded has finished successfully.
|
|
*/
|
|
bool Curl_httpchunk_is_done(struct Curl_easy *data, struct Curl_chunker *ch);
|
|
|
|
extern const struct Curl_cwtype Curl_httpchunk_unencoder;
|
|
|
|
extern const struct Curl_crtype Curl_httpchunk_encoder;
|
|
|
|
/**
|
|
* Add a transfer-encoding "chunked" reader to the transfers reader stack
|
|
*/
|
|
CURLcode Curl_httpchunk_add_reader(struct Curl_easy *data);
|
|
|
|
#endif /* !CURL_DISABLE_HTTP */
|
|
|
|
#endif /* HEADER_CURL_HTTP_CHUNKS_H */
|