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)
165 lines
4.8 KiB
C
Vendored
Generated
165 lines
4.8 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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"
|
|
|
|
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_DIGEST_AUTH)
|
|
|
|
#include "urldata.h"
|
|
#include "strcase.h"
|
|
#include "vauth/vauth.h"
|
|
#include "http_digest.h"
|
|
#include "curlx/strparse.h"
|
|
|
|
/* Test example headers:
|
|
|
|
WWW-Authenticate: Digest realm="testrealm", nonce="1053604598"
|
|
Proxy-Authenticate: Digest realm="testrealm", nonce="1053604598"
|
|
|
|
*/
|
|
|
|
CURLcode Curl_input_digest(struct Curl_easy *data,
|
|
bool proxy,
|
|
const char *header) /* rest of the *-authenticate:
|
|
header */
|
|
{
|
|
/* Point to the correct struct with this */
|
|
struct digestdata *digest;
|
|
|
|
if(proxy) {
|
|
digest = &data->state.proxydigest;
|
|
}
|
|
else {
|
|
digest = &data->state.digest;
|
|
}
|
|
|
|
if(!checkprefix("Digest", header) || !ISBLANK(header[6]))
|
|
return CURLE_AUTH_ERROR;
|
|
|
|
header += strlen("Digest");
|
|
curlx_str_passblanks(&header);
|
|
|
|
return Curl_auth_decode_digest_http_message(header, digest);
|
|
}
|
|
|
|
/* Flush the Digest state if it was created for a different origin or with
|
|
different credentials than the ones now in use, then link the current
|
|
ones. */
|
|
static void digest_flush_stale(struct digestdata *digest,
|
|
struct Curl_peer *peer,
|
|
struct Curl_creds *creds)
|
|
{
|
|
bool flush = FALSE;
|
|
if(digest->origin && !Curl_peer_same_destination(peer, digest->origin))
|
|
flush = TRUE;
|
|
else if(digest->creds && !Curl_creds_same(creds, digest->creds))
|
|
flush = TRUE;
|
|
|
|
if(flush)
|
|
/* flush Digest state */
|
|
Curl_auth_digest_cleanup(digest);
|
|
|
|
Curl_peer_link(&digest->origin, peer);
|
|
Curl_creds_link(&digest->creds, creds);
|
|
}
|
|
|
|
CURLcode Curl_output_digest(struct Curl_easy *data,
|
|
bool proxy,
|
|
const unsigned char *request,
|
|
const unsigned char *uripath)
|
|
{
|
|
CURLcode result;
|
|
char *response;
|
|
size_t len;
|
|
bool have_chlg;
|
|
|
|
/* Point to the address of the pointer that holds the string to send to the
|
|
server, which is for a plain host or for an HTTP proxy */
|
|
char **allocuserpwd;
|
|
|
|
/* Point to the name and password for this */
|
|
struct Curl_creds *creds = NULL;
|
|
|
|
/* Point to the correct struct with this */
|
|
struct digestdata *digest;
|
|
struct auth *authp;
|
|
|
|
if(proxy) {
|
|
#ifdef CURL_DISABLE_PROXY
|
|
return CURLE_NOT_BUILT_IN;
|
|
#else
|
|
digest = &data->state.proxydigest;
|
|
digest_flush_stale(digest, data->conn->http_proxy.peer,
|
|
data->conn->http_proxy.creds);
|
|
allocuserpwd = &data->req.hd_proxy_auth;
|
|
creds = data->conn->http_proxy.creds;
|
|
authp = &data->state.authproxy;
|
|
#endif
|
|
}
|
|
else {
|
|
DEBUGASSERT(data->state.origin);
|
|
digest = &data->state.digest;
|
|
digest_flush_stale(digest, data->state.origin, data->state.creds);
|
|
allocuserpwd = &data->req.hd_auth;
|
|
creds = data->state.creds;
|
|
authp = &data->state.authhost;
|
|
}
|
|
|
|
curlx_safefree(*allocuserpwd);
|
|
|
|
#ifdef USE_WINDOWS_SSPI
|
|
have_chlg = !!digest->input_token;
|
|
#else
|
|
have_chlg = !!digest->nonce;
|
|
#endif
|
|
|
|
if(!have_chlg) {
|
|
authp->done = FALSE;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
result = Curl_auth_create_digest_http_message(data, creds, request,
|
|
uripath, digest,
|
|
&response, &len);
|
|
if(result)
|
|
return result;
|
|
|
|
*allocuserpwd = curl_maprintf("%sAuthorization: Digest %s\r\n",
|
|
proxy ? "Proxy-" : "", response);
|
|
curlx_free(response);
|
|
if(!*allocuserpwd)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
authp->done = TRUE;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
void Curl_http_auth_cleanup_digest(struct Curl_easy *data)
|
|
{
|
|
Curl_auth_digest_cleanup(&data->state.digest);
|
|
Curl_auth_digest_cleanup(&data->state.proxydigest);
|
|
}
|
|
|
|
#endif
|