mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
1f97f2dc36
go HTTP library uses type assertion to determine if a connection is a TLS connection. If we wrapper TLS Listener with any customized Listener that can create customized Conn, HTTPs will be broken. This commit fixes the issue.
41 lines
1.3 KiB
Go
41 lines
1.3 KiB
Go
// Copyright 2015 CoreOS, Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package etcdmain
|
|
|
|
import (
|
|
"io/ioutil"
|
|
defaultLog "log"
|
|
"net"
|
|
"net/http"
|
|
"time"
|
|
)
|
|
|
|
// serveHTTP accepts incoming HTTP connections on the listener l,
|
|
// creating a new service goroutine for each. The service goroutines
|
|
// read requests and then call handler to reply to them.
|
|
func serveHTTP(l net.Listener, handler http.Handler, readTimeout time.Duration) error {
|
|
// TODO: assert net.Listener type? Arbitrary listener might break HTTPS server which
|
|
// expect a TLS Conn type.
|
|
|
|
logger := defaultLog.New(ioutil.Discard, "etcdhttp", 0)
|
|
// TODO: add debug flag; enable logging when debug flag is set
|
|
srv := &http.Server{
|
|
Handler: handler,
|
|
ReadTimeout: readTimeout,
|
|
ErrorLog: logger, // do not log user error
|
|
}
|
|
return srv.Serve(l)
|
|
}
|