From 1c9ea0113d007d57bb8f793ebe7a64a3dcad7bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Thu, 27 Apr 2023 01:44:01 +0200
Subject: caddyhttp: Impl `ResponseWriter.Unwrap()`, prep for Go 1.20's
 `ResponseController` (#5509)

* feat: add support for ResponseWriter.Unwrap()

* cherry-pick Francis' code
---
 metrics.go | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'metrics.go')

diff --git a/metrics.go b/metrics.go
index 325006f..eb6c74f 100644
--- a/metrics.go
+++ b/metrics.go
@@ -66,3 +66,9 @@ func (d *delegator) WriteHeader(code int) {
 	d.status = code
 	d.ResponseWriter.WriteHeader(code)
 }
+
+// Unwrap returns the underlying ResponseWriter, necessary for
+// http.ResponseController to work correctly.
+func (d *delegator) Unwrap() http.ResponseWriter {
+	return d.ResponseWriter
+}
-- 
cgit v1.2.3


From d6f86cccf5fa5b4eb30141da390cf2439746c5da Mon Sep 17 00:00:00 2001
From: Jacob Gadikian <jacobgadikian@gmail.com>
Date: Mon, 14 Aug 2023 23:41:15 +0800
Subject: 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
---
 metrics.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'metrics.go')

diff --git a/metrics.go b/metrics.go
index eb6c74f..0f8ea03 100644
--- a/metrics.go
+++ b/metrics.go
@@ -3,10 +3,11 @@ package caddy
 import (
 	"net/http"
 
-	"github.com/caddyserver/caddy/v2/internal/metrics"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promauto"
+
+	"github.com/caddyserver/caddy/v2/internal/metrics"
 )
 
 // define and register the metrics used in this package.
-- 
cgit v1.2.3