on master help sign in
Merge branch 'wai-3.0-warp-3.1'
commit78042229efaea2b87527243d2340a558b0631c45 authorKazu Yamamoto <kazu@iij.ad.jp> dateMon 21 Dec 2015, 14:38 (11 years ago) parent86bb89a3af9908
3 files changed+11−6
warp-tls/Network/Wai/Handler/WarpTLS.hs+8−3 warp-tls/warp-tls.cabal+1−1 warp/warp.cabal+2−2
warp-tls/Network/Wai/Handler/WarpTLS.hs+8−3
@@ -248,7 +248,7 @@ runTLSSocket' tlsset@TLSSettings{..} set credential sock app =
248248 runSettingsConnectionMakerSecure set get app
249249 where
250250 get = getter tlsset sock params
251− params = TLS.ServerParams {
251+ params = def { -- TLS.ServerParams
252252 TLS.serverWantClientCert = tlsWantClientCert
253253 , TLS.serverCACertificates = []
254254 , TLS.serverDHEParams = Nothing
@@ -264,7 +264,7 @@ runTLSSocket' tlsset@TLSSettings{..} set credential sock app =
264264 shared = def {
265265 TLS.sharedCredentials = TLS.Credentials [credential]
266266 }
267− supported = TLS.Supported {
267+ supported = def { -- TLS.Supported
268268 TLS.supportedVersions = tlsAllowedVersions
269269 , TLS.supportedCiphers = tlsCiphers
270270 , TLS.supportedCompressions = [TLS.nullCompression]
@@ -440,7 +440,12 @@ plainHTTP TLSSettings{..} s bs0 = case onInsecure of
440440 }
441441 return (conn'', TCP)
442442 DenyInsecure lbs -> do
443− sendAll s "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n"
443+ -- FIXME: what about HTTP/2?
444+ -- http://tools.ietf.org/html/rfc2817#section-4.2
445+ sendAll s "HTTP/1.1 426 Upgrade Required\
446+ \r\nUpgrade: TLS/1.0, HTTP/1.1\
447+ \r\nConnection: Upgrade\
448+ \r\nContent-Type: text/plain\r\n\r\n"
444449 mapM_ (sendAll s) $ L.toChunks lbs
445450 sClose s
446451 throwIO InsecureConnectionDenied
warp-tls/warp-tls.cabal+1−1
@@ -1,5 +1,5 @@
11Name: warp-tls
2−Version: 3.1.4
2+Version: 3.1.5
33Synopsis: HTTP over TLS support for Warp via the TLS package
44License: MIT
55License-file: LICENSE
warp/warp.cabal+2−2
@@ -1,5 +1,5 @@
11Name: warp
2−Version: 3.1.10
2+Version: 3.1.11
33Synopsis: A fast, light-weight web server for WAI applications.
44License: MIT
55License-file: LICENSE
@@ -43,7 +43,7 @@ Library
4343 , ghc-prim
4444 , http-types >= 0.8.5
4545 , iproute >= 1.3.1
46− , http2 >= 1.3
46+ , http2 >= 1.3 && < 1.4
4747 , simple-sendfile >= 0.2.7 && < 0.3
4848 , unix-compat >= 0.2
4949 , wai >= 3.0.4 && < 3.1