From 599fdcdcb699a78d33de879c2789ee7741962a5c Mon Sep 17 00:00:00 2001 From: Fenny <25108519+Fenny@users.noreply.github.com> Date: Sun, 5 Jul 2020 11:08:23 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8Listener=20replaces=20Serve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app.go b/app.go index 036541fd..b083f1d2 100644 --- a/app.go +++ b/app.go @@ -415,11 +415,17 @@ func (app *App) Routes() []*Route { return routes } -// Serve can be used to pass a custom listener +// Serve is deprecated, please use app.Listener() +func (app *App) Serve(ln net.Listener, tlsconfig ...*tls.Config) error { + fmt.Println("serve: app.Serve() is deprecated since v1.12.5, please use app.Listener()") + return app.Listener(ln, tlsconfig...) +} + +// Listener can be used to pass a custom listener // This method does not support the Prefork feature // Prefork is not supported using app.Serve(ln net.Listener) // You can pass an optional *tls.Config to enable TLS. -func (app *App) Serve(ln net.Listener, tlsconfig ...*tls.Config) error { +func (app *App) Listener(ln net.Listener, tlsconfig ...*tls.Config) error { // Update fiber server settings app.init() // TLS config From a21897d0de4df44f487e400f00199eb37653988b Mon Sep 17 00:00:00 2001 From: Fenny <25108519+Fenny@users.noreply.github.com> Date: Sun, 5 Jul 2020 11:09:01 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=94=A8=20Define=20return=20Addr=20in?= =?UTF-8?q?=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/utils.go b/utils.go index f9c98ec7..f5f3ffcc 100644 --- a/utils.go +++ b/utils.go @@ -182,21 +182,27 @@ func parseTokenList(noneMatchBytes []byte) []string { // https://golang.org/src/net/net.go#L113 // Helper methods for application#test +type testAddr string + +func (a testAddr) Network() string { + return string(a) +} +func (a testAddr) String() string { + return string(a) +} + type testConn struct { net.Conn r bytes.Buffer w bytes.Buffer } -func (c *testConn) RemoteAddr() net.Addr { - return &net.TCPAddr{ - IP: net.IPv4(0, 0, 0, 0), - } -} -func (c *testConn) LocalAddr() net.Addr { return c.RemoteAddr() } -func (c *testConn) Read(b []byte) (int, error) { return c.r.Read(b) } -func (c *testConn) Write(b []byte) (int, error) { return c.w.Write(b) } -func (c *testConn) Close() error { return nil } +func (c *testConn) Read(b []byte) (int, error) { return c.r.Read(b) } +func (c *testConn) Write(b []byte) (int, error) { return c.w.Write(b) } +func (c *testConn) Close() error { return nil } + +func (c *testConn) LocalAddr() net.Addr { return testAddr("local-addr") } +func (c *testConn) RemoteAddr() net.Addr { return testAddr("remote-addr") } func (c *testConn) SetDeadline(t time.Time) error { return nil } func (c *testConn) SetReadDeadline(t time.Time) error { return nil } func (c *testConn) SetWriteDeadline(t time.Time) error { return nil } From 8b425e12065260200de316d23d2a2c930fd518cf Mon Sep 17 00:00:00 2001 From: Fenny <25108519+Fenny@users.noreply.github.com> Date: Sun, 5 Jul 2020 11:09:38 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=9A=80=20Change=20Version=20Tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.go b/app.go index b083f1d2..9d54f098 100644 --- a/app.go +++ b/app.go @@ -29,7 +29,7 @@ import ( ) // Version of current package -const Version = "1.12.4" +const Version = "1.12.5" // Map is a shortcut for map[string]interface{}, useful for JSON returns type Map map[string]interface{}