mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 06:16:35 -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)
144 lines
5.8 KiB
C
Vendored
Generated
144 lines
5.8 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_COOKIE_H
|
|
#define HEADER_CURL_COOKIE_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"
|
|
|
|
#include "llist.h"
|
|
|
|
struct Cookie {
|
|
struct Curl_llist_node node; /* for the main cookie list */
|
|
struct Curl_llist_node getnode; /* for getlist */
|
|
char *name; /* <this> = value */
|
|
char *value; /* name = <this> */
|
|
char *path; /* canonical path */
|
|
char *domain; /* domain = <this> */
|
|
curl_off_t expires; /* expires = <this> */
|
|
unsigned int creationtime; /* time when the cookie was written */
|
|
BIT(tailmatch); /* tail-match the domain name */
|
|
BIT(secure); /* the 'secure' keyword was used */
|
|
BIT(livecookie); /* updated from server, not a stored file */
|
|
BIT(httponly); /* the httponly directive is present */
|
|
BIT(prefix_secure); /* secure prefix is set */
|
|
BIT(prefix_host); /* host prefix is set */
|
|
};
|
|
|
|
/*
|
|
* Available cookie prefixes, as defined in
|
|
* draft-ietf-httpbis-rfc6265bis-02
|
|
*/
|
|
#define COOKIE_PREFIX__SECURE (1 << 0)
|
|
#define COOKIE_PREFIX__HOST (1 << 1)
|
|
|
|
#define COOKIE_HASH_SIZE 63
|
|
|
|
struct CookieInfo {
|
|
/* linked lists of cookies we know of */
|
|
struct Curl_llist cookielist[COOKIE_HASH_SIZE];
|
|
curl_off_t next_expiration; /* the next time at which expiration happens */
|
|
unsigned int numcookies; /* number of cookies in the "jar" */
|
|
unsigned int lastct; /* last creation-time used in the jar */
|
|
BIT(running); /* state info, for cookie adding information */
|
|
BIT(newsession); /* new session, discard session cookies on load */
|
|
};
|
|
|
|
/* The maximum sizes we accept for cookies. RFC 6265 section 6.1 says
|
|
"general-use user agents SHOULD provide each of the following minimum
|
|
capabilities":
|
|
|
|
- At least 4096 bytes per cookie (as measured by the sum of the length of
|
|
the cookie's name, value, and attributes).
|
|
In the 6265bis draft document section 5.4 it is phrased even stronger: "If
|
|
the sum of the lengths of the name string and the value string is more than
|
|
4096 octets, abort these steps and ignore the set-cookie-string entirely."
|
|
*/
|
|
|
|
/** Limits for INCOMING cookies **/
|
|
|
|
/* The longest we allow a line to be when reading a cookie from an HTTP header
|
|
or from a cookie jar */
|
|
#define MAX_COOKIE_LINE 5000
|
|
|
|
/* Maximum length of an incoming cookie name or content we deal with. Longer
|
|
cookies are ignored. */
|
|
#define MAX_NAME 4096
|
|
|
|
/* Maximum number of Set-Cookie: lines accepted in a single response. If more
|
|
such header lines are received, they are ignored. This value must be less
|
|
than 256 since an unsigned char is used to count. */
|
|
#define MAX_SET_COOKIE_AMOUNT 50
|
|
|
|
/** Limits for OUTGOING cookies **/
|
|
|
|
/* Maximum size for an outgoing cookie line libcurl will use in an http
|
|
request. This is the default maximum length used in some versions of Apache
|
|
httpd. */
|
|
#define MAX_COOKIE_HEADER_LEN 8190
|
|
|
|
/* Maximum number of cookies libcurl will send in a single request, even if
|
|
there might be more cookies that match. One reason to cap the number is to
|
|
keep the maximum HTTP request within the maximum allowed size. */
|
|
#define MAX_COOKIE_SEND_AMOUNT 150
|
|
|
|
struct Curl_easy;
|
|
struct connectdata;
|
|
|
|
/*
|
|
* Add a cookie to the internal list of cookies. The domain and path arguments
|
|
* are only used if the header boolean is TRUE.
|
|
*/
|
|
|
|
bool Curl_secure_context(struct Curl_easy *data, const char *host);
|
|
CURLcode Curl_cookie_add(struct Curl_easy *data,
|
|
struct CookieInfo *ci,
|
|
bool httpheader,
|
|
bool noexpire,
|
|
const char *lineptr,
|
|
const char *domain,
|
|
const char *path,
|
|
bool secure) WARN_UNUSED_RESULT;
|
|
CURLcode Curl_cookie_getlist(struct Curl_easy *data,
|
|
bool *okay, const char *host,
|
|
struct Curl_llist *list) WARN_UNUSED_RESULT;
|
|
void Curl_cookie_clearall(struct CookieInfo *ci);
|
|
void Curl_cookie_clearsess(struct CookieInfo *ci);
|
|
|
|
#if defined(CURL_DISABLE_HTTP) || defined(CURL_DISABLE_COOKIES)
|
|
#define Curl_cookie_list(x) NULL
|
|
#define Curl_cookie_loadfiles(x) CURLE_OK
|
|
#define Curl_cookie_init() NULL
|
|
#define Curl_cookie_run(x) Curl_nop_stmt
|
|
#define Curl_cookie_cleanup(x) Curl_nop_stmt
|
|
#define Curl_flush_cookies(x, y) Curl_nop_stmt
|
|
#else
|
|
void Curl_flush_cookies(struct Curl_easy *data, bool cleanup);
|
|
void Curl_cookie_cleanup(struct CookieInfo *ci);
|
|
struct CookieInfo *Curl_cookie_init(void);
|
|
struct curl_slist *Curl_cookie_list(struct Curl_easy *data);
|
|
CURLcode Curl_cookie_loadfiles(struct Curl_easy *data) WARN_UNUSED_RESULT;
|
|
void Curl_cookie_run(struct Curl_easy *data);
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_COOKIE_H */
|