Merge pull request #90 from unistack-org/master

merge master
This commit is contained in:
Василий Толстов 2022-01-23 02:41:15 +03:00 committed by GitHub
commit 6a30a4f408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -453,12 +453,12 @@ func (h *httpServer) Start() error {
switch { switch {
case handler == nil && h.hd == nil: case handler == nil && h.hd == nil:
handler = h handler = h
case len(h.handlers) > 0 && h.hd != nil:
handler = h
case handler == nil && h.hd != nil: case handler == nil && h.hd != nil:
if hdlr, ok := h.hd.Handler().(http.Handler); ok { if hdlr, ok := h.hd.Handler().(http.Handler); ok {
handler = hdlr handler = hdlr
} }
case len(h.handlers) > 0 && h.hd != nil:
handler = h
} }
if handler == nil { if handler == nil {