blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-17 05:42:09 +08:00
Code Issues Projects Releases Wiki Activity

Merge 6878a37f66b31c00dfb4a2ff7b1888da618fdcf0 into 1a2bc0e7cb1a69b7750bd652d92c4d2b41504f04

Browse Source
This commit is contained in:
qm012 2021-09-30 18:40:54 -07:00 committed by GitHub
commit c8c0d0f460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ count.out
test
profile.out
tmp.out
.idea

25
gin.go
View File

@ -340,16 +340,16 @@ func iterate(path, method string, routes RoutesInfo, root *node) RoutesInfo {
// It is a shortcut for http.ListenAndServe(addr, router)
// Note: this method will block the calling goroutine indefinitely unless an error happens.
func (engine *Engine) Run(addr ...string) (err error) {
defer func() { debugPrintError(err) }()
address := resolveAddress(addr)
err = engine.parseTrustedProxies()
// support random port display
ln, err := net.Listen("tcp", address)
if err != nil {
return err
debugPrintError(err)
return
}
address := resolveAddress(addr)
debugPrint("Listening and serving HTTP on %s\n", address)
err = http.ListenAndServe(address, engine)
err = engine.RunListener(ln)
return
}
@ -413,7 +413,6 @@ func parseIP(ip string) net.IP {
// It is a shortcut for http.ListenAndServeTLS(addr, certFile, keyFile, router)
// Note: this method will block the calling goroutine indefinitely unless an error happens.
func (engine *Engine) RunTLS(addr, certFile, keyFile string) (err error) {
debugPrint("Listening and serving HTTPS on %s\n", addr)
defer func() { debugPrintError(err) }()
err = engine.parseTrustedProxies()
@ -421,7 +420,15 @@ func (engine *Engine) RunTLS(addr, certFile, keyFile string) (err error) {
return err
}
err = http.ListenAndServeTLS(addr, certFile, keyFile, engine)
// support random port display
address := resolveAddress(strings.Fields(addr))
ln, err := net.Listen("tcp", address)
if err != nil {
return err
}
debugPrint("Listening and serving HTTPS on %s\n", ln.Addr())
err = http.ServeTLS(ln, engine, certFile, keyFile)
return
}
@ -473,7 +480,7 @@ func (engine *Engine) RunFd(fd int) (err error) {
// RunListener attaches the router to a http.Server and starts listening and serving HTTP requests
// through the specified net.Listener
func (engine *Engine) RunListener(listener net.Listener) (err error) {
debugPrint("Listening and serving HTTP on listener what's bind with address@%s", listener.Addr())
debugPrint("Listening and serving HTTP on %s\n", listener.Addr())
defer func() { debugPrintError(err) }()
err = engine.parseTrustedProxies()