git.iko.soy/typeable/wai
on master help sign in
Merge branch 'wai-3.0-warp-3.1'
7804222Kazu Yamamoto
warp-tls/Network/Wai/Handler/WarpTLS.hs+8−3
compare with master
unifiedsplit
@@ -248,7 +248,7 @@ runTLSSocket' tlsset@TLSSettings{..} set credential sock app =
248 runSettingsConnectionMakerSecure set get app
248 runSettingsConnectionMakerSecure set get app
249 where
249 where
250 get = getter tlsset sock params
250 get = getter tlsset sock params
251− params = TLS.ServerParams {
251+ params = def { -- TLS.ServerParams
252 TLS.serverWantClientCert = tlsWantClientCert
252 TLS.serverWantClientCert = tlsWantClientCert
253 , TLS.serverCACertificates = []
253 , TLS.serverCACertificates = []
254 , TLS.serverDHEParams = Nothing
254 , TLS.serverDHEParams = Nothing
@@ -264,7 +264,7 @@ runTLSSocket' tlsset@TLSSettings{..} set credential sock app =
264 shared = def {
264 shared = def {
265 TLS.sharedCredentials = TLS.Credentials [credential]
265 TLS.sharedCredentials = TLS.Credentials [credential]
266 }
266 }
267− supported = TLS.Supported {
267+ supported = def { -- TLS.Supported
268 TLS.supportedVersions = tlsAllowedVersions
268 TLS.supportedVersions = tlsAllowedVersions
269 , TLS.supportedCiphers = tlsCiphers
269 , TLS.supportedCiphers = tlsCiphers
270 , TLS.supportedCompressions = [TLS.nullCompression]
270 , TLS.supportedCompressions = [TLS.nullCompression]
@@ -440,7 +440,12 @@ plainHTTP TLSSettings{..} s bs0 = case onInsecure of
440 }
440 }
441 return (conn'', TCP)
441 return (conn'', TCP)
442 DenyInsecure lbs -> do
442 DenyInsecure lbs -> do
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\
443− sendAll s "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n"
448+ \r\nContent-Type: text/plain\r\n\r\n"
444 mapM_ (sendAll s) $ L.toChunks lbs
449 mapM_ (sendAll s) $ L.toChunks lbs
445 sClose s
450 sClose s
446 throwIO InsecureConnectionDenied
451 throwIO InsecureConnectionDenied
warp-tls/warp-tls.cabal+1−1
@@ -1,5 +1,5 @@
1Name: warp-tls
1Name: warp-tls
2−Version: 3.1.4
2+Version: 3.1.5
3Synopsis: HTTP over TLS support for Warp via the TLS package
3Synopsis: HTTP over TLS support for Warp via the TLS package
4License: MIT
4License: MIT
5License-file: LICENSE
5License-file: LICENSE
warp/warp.cabal+2−2
@@ -1,5 +1,5 @@
1Name: warp
1Name: warp
2−Version: 3.1.10
2+Version: 3.1.11
3Synopsis: A fast, light-weight web server for WAI applications.
3Synopsis: A fast, light-weight web server for WAI applications.
4License: MIT
4License: MIT
5License-file: LICENSE
5License-file: LICENSE
@@ -43,7 +43,7 @@ Library
43 , ghc-prim
43 , ghc-prim
44 , http-types >= 0.8.5
44 , http-types >= 0.8.5
45 , iproute >= 1.3.1
45 , iproute >= 1.3.1
46− , http2 >= 1.3
46+ , http2 >= 1.3 && < 1.4
47 , simple-sendfile >= 0.2.7 && < 0.3
47 , simple-sendfile >= 0.2.7 && < 0.3
48 , unix-compat >= 0.2
48 , unix-compat >= 0.2
49 , wai >= 3.0.4 && < 3.1
49 , wai >= 3.0.4 && < 3.1