Merge pull request #2 from smarty/ryan/http2

Ryan/http2

Author: RyanLCox1

config.go

@@ -36,6 +36,8 @@ type configuration struct {
 	Logger                   logger
 	ErrorLogger              logger
 	HTTPServer               httpServer
+	Protocols                *http.Protocols
+	HTTP2                    *http.HTTP2Config
 }
 
 func New(options ...option) ListenCloser {
@@ -73,6 +75,12 @@ func (singleton) IgnoredErrors(value ...error) option {
 func (singleton) HTTPServer(value httpServer) option {
 	return func(this *configuration) { this.HTTPServer = value }
 }
+func (singleton) Protocols(value *http.Protocols) option {
+	return func(this *configuration) { this.Protocols = value }
+}
+func (singleton) HTTP2(value *http.HTTP2Config) option {
+	return func(this *configuration) { this.HTTP2 = value }
+}
 func (singleton) MaxRequestHeaderSize(value int) option {
 	return func(this *configuration) { this.MaxRequestHeaderSize = value }
 }
@@ -133,6 +141,8 @@ func (singleton) apply(options ...option) option {
 				ReadHeaderTimeout: this.ReadRequestHeaderTimeout,
 				WriteTimeout:      this.WriteResponseTimeout,
 				IdleTimeout:       this.IdleConnectionTimeout,
+				Protocols:         this.Protocols,
+				HTTP2:             this.HTTP2,
 				BaseContext:       func(net.Listener) context.Context { return this.Context },
 				ErrorLog:          newServerLogger(this.ErrorLogger),
 			}
@@ -151,6 +161,8 @@ func (singleton) defaults(options ...option) []option {
 	return append([]option{
 		Options.ListenAddress(":http"),
 		Options.TLSConfig(nil),
+		Options.Protocols(nil),
+		Options.HTTP2(nil),
 		Options.MaxRequestHeaderSize(1024 * 2),
 		Options.ReadRequestTimeout(time.Second * 5),
 		Options.ReadRequestHeaderTimeout(time.Second),

config_test.go

@@ -0,0 +1,42 @@
+package httpserver
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/smarty/gunit"
+	"github.com/smarty/gunit/assert/should"
+)
+
+func TestConfigurationFixture(t *testing.T) {
+	gunit.Run(new(ConfigurationFixture), t)
+}
+
+type ConfigurationFixture struct {
+	*gunit.Fixture
+}
+
+func (this *ConfigurationFixture) TestProtocolsAndHTTP2_DefaultToNil() {
+	server := builtHTTPServer(New())
+
+	this.So(server.Protocols, should.BeNil)
+	this.So(server.HTTP2, should.BeNil)
+}
+func (this *ConfigurationFixture) TestProtocolsAndHTTP2_ArePassedToTheServerThisPackageBuilds() {
+	protocols := new(http.Protocols)
+	protocols.SetHTTP1(true)
+	protocols.SetUnencryptedHTTP2(true)
+	http2 := &http.HTTP2Config{MaxConcurrentStreams: 42}
+
+	server := builtHTTPServer(New(
+		Options.Protocols(protocols),
+		Options.HTTP2(http2),
+	))
+
+	this.So(server.Protocols, should.Equal, protocols)
+	this.So(server.HTTP2, should.Equal, http2)
+}
+
+func builtHTTPServer(value ListenCloser) *http.Server {
+	return value.(*defaultServer).httpServer.(*http.Server)
+}