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
- ..
- curlx0a8101e
- vauth11813b1
- vdns41b1825
- vquic729f7e7
- vssh5598c62
- vtlsd5a5aef
- .gitignore0f0bcd6
- CMakeLists.txtc202a6c
- Makefile.am9a3189c
- Makefile.incc411c67
- Makefile.sonameaadc7f4
- altsvc.c7e91f04
- altsvc.hcf9e218
- amigaos.c3f61565
- amigaos.h58278f0
- api.cf313bd4
- api.hb87f5b9
- arpa_telnet.h826f937
- bufq.c750d868
- bufq.hc53749d
- bufref.c50fafda
- bufref.h5d331ad
- cf-h1-proxy.cbf0cc4c
- cf-h1-proxy.h3db0582
- cf-h2-proxy.ca555abc
- cf-h2-proxy.h4b1dde2
- cf-haproxy.ce328610
- cf-haproxy.h6d67597
- cf-https-connect.c9a51d6d
- cf-https-connect.hefac194
- cf-ip-happy.cb5347b6
- cf-ip-happy.h88de0c3
- cf-recvbuf.c55b01a2
- cf-recvbuf.he126c3c
- cf-setup.ca5dc8ed
- cf-setup.h71c6093
- cf-socket.c97b5fa8
- cf-socket.hf4a6755
- cfilters.c532be6d
- cfilters.h8c7b42f
- config-mac.h1e88ca3
- config-os400.hd4bce96
- config-win32.h42387b2
- conncache.c905412a
- conncache.h7b685f9
- connect.c63f9602
- connect.ha05c1b8
- content_encoding.cead180f
- content_encoding.he84a739
- cookie.ce44884b
- cookie.h973ec09
- creds.c5507ae8
- creds.h5db3f8f
- cshutdn.c9005711
- cshutdn.hd42d2cb
- curl_addrinfo.cd578ab7
- curl_addrinfo.h7b2b4d2
- curl_config-cmake.h.in45c5de9
- curl_ctype.hfd6b7d7
- curl_ed25519.c44311ec
- curl_ed25519.h381b651
- curl_fnmatch.c58475a2
- curl_fnmatch.h61d2a0c
- curl_fopen.c10c0417
- curl_fopen.h5bdd2f2
- curl_get_line.c6fcd043
- curl_get_line.h6b90ac4
- curl_gethostname.c661d4b1
- curl_gethostname.h9281d9c
- curl_gssapi.c437f76d
- curl_gssapi.hb33df77
- curl_hmac.hac805da
- curl_ldap.h0ccc128
- curl_md5.h0766660
- curl_memrchr.ca7270a4
- curl_memrchr.h248368b
- curl_printf.h3b1a5af
- curl_range.c9bbafa4
- curl_range.h9735467
- curl_sasl.c1d3a3ae
- curl_sasl.hcbd2834
- curl_setup.h1fce4a1
- curl_sha256.hfb82316
- curl_sha512_256.cd0c81e7
- curl_sha512_256.hddaf8be
- curl_share.c21ed3e9
- curl_share.h5c68798
- curl_sspi.c799f342
- curl_sspi.hda8e26d
- curl_threads.ca5857b4
- curl_threads.hfc73c12
- curl_trc.c62bac14
- curl_trc.hfc0e6de
- cw-out.ce880a38
- cw-out.hee2b4b6
- cw-pause.caaad3ef
- cw-pause.h9a41a1c
- dict.c7f2e063
- dict.h5bdfcff
- dllmain.ccee1801
- dynhds.cc3aad4b
- dynhds.hd5337eb
- easy.c58d3098
- easy_lock.h9f21448
- easygetopt.c533d7e3
- easyif.h213fd02
- easyoptions.c1643ec3
- easyoptions.hd895653
- escape.c32f94cb
- escape.h9f9a89e
- fake_addrinfo.c6857d63
- fake_addrinfo.h69579da
- file.cba574e9
- file.h0aa411b
- fileinfo.c33e5acd
- fileinfo.h7379667
- formdata.c5d9e5de
- formdata.h33d7d0a
- ftp-int.h0bf6b9a
- ftp.c9e74bf2
- ftp.h3ce02c8
- ftplistparser.cc92b07d
- ftplistparser.h29b18af
- functypes.h7fcee83
- getenv.cacf058e
- getinfo.c16d2c75
- getinfo.hf5efe41
- gopher.c1caaecf
- gopher.h1c126be
- hash.c36d4dbe
- hash.hf79c213
- headers.c438eb54
- headers.h6b6594d
- hmac.c21575f1
- hsts.c1cce1e5
- hsts.h08215f5
- http.c6d4df29
- http.h0e074a0
- http1.c60ad32c
- http1.hc289461
- http2.c0869bd6
- http2.hf77b509
- http_aws_sigv4.c5fe5dfc
- http_aws_sigv4.h7dd0024
- http_chunks.c2a84ce5
- http_chunks.h00a27cc
- http_digest.ce739b2b
- http_digest.h5f79731
- http_httpsig.c8040180
- http_httpsig.h410755d
- http_negotiate.c66c7af4
- http_negotiate.h6c285f1
- http_proxy.cad79a47
- http_proxy.h7f5fc94
- idn.c943a520
- idn.hc73b870
- if2ip.cfee49ca
- if2ip.hdc79c38
- imap.cf990232
- imap.hecfb1ec
- ldap.cfdc9459
- libcurl.def803f372
- libcurl.rc81cd8d7
- libcurl.vers.in8219669
- llist.c516b156
- llist.h38fea5c
- macos.c334dbc7
- macos.h0a72a30
- md5.c5bcc2b8
- memdebug.c53c8529
- mime.cf491f22
- mime.he84f040
- mprintf.c9f172c3
- mqtt.c55ab720
- mqtt.h3d95293
- multi.c5062dea
- multi_ev.c7215ee2
- multi_ev.hddbb933
- multi_ntfy.c4723c80
- multi_ntfy.hacdd6bd
- multihandle.h6a0bf51
- multiif.h30b453e
- netrc.c6a6049a
- netrc.h6be9b83
- ngh2_shim.c5f35024
- ngh2_shim.h6227fd7
- openldap.c982a59c
- optiontable.plexecde6fb55
- parsedate.cf5f9ec3
- parsedate.hea136bd
- peer.c5218091
- peer.ha0a3054
- pingpong.ccff9bf7
- pingpong.hc1f9c27
- pop3.c04affc4
- pop3.h75c3a67
- progress.cc6432d6
- progress.h4554b34
- protocol.ca7b1460
- protocol.hb762e18
- proxy.cae4afd8
- proxy.h307ee00
- psl.c1e3efbb
- psl.h97871f9
- ptrarray.c83aec91
- ptrarray.ha24602a
- rand.cbe0a2f1
- rand.h7d59337
- ratelimit.cc000e95
- ratelimit.h3969009
- request.c51672bf
- request.ha7c0a93
- rtsp.cd7c9719
- rtsp.h791cbff
- select.c3e45fda
- select.hf2e9cdd
- sendf.c41b2ca0
- sendf.h6975ad1
- setopt.c552af67
- setopt.he386262
- setup-os400.hb5bd733
- setup-vms.h542ad28
- setup-win32.h6a89b96
- sha256.ca6b1f13
- sigpipe.hb489796
- slist.cc642a60
- slist.h47a3082
- smtp.ca19f1a8
- smtp.h75b8197
- sockaddr.h916360d
- socketpair.cee23608
- socketpair.hfd08c87
- socks.cca7d3e2
- socks.hd8e77c7
- socks_gssapi.cc1cfba5
- socks_sspi.c576d6ae
- splay.cdf3734d
- splay.h5731d81
- strcase.c6c3597c
- strcase.h559db87
- strequal.ca352fda
- strerror.c6fc801d
- strerror.h4b9779f
- telnet.c12b3959
- telnet.h3848fff
- tftp.c41cf281
- tftp.h3231010
- thrdpool.c900fd1c
- thrdpool.hcc81fb6
- thrdqueue.cb009405
- thrdqueue.hebd0c07
- transfer.cabc7623
- transfer.h0ad0d54
- u32_ptrset.cbc0f74c
- u32_ptrset.h6ce9a11
- u8_strset.ce2e368e
- u8_strset.hbf23cd8
- uint-bset.c82b84e3
- uint-bset.hce0450c
- uint-spbset.c66b0fcb
- uint-spbset.h4b105c0
- uint-table.c71b5299
- uint-table.h743d13b
- url.c8f98c33
- url.hcbb6879
- urlapi-int.he8f41fd
- urlapi.c51dab87
- urldata.he857113
- version.cc2b54cb
- ws.c74d6ef0
- ws.h71b5b3f
- 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 B3 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=3 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 B3 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 git.response.bytes=149 git.response.cache=UPDATING git.response.duration_ms=3 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 · hit3 ms
git.upload-pack fetch http.response.status_code=200 git.response.bytes=293470 git.response.cache=HIT git.response.duration_ms=3 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
- a5e131fc5feba9fe
- Request
- c23310d0…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format