85 Commits

Author	SHA1	Message	Date
Zen Dodd	fd34f9cc81	Merge branch 'master' into feat-https-rr-alpn	2026-04-26 23:25:59 +10:00
Kévin Dunglas	2a3ed96f8c	metrics: Implement pushing via OLTP (#7664)	2026-04-25 06:52:08 -04:00
Francis Lavoie	355c178213	chore: Use atomics where appropriate (#7648) ... * chore: Use atomics where appropriate * Use atomic for shutdownAt	2026-04-25 03:47:54 -04:00
Zen Dodd	710902ddc3	http: centralise effective protocol resolution for HTTPS RR ALPN	2026-04-18 11:31:12 +10:00
Steffen Busch	24bebd0a07	caddyhttp: Document missing placeholders for escaped URI and prefixed query (#7659)	2026-04-17 16:13:15 -04:00
Zen Dodd	904f9fddcc	tls: centralise HTTPS RR ALPN defaults and registration ... Reuse shared protocol defaults instead of repeating the default HTTP protocol list, unify server name registration to carry ALPN in one experimental API and reuse the TLS default ALPN ordering for HTTPS RR publication	2026-04-17 12:25:29 +10:00
Francis Lavoie	6e5e08cf58	Wire up Cause for most context cancels (#7538)	2026-03-04 17:14:52 -07:00
Francis Lavoie	4037d05760	caddyhttp: {http.request.body_base64} placeholder (#7367)	2025-12-13 21:01:12 -07:00
WeidiDeng	6e0cbd0fa0	caddyhttp: create a placeholder for and log ech status (#7328) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2025-12-07 16:01:58 +00:00
vnxme	31960dc998	Introduce packet conn wrappers (#7180) ... * packet_conn_wrappers: Initial changes * packet_conn_wrappers: Unwrap a packet conn only if there are no wrappers --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2025-12-04 14:15:56 -07:00
Mohammed Al Sahaf	595aab8bc0	metrics: resolve per-host inifinite cardinality (#7306)	2025-10-21 06:06:56 +00:00
WeidiDeng	1ce2a13ad1	caddyhttp: wrap accepted connection to suppress tls.ConnectionState (#7247)	2025-10-16 03:13:40 +00:00
joshuamcbeth	de6b78009b	caddyhttp: Add server options keepalive_idle and keepalive_count (#7298) ... * Add Server options KeepAliveIdle (keepalive_idle) and KeepAliveCount (keepalive_count) Signed-off-by: Joshua McBeth <joshua.mcbeth@gmail.com> * Add Server option KeepAliveDisable (keepalive_disable) Signed-off-by: Joshua McBeth <joshua.mcbeth@gmail.com> * Remove Server option KeepAliveDisable (keepalive_disable), disable when interval is negative Signed-off-by: Joshua McBeth <joshua.mcbeth@gmail.com> * Add keepalive parameters to caddyfiletest Signed-off-by: Joshua McBeth <joshua.mcbeth@gmail.com> --------- Signed-off-by: Joshua McBeth <joshua.mcbeth@gmail.com>	2025-10-14 12:03:23 -06:00
Francis Lavoie	16fe83c7af	http: Make logger first, before TLS provisioning (#7198)	2025-08-22 14:24:08 -06:00
WeidiDeng	14a63a26b9	caddyhttp: use the new http.Protocols to handle h1, h2 and h2c requests (#6961) ... * use the new http.Protocols to handle h1, h2 and h2c requests * fix lint * keep ConnCtxKey for now * fix handling for h2c * check http version while reading the connection * check if connection implements connectionStater when it should * add comments about either h1 or h2 must be used in the listener * fix if check * return a net.Conn that implements connectionStater if applicable * remove http/1.1 from alpn if h1 is disabled * fix matching if only h1 is enabled --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2025-08-22 14:30:42 +00:00
WeidiDeng	f11c780fdc	http: clean up listeners if some of the listeners fail to bind (#7176) ... * http: clean up listeners if some of the listeners fail to bind * check for nil server due to failure to start --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2025-08-21 12:14:40 -06:00
WeidiDeng	fdf610850b	http: disable keepalive when KeepAliveInterval is negative (#7158) ... Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2025-08-20 17:31:15 -04:00
WeidiDeng	7590c9ca1b	caddyhttp: Free up quic listener when stopping (#7177)	2025-08-13 12:35:06 -06:00
joshuamcbeth	e4447c4ba7	core: Use KeepAliveConfig to pass keepalive_interval to listener's accepted sockets (#7151) ... Fix #7144	2025-08-02 09:43:34 -06:00
Matt Holt	1bfa111552	caddytls: Prefer managed wildcard certs over individual subdomain certs (#6959) ... * caddytls: Prefer managed wildcard certs over individual subdomain certs * Repurpose force_automate as no_wildcard * Fix a couple bugs * Restore force_automate and use automate loader as wildcard override	2025-04-18 11:44:23 -06:00
Matthew Holt	b06a9496d1	caddyhttp: Document side effect of HTTP/3 early data (close #6936)	2025-04-08 13:59:02 -06:00
Matthew Holt	1975408d89	chore: Remove unnecessary explicit type parameters	2025-03-07 11:18:00 -07:00
Hyeonggeun Oh	50778b5542	fix: disable h3 for unix domain socket (#6769)	2025-01-07 17:21:57 -07:00
Matthew Holt	197c564f20	caddyhttp: Set default ReadHeaderTimeout (1 min) ... Ref. #6663	2024-11-19 11:24:12 -07:00
Mohammed Al Sahaf	388c7e898c	metrics: move metrics up, outside servers (#6606) ... * metrics: move `metrics` up, outside `servers` This change moves the metrics configuration from per-server level to a single config knob within the `http` app. Enabling `metrics` in any of the configured servers inside `http` enables metrics for all servers. Fix #6604 Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * normalize domain name --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2024-10-18 09:54:21 -06:00
WeidiDeng	c6f2979986	caddyhttp: Close http3 server gracefully (#6213) ... * close http3 server gracefully * update server field * update from upstream --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-10-15 21:28:20 -04:00
Mohammed Al Sahaf	41f5dd56e1	metrics: scope metrics to active config, add optional per-host metrics (#6531) ... * Add per host config * Pass host label when option is enabled * Test per host enabled * metrics: scope metrics per loaded config * doc and linter Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * inject the custom registry into the admin handler Co-Authored-By: Dave Henderson <dhenderson@gmail.com> * remove `TODO` comment * fixes Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * refactor to delay metrics admin handler provision Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Hussam Almarzooq <me@hussam.io> Co-authored-by: Dave Henderson <dhenderson@gmail.com>	2024-10-02 08:23:26 -06:00
Aaron Paterson	0e829bc418	caddyhttp: Fix listener wrapper regression from #6573 (#6599)	2024-10-01 01:47:21 -04:00
Aaron Paterson	4b1a9b6cc1	core: Implement socket activation listeners (#6573) ... * caddy adapt for listen_protocols * adapt listen_socket * allow multiple listen sockets for port ranges and readd socket fd listen logic * readd logic to start servers according to listener protocols * gofmt * adapt caddytest * gosec * fmt and rename listen to listenWithSocket * fmt and rename listen to listenWithSocket * more consistent error msg * non unix listenReusableWithSocketFile * remove unused func * doc comment typo * nonosec * commit * doc comments * more doc comments * comment was misleading, cardinality did not change * addressesWithProtocols * update test * fd/ and fdgram/ * rm addr * actually write... * i guess we doin' "skip": now * wrong var in placeholder * wrong var in placeholder II * update param name in comment * dont save nil file pointers * windows * key -> parsedKey * osx * multiple default_bind with protocols * check for h1 and h2 listener netw	2024-09-30 10:55:03 -06:00
Matt Holt	9ba999141b	caddyhttp: Trace individual middleware handlers (#6313) ... * caddyhttp: Trace individual middleware handlers * Fix typo	2024-05-18 14:48:42 -06:00
Francis Lavoie	726a9a8fde	logging: Fix default access logger (#6251) ... * logging: Fix default access logger * Simplify logic, remove retry without port, reject config with port, docs * Nil check	2024-04-22 06:33:07 -06:00
coderwander	eafc875ea9	chore: fix some typos in comments (#6243)	2024-04-16 04:10:11 +00:00
Emily	ddb1d2c2b1	caddyhttp: add http.request.local{,.host,.port} placeholder (#6182) ... * caddyhttp: add `http.request.local{,.host,.port}` placeholder This is the counterpart of `http.request.remote{,.host,.port}`. `http.request.remote` operates on the remote client's address, while `http.request.local` operates on the address the connection arrived on. Take the following example: - Caddy serving on `203.0.113.1:80` - Client on `203.0.113.2` `http.request.remote.host` would return `203.0.113.2` (client IP) `http.request.local.host` would return `203.0.113.1` (server IP) `http.request.local.port` would return `80` (server port) I find this helpful for debugging setups with multiple servers and/or multiple network paths (multiple IPs, AnyIP, Anycast). Co-authored-by: networkException <git@nwex.de> * caddyhttp: add unit test for `http.request.local{,.host,.port}` * caddyhttp: add integration test for `http.request.local.port` * caddyhttp: fix `http.request.local.host` placeholder handling with unix sockets The implementation matches the one of `http.request.remote.host` now and returns the unix socket path (just like `http.request.local` already did) instead of an empty string. --------- Co-authored-by: networkException <git@nwex.de>	2024-03-27 21:36:53 +00:00
Matt Holt	127788807f	caddyhttp: Register post-shutdown callbacks (#5948)	2024-02-14 21:21:23 -07:00
Marten Seemann	697cc593a1	chore: Update quic-go to v0.41.0, bump Go minimum to 1.21 (#6043) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-01-25 13:58:19 -05:00
WeidiDeng	22eecdb90c	http2 uses new round-robin scheduler (#5946)	2023-11-24 01:54:27 +00:00
Francis Lavoie	4c10a05431	caddyhttp: Adjust scheme placeholder docs (#5910)	2023-10-22 17:47:16 -04:00
WeidiDeng	7c82e265da	core: quic listener will manage the underlying socket by itself (#5749) ... * core: quic listener will manage the underlying socket by itself. * format code * rename sharedQUICTLSConfig to sharedQUICState, and it will now manage the number of active requests * add comment * strict unwrap type * fix unwrap * remove comment	2023-10-16 09:28:15 -06:00
Jacob Gadikian	d6f86cccf5	ci: use gci linter (#5708) ... * use gofmput to format code * use gci to format imports * reconfigure gci * linter autofixes * rearrange imports a little * export GOOS=windows golangci-lint run ./... --fix	2023-08-14 09:41:15 -06:00
Francis Lavoie	cd486c25d1	caddyhttp: Make use of http.ResponseController (#5654) ... * caddyhttp: Make use of http.ResponseController Also syncs the reverseproxy implementation with stdlib's which now uses ResponseController as well 2449bbb5e6 * Enable full-duplex for HTTP/1.1 * Appease linter * Add warning for builds with Go 1.20, so it's less surprising to users * Improved godoc for EnableFullDuplex, copied text from stdlib * Only wrap in encode if not already wrapped	2023-08-02 20:03:26 +00:00
WeidiDeng	29452647d8	caddyhttp: Fix h3 shutdown (#5541) ... * swap h3server close and listener close, avoid quic-listener not closing * fix typo	2023-05-19 10:00:00 -06:00
Francis Lavoie	cbf16f6d9e	caddyhttp: Implement named routes, invoke directive (#5107) ... * caddyhttp: Implement named routes, `invoke` directive * gofmt * Add experimental marker * Adjust route compile comments	2023-05-16 15:27:52 +00:00
WeidiDeng	d8d87a378f	caddyhttp: Serve http2 when listener wrapper doesn't return *tls.Conn (#4929) ... * Serve http2 when listener wrapper doesn't return *tls.Conn * close conn when h2server serveConn returns * merge from upstream * rebase from latest * run New and Closed ConnState hook for h2 conns * go fmt * fix lint * Add comments * reorder import	2023-04-10 17:05:02 +00:00
Francis Lavoie	05e9974570	caddyhttp: Determine real client IP if trusted proxies configured (#5104) ... * caddyhttp: Determine real client IP if trusted proxies configured * Support customizing client IP header * Implement client_ip matcher, deprecate remote_ip's forwarded option	2023-03-27 20:22:59 +00:00
Matt Holt	99d47050e9	core: Eliminate unnecessary shutdown delay on Unix (#5413) ... * core: Eliminate unnecessary shutdown delay on Unix Fix #5393, alternate to #5405 * Comments, cleanup, adjust logs * Fix build constraint	2023-03-03 04:00:18 +00:00
Francis Lavoie	90798f3eea	go.mod: Upgrade various dependencies (#5362) ... * chore: Upgrade various dependencies * Support CEL file matcher with no args * Document `http.request.orig_uri.path.*`, reorder placeholders in docs --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2023-02-08 17:49:17 +00:00
Francis Lavoie	12bcbe2c49	caddyhttp: Pluggable trusted proxy IP range sources (#5328) ... * caddyhttp: Pluggable trusted proxy IP range sources * Add request to the IPRangeSource interface	2023-02-06 12:44:11 -07:00
Francis Lavoie	e62b5fb586	chore: Build with Go 1.20, keep minimum at 1.18 for now (#5353)	2023-02-06 11:29:20 -05:00
Francis Lavoie	223cbe3d0b	caddyhttp: Add server-level trusted_proxies config (#5103)	2023-01-10 00:08:23 -05:00
Matt Holt	3e1fd2a8d4	httpcaddyfile: Wrap site block in subroute if host matcher used (#5130) ... * httpcaddyfile: Wrap site block in subroute if host matcher used (fix #5124) * Correct boolean logic (oops)	2022-10-12 09:27:08 -06:00