Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Network/Browser.hs
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ getAllowBasicAuth :: BrowserAction t Bool
getAllowBasicAuth = gets bsAllowBasicAuth

-- | @setMaxAuthAttempts mbMax@ sets the maximum number of authentication attempts
-- to do. If @Nothing@, rever to default max.
-- to do. If @Nothing@, revert to default max.
setMaxAuthAttempts :: Maybe Int -> BrowserAction t ()
setMaxAuthAttempts mb
| fromMaybe 0 mb < 0 = return ()
Expand Down Expand Up @@ -515,7 +515,7 @@ setAllowRedirects bl = modify (\b -> b {bsAllowRedirects=bl})
getAllowRedirects :: BrowserAction t Bool
getAllowRedirects = gets bsAllowRedirects

-- | @setMaxRedirects maxCount@ sets the maxiumum number of forwarding hops
-- | @setMaxRedirects maxCount@ sets the maximum number of forwarding hops
-- we are willing to jump through. A no-op if the count is negative; if zero,
-- the max is set to whatever default applies. Notice that setting the max
-- redirects count does /not/ enable following of redirects itself; use
Expand Down Expand Up @@ -587,7 +587,7 @@ setCheckForProxy flg = modify (\ b -> b{bsCheckProxy=flg})
getCheckForProxy :: BrowserAction t Bool
getCheckForProxy = gets bsCheckProxy

-- | @setDebugLog mbFile@ turns off debug logging iff @mbFile@
-- | @setDebugLog mbFile@ turns off debug logging iif @mbFile@
-- is @Nothing@. If set to @Just fStem@, logs of browser activity
-- is appended to files of the form @fStem-url-authority@, i.e.,
-- @fStem@ is just the prefix for a set of log files, one per host/authority.
Expand All @@ -600,7 +600,7 @@ setDebugLog v = modify (\b -> b {bsDebug=v})
-- A common form of user agent string is @\"name\/version (details)\"@. For
-- example @\"cabal-install/0.10.2 (HTTP 4000.1.2)\"@. Including the version
-- of this HTTP package can be helpful if you ever need to track down HTTP
-- compatability quirks. This version is available via 'httpPackageVersion'.
-- compatibility quirks. This version is available via 'httpPackageVersion'.
-- For more info see <http://en.wikipedia.org/wiki/User_agent>.
--
setUserAgent :: String -> BrowserAction t ()
Expand Down
4 changes: 2 additions & 2 deletions Network/HTTP/Base.hs
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ type ResponseCode = (Int,Int,Int)
type ResponseData = (ResponseCode,String,[Header])

-- | @RequestData@ contains the head of a HTTP request; method,
-- its URL along with the auxillary/supporting header data.
-- its URL along with the auxiliary/supporting header data.
type RequestData = (RequestMethod,URI,[Header])

-- | An HTTP Response.
Expand Down Expand Up @@ -792,7 +792,7 @@ normalizeUserAgent opts req =
_ -> replaceHeader HdrUserAgent ua req

-- | @normalizeConnectionClose opts req@ sets the header @Connection: close@
-- to indicate one-shot behavior iff @normDoClose@ is @True@. i.e., it then
-- to indicate one-shot behavior iif @normDoClose@ is @True@. i.e., it then
-- _replaces_ any an existing @Connection:@ header in @req@.
normalizeConnectionClose :: RequestNormalizer ty
normalizeConnectionClose opts req
Expand Down
2 changes: 1 addition & 1 deletion Network/HTTP/MD5Aux.hs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ md5 :: (MD5 a) => a -> ABCD
md5 m = md5_main False 0 magic_numbers m


-- Returns a hex number ala the md5sum program
-- Returns a hex number à la md5sum program

md5s :: (MD5 a) => a -> String
md5s = abcd_to_string . md5
Expand Down
2 changes: 1 addition & 1 deletion Network/StreamSocket.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
-- - Created separate module for instance Stream Socket.
--
-- * Changes by Simon Foster:
-- - Split module up into to sepearate Network.[Stream,TCP,HTTP] modules
-- - Split module up into to separate Network.[Stream,TCP,HTTP] modules
--
-----------------------------------------------------------------------------
module Network.StreamSocket
Expand Down
2 changes: 1 addition & 1 deletion test/get.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- A simple test program which takes a url on the commandline
-- A simple test program which takes a url on the command line
-- and outputs the contents to stdout.

-- ghc --make -package HTTP get.hs -o get
Expand Down
2 changes: 1 addition & 1 deletion test/getb.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- A simple test program which takes a url on the commandline
-- A simple test program which takes a url on the command line
-- and outputs the contents to stdout.

-- ghc --make -package HTTP get.hs -o get
Expand Down
2 changes: 1 addition & 1 deletion test/httpTests.hs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ browserExample = do
return (take 100 (rspBody rsp))
assertEqual "Receiving expected response" (take 100 haskellOrgText) result

-- A vanilla HTTP request using Browser shouln't send a cookie header
-- A vanilla HTTP request using Browser shouldn't send a cookie header
browserNoCookie :: (?testUrl :: ServerAddress) => Assertion
browserNoCookie = do
(_, response) <- browse $ do
Expand Down