@@ -43,7 +43,7 @@ mkRequest ii1 settings addr (reqths,reqvt) body = (req,ii)
4343 , requestBody = body
4444 , vault = vaultValue
4545 , requestBodyLength = ChunkedBody -- fixme
46− , requestHeaderHost = mHost
46+ , requestHeaderHost = mHost <|> mAuth
4747 , requestHeaderRange = mRange
4848 , requestHeaderReferer = mReferer
4949 , requestHeaderUserAgent = mUserAgent
@@ -51,13 +51,14 @@ mkRequest ii1 settings addr (reqths,reqvt) body = (req,ii)
5151 headers = map (first tokenKey) ths
5252 where
5353 ths = case mHost of
54− Nothing -> (tokenHost, colonAuth) : reqths
5554 Just _ -> reqths
56− !colonPath = fromJust $ getHeaderValue tokenPath reqvt
57− !colonMethod = fromJust $ getHeaderValue tokenMethod reqvt
58− !mAuth = getHeaderValue tokenAuthority reqvt
59− !colonAuth = fromJust $ mAuth
60− !mHost = getHeaderValue tokenHost reqvt <|> mAuth
55+ Nothing -> case mAuth of
56+ Just auth -> (tokenHost, auth) : reqths
57+ _ -> reqths
58+ !colonPath = fromJust $ getHeaderValue tokenPath reqvt -- MUST
59+ !colonMethod = fromJust $ getHeaderValue tokenMethod reqvt -- MUST
60+ !mAuth = getHeaderValue tokenAuthority reqvt -- SHOULD
61+ !mHost = getHeaderValue tokenHost reqvt
6162 !mRange = getHeaderValue tokenRange reqvt
6263 !mReferer = getHeaderValue tokenReferer reqvt
6364 !mUserAgent = getHeaderValue tokenUserAgent reqvt