22f49f216e
Had to update http-client and network, with follow-on dep changes. This commit was sponsored by Brock Spratlen on Patreon.
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From 2f1d2eddde94d339d91d7b018dc90542b7625fd3 Mon Sep 17 00:00:00 2001
|
|
From: androidbuilder <androidbuilder@example.com>
|
|
Date: Wed, 20 Jun 2018 14:41:04 +0100
|
|
Subject: [PATCH] remove ipv6 stuff
|
|
|
|
---
|
|
Network/Wai/Handler/Warp/Run.hs | 9 +--------
|
|
1 file changed, 1 insertion(+), 8 deletions(-)
|
|
|
|
diff --git a/Network/Wai/Handler/Warp/Run.hs b/Network/Wai/Handler/Warp/Run.hs
|
|
index 116b24e..5c7cbcb 100644
|
|
--- a/Network/Wai/Handler/Warp/Run.hs
|
|
+++ b/Network/Wai/Handler/Warp/Run.hs
|
|
@@ -14,7 +14,7 @@ import Control.Monad (when, unless, void)
|
|
import Data.ByteString (ByteString)
|
|
import qualified Data.ByteString as S
|
|
import Data.Char (chr)
|
|
-import Data.IP (toHostAddress, toHostAddress6)
|
|
+import Data.IP (toHostAddress)
|
|
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
|
|
import Data.Streaming.Network (bindPortTCP)
|
|
import Network (sClose, Socket)
|
|
@@ -305,13 +305,6 @@ serveConnection conn ii origAddr transport settings app = do
|
|
[a] -> Just (SockAddrInet (readInt clientPort)
|
|
(toHostAddress a))
|
|
_ -> Nothing
|
|
- ["PROXY","TCP6",clientAddr,_,clientPort,_] ->
|
|
- case [x | (x, t) <- reads (decodeAscii clientAddr), null t] of
|
|
- [a] -> Just (SockAddrInet6 (readInt clientPort)
|
|
- 0
|
|
- (toHostAddress6 a)
|
|
- 0)
|
|
- _ -> Nothing
|
|
("PROXY":"UNKNOWN":_) ->
|
|
Just origAddr
|
|
_ ->
|
|
--
|
|
2.1.4
|
|
|