merge master #90

Merged
vtolstov merged 2 commits from master into v3 2022-01-23 02:41:15 +03:00

View File

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