@marcel91200 / caddy Mirror · read-only / commits / 04767548
Fork 0

Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS

Mirrored from https://github.com/Slazee/caddy.git

Synced Nov 11, 07:15 UTC

reverseproxy: reduce allocation/CPU overhead in request hot paths (#7925)

Build the Via request and response headers with strconv-based concatenation instead of fmt.Sprintf, avoiding fmt's reflection and formatting overhead on every proxied request/response. Same single allocation, ~40% faster for that construction in isolation. | before (fmt) | after (strconv) | | sec/op | sec/op vs base | PrepareRequest-8 | 6.136µ ± 11% | 4.491µ ± 33% -26.80% (p=0.007 n=10)| B/op: 1008 -> 1008 (unchanged) allocs/op: 12 -> 12 (unchanged) No behavior change. Adds BenchmarkPrepareRequest, as per policy, exercising the request preparation path.

Julien Voisin committed Aug 10, 2026 at 07:49 UTC 0476754858c70c9cf7b0592e7467a3601c19f26e
2 files changed +49 -2
modules/caddyhttp/reverseproxy/prepare_request_bench_test.go new
+47
@@ -0,0 +1,47 @@
1 +// Copyright 2015 Matthew Holt and The Caddy Authors
2 +//
3 +// Licensed under the Apache License, Version 2.0 (the "License");
4 +// you may not use this file except in compliance with the License.
5 +// You may obtain a copy of the License at
6 +//
7 +// http://www.apache.org/licenses/LICENSE-2.0
8 +//
9 +// Unless required by applicable law or agreed to in writing, software
10 +// distributed under the License is distributed on an "AS IS" BASIS,
11 +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 +// See the License for the specific language governing permissions and
13 +// limitations under the License.
14 +
15 +package reverseproxy
16 +
17 +import (
18 + "context"
19 + "net/http"
20 + "net/http/httptest"
21 + "testing"
22 +
23 + "github.com/caddyserver/caddy/v2"
24 + "github.com/caddyserver/caddy/v2/modules/caddyhttp"
25 +)
26 +
27 +func BenchmarkPrepareRequest(b *testing.B) {
28 + h := Handler{}
29 +
30 + req := httptest.NewRequest(http.MethodGet, "http://example.com/", nil)
31 + req.RemoteAddr = "1.2.3.4:5678"
32 + vars := map[string]any{
33 + caddyhttp.TrustedProxyVarKey: false,
34 + caddyhttp.ClientIPVarKey: "1.2.3.4",
35 + }
36 + req = req.WithContext(context.WithValue(req.Context(), caddyhttp.VarsCtxKey, vars))
37 +
38 + repl := caddy.NewReplacer()
39 +
40 + b.ReportAllocs()
41 + b.ResetTimer()
42 + for i := 0; i < b.N; i++ {
43 + if _, err := h.prepareRequest(req, repl); err != nil {
44 + b.Fatal(err)
45 + }
46 + }
47 +}
modules/caddyhttp/reverseproxy/reverseproxy.go
+2 -2
@@ -872,7 +872,7 @@ func (h Handler) prepareRequest(req *http.Request, repl *caddy.Replacer) (*http.
872 }
873
874 // Via header(s)
875 - req.Header.Add("Via", fmt.Sprintf("%d.%d Caddy", req.ProtoMajor, req.ProtoMinor))
875 + req.Header.Add("Via", strconv.Itoa(req.ProtoMajor)+"."+strconv.Itoa(req.ProtoMinor)+" Caddy")
876
877 return req, nil
878 }
@@ -1253,7 +1253,7 @@ func (h *Handler) finalizeResponse(
1253 if !strings.HasPrefix(strings.ToUpper(res.Proto), "HTTP/") {
1254 protoPrefix = res.Proto[:strings.Index(res.Proto, "/")+1]
1255 }
1256 - rw.Header().Add("Via", fmt.Sprintf("%s%d.%d Caddy", protoPrefix, res.ProtoMajor, res.ProtoMinor))
1256 + rw.Header().Add("Via", protoPrefix+strconv.Itoa(res.ProtoMajor)+"."+strconv.Itoa(res.ProtoMinor)+" Caddy")
1257
1258 // apply any response header operations
1259 if h.Headers != nil && h.Headers.Response != nil {