master
peer: use the given proxy port, fall back to the documented default···
Since bc40e09f63 the proxy port is read with CURLU_NO_DEFAULT_PORT, which drops an explicit port when it matches the default port of the proxy URL's scheme. A proxy string without a scheme is guessed as http, so "--socks5 host:80" ended up connecting to port 1080, and an explicit port lost against CURLOPT_PROXYPORT when it happened to be the scheme default.
The fallback also became the scheme's default port, so a plain HTTP proxy without a port used 80 instead of the documented 1080.
Use the port as given, otherwise CURLOPT_PROXYPORT, or 443 for https default, or 1080 for all others as default, like before.
Extend unit test 2413 to verify.
Follow-up to bc40e09f63.
Fixes https://github.com/curl/curl/issues/23681 Closes https://github.com/curl/curl/pull/23682
- ..
- optsabef3ac
- .gitignored520903
- ABI.md9cd2ad8
- CMakeLists.txtbee1021
- Makefile.am7b84ef4
- Makefile.incb75782d
- curl_easy_cleanup.mdbf9b18b
- curl_easy_duphandle.md0de3349
- curl_easy_escape.md6ff7c5a
- curl_easy_getinfo.md6fc5555
- curl_easy_header.md1e48a72
- curl_easy_init.md34dbc64
- curl_easy_nextheader.md1a07f1f
- curl_easy_option_by_id.md591d7c4
- curl_easy_option_by_name.md8ba6ce0
- curl_easy_option_next.md836dee2
- curl_easy_pause.mdf0c9230
- curl_easy_perform.mdcc61232
- curl_easy_recv.mdaeb16c0
- curl_easy_reset.mdf27e86c
- curl_easy_send.md924f3e4
- curl_easy_setopt.md23eda35
- curl_easy_ssls_export.mdce0363a
- curl_easy_ssls_import.mdc154984
- curl_easy_strerror.mdbec2bdc
- curl_easy_unescape.md49e4c6b
- curl_easy_upkeep.md1aa448b
- curl_escape.md967d375
- curl_formadd.mdd984695
- curl_formfree.mdd7b4e30
- curl_formget.mda6afea5
- curl_free.mdc10ca28
- curl_getdate.md427fc9e
- curl_getenv.md047c913
- curl_global_cleanup.mde6f8e42
- curl_global_init.md9347bbb
- curl_global_init_mem.mda39471c
- curl_global_sslset.mdfa80a8c
- curl_global_trace.mde4cf8e0
- curl_mime_addpart.md9a21295
- curl_mime_data.mda03f6b5
- curl_mime_data_cb.mdba1a34a
- curl_mime_encoder.mdbb5990c
- curl_mime_filedata.md30f380f
- curl_mime_filename.mdd54f360
- curl_mime_free.md851b1c5
- curl_mime_headers.md8c7770b
- curl_mime_init.md7d1513d
- curl_mime_name.md4f19814
- curl_mime_subparts.mdf705a27
- curl_mime_type.md1e36052
- curl_mprintf.mddc778b5
- curl_multi_add_handle.mdac29b89
- curl_multi_assign.md7d1eaac
- curl_multi_cleanup.md1d4a1f8
- curl_multi_fdset.md7ab65e4
- curl_multi_get_handles.mdad47297
- curl_multi_get_offt.md875fa7e
- curl_multi_info_read.md35f96c2
- curl_multi_init.md28c3d69
- curl_multi_notify_disable.md11113a5
- curl_multi_notify_enable.md4a0da77
- curl_multi_perform.md64ec10c
- curl_multi_poll.md8c2488f
- curl_multi_remove_handle.mda8ecdfe
- curl_multi_setopt.md0bf7438
- curl_multi_socket.mdf77bba8
- curl_multi_socket_action.md4d690fd
- curl_multi_socket_all.md48fe980
- curl_multi_strerror.md39b5b2d
- curl_multi_timeout.mda4a7fa6
- curl_multi_wait.mdf9a7b7b
- curl_multi_waitfds.md7a4dac8
- curl_multi_wakeup.md97cb4b2
- curl_pushheader_byname.mde2968fc
- curl_pushheader_bynum.md256098e
- curl_share_cleanup.mde8390ff
- curl_share_init.mddeb6173
- curl_share_setopt.mda15955e
- curl_share_strerror.md9c45278
- curl_slist_append.md3ebc19e
- curl_slist_free_all.mdd3e5e04
- curl_strequal.md1c29a87
- curl_strnequal.mde6ce1eb
- curl_unescape.md453fd53
- curl_url.md8053e63
- curl_url_cleanup.md36455fc
- curl_url_dup.md6208494
- curl_url_get.md9916166
- curl_url_set.mdb2f818c
- curl_url_strerror.md33cdb14
- curl_version.md408684c
- curl_version_info.md6b1d611
- curl_ws_meta.md6fd44ac
- curl_ws_recv.md0b56c57
- curl_ws_send.md64f336a
- curl_ws_start_frame.md9fcbae0
- libcurl-easy.mdfdbc755
- libcurl-env-dbg.md3af0972
- libcurl-env.md5ce846d
- libcurl-errors.md6f348eb
- libcurl-multi.md0d56dac
- libcurl-security.mdcefb386
- libcurl-share.md0400593
- libcurl-thread.md9b26224
- libcurl-tutorial.md227f71a
- libcurl-url.mdbc936fc
- libcurl-ws.mdcce13ab
- libcurl.m47f8211b
- libcurl.mdda61d4c
- mksymbolsmanpage.plexec54c8338
- symbols-in-versionse556053
- symbols.plexec1472d59
- peer: use the given proxy port, fall back to the documented default
- GHA: update dependency reuse to v6.3.0
- tests: exclude 2088, 2089, 2095 (mTLS), 17_01_sslinfo_plain for LibreSSL 4.4.0 due to upstream limit
- openssl: stop I/O after fatal shutdown errors
- tests/data: add missing `nghttpx` feature tags, and one minor tidy-up
- cmake: verify OpenSSL 3+ version early
- cmake: detect, display and verify LibreSSL version
- docs/cmdline-opts/retry.md: mention duplicate data with redirected output
- GHA/macos: disable MD5 SSH tests with Homebrew libssh2
- scripts: don't insist on all executable bits on scripts
Diagnostics3 git calls · 6 ms
discover200152 B4 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=152 git.server.agent=gitty/1.0 git.server.object_format=sha1 git.server.caps=agent ls-refs fetch object-format git.server.fetch=shallow filter sideband-all git.protocol.version=2 git.pkt.frames=8 git.pkt.data=6 git.pkt.flush=2 git.pkt.delim=0 git.pkt.bytes=152 git.pkt.payload.max=34
ls-refs200149 B · hit4 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=4 git.response.bytes=149 git.response.cache=HIT git.response.duration_ms=4 git.protocol.version=2 git.pkt.frames=3 git.pkt.data=2 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=149 git.pkt.payload.max=78 git.ls_refs.count=2 git.ls_refs.head=refs/heads/master
fetchblob:none · deepen 10200287 KiB · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.response.bytes=293470 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=blob:none git.fetch.filter.requested=tree:0 git.fetch.filter.fallback=blob:none git.fetch.filter.learned=false git.fetch.wants=31c911efe5652725e930f4d2e60c9060e5f6646d git.fetch.haves.count=0 git.fetch.deepen=10 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=10 git.pkt.data=8 git.pkt.flush=1 git.pkt.delim=1 git.pkt.bytes=293470 git.pkt.payload.max=65516 git.sideband.band1.bytes=293354 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=87 git.pack.bytes=293354 git.pack.ofs_delta=0 git.pack.ref_delta=1 git.pack.chain.max=1 git.pack.trailer=6a646bcda6740bab42e321b51998b52ea15146c0 git.pack.full=86Open pack map
Each row is one HTTP round trip ply made to the git server for this page, on one timeline. discover asks what the server speaks, ls-refs lists branch tips, fetch brings objects by id. A hit was served by Workers Cache. Tap a row for its wire details.
- Remote
- https://5ad2236b39de4c8bd8f6270ea63f3ea9.artifacts.cloudflare.net/git/public-v0/curl.git
- Ref
- refs/heads/master
- Commit
- 31c911efe5652725e930f4d2e60c9060e5f6646d
- cf-ray
- a5e14ad2fe06a140
- Request
- e2300030…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format