Ticket #1: provisional-code-for-creating-request_uris-that-conform-with-rfc2616_.dpatch

New patches:

[Provisional code for creating request-uris that conform with RFC2616.
'Daniel McAllansmith <dm.maillists@gmail.com>'**20080331202400
 Currently only abs_path request-uris are used.  This means that you can't get
 resources via a proxy, which requires the use of absoluteURI request-uris.
 This provisional code adds a RequestURI datatype that allows you to
 discriminate between requests to an origin server, a proxy and requesting
 server info.  Further changes to actually use this code are required, at
 the least replacing the URI in Request with RequestURI and removing the use
 of fixReq in simpleHTTP.
] {
hunk ./Network/HTTP.hs 236
+-- | The request-uri that we will send to the server, conforming to
+-- RFC2616, Section 5.1.2.  Note that we don't have a CONNECT
+-- RequestMethod so the authority form is not currently implemented.
+--
+-- A RequestURI consists of a URI representing a resource on a server
+-- and the type of request we will be making to that resource.
+-- Depending upon the requestType parts of the resource URI may be
+-- ignored, eg HostingServer will only use the host and port from the
+-- resource URI.
+data RequestURI = ReqURI { resource :: URI
+                         , requestType :: RequestType
+                         }
+
+instance Show RequestURI where
+    show (ReqURI r HostingServer) = "*"
+    show (ReqURI r FromOrigin)    = (show . clearURIScheme . clearURIAuth . normaliseURIPath) r
+    show (ReqURI r ViaProxy)      = (show . clearURIUserInfo . normaliseURIPath) r
+
+normaliseURIPath u = if null (uriPath u) || head (uriPath u) /= '/'
+                       then u { uriPath = '/' : uriPath u }
+                       else u
+
+clearURIAuth u = u { uriAuthority = Nothing }
+
+clearURIScheme u = u { uriScheme = "" }
+
+clearURIUserInfo u = u { uriAuthority = (fmap (\ua -> ua { uriUserInfo = "" }) . uriAuthority) u }
+
+-- | Discriminate between making a request of the hosting server of a
+-- resource, requesting a resource from an origin/gateway server and
+-- requesting a resource via a proxy.
+data RequestType = HostingServer | FromOrigin | ViaProxy
+
}

[Tidy up RequestURI.
Eric Kow <E.Y.Kow@brighton.ac.uk>**20080618144146] {
hunk ./Network/HTTP.hs 126
-    parseURIAuthority
+    parseURIAuthority,
+
+    RequestURI(..),
+    RequestType(..),
+    defaultRequestURI,
hunk ./Network/HTTP.hs 258
+normaliseURIPath :: URI -> URI
hunk ./Network/HTTP.hs 263
+clearURIAuth :: URI -> URI
hunk ./Network/HTTP.hs 266
+clearURIScheme :: URI -> URI
hunk ./Network/HTTP.hs 269
+clearURIUserInfo :: URI -> URI
hunk ./Network/HTTP.hs 272
+defaultRequestURI :: URI -> RequestURI
+defaultRequestURI u = ReqURI u FromOrigin
+
}

[Plug RequestURI in (for better proxy support).
Eric Kow <E.Y.Kow@brighton.ac.uk>**20080618144225] {
hunk ./Network/Browser.hs 510
-    let uri = rqURI rq in
+    let uri = resource $ rqURI rq in
hunk ./Network/Browser.hs 735
-       let uri = rqURI rq
+       let uri = resource $ rqURI rq
hunk ./Network/Browser.hs 756
-            NoProxy -> dorequest (uriAuth $ rqURI rq'') rq''
+            NoProxy -> dorequest (uriAuth $ resource $ rqURI rq'') rq''
hunk ./Network/Browser.hs 758
-                let rq''' = case ath of 
-                                Nothing -> rq''
-                                Just x  -> insertHeader HdrProxyAuthorization (withAuthority x rq'') rq''
+                let uri''' = (rqURI rq'') { requestType = ViaProxy }
+                    rq''' = case ath of
+                                Nothing -> rq'' { rqURI = uri''' }
+                                Just x  -> insertHeader HdrProxyAuthorization (withAuthority x rq'') $
+                                           rq'' { rqURI = uri''' }
hunk ./Network/Browser.hs 861
-                                              ; let rq = rq { rqMethod=GET, rqURI=newuri', rqBody="" }
+                                              ; let rq = rq { rqMethod=GET, rqURI=defaultRequestURI newuri', rqBody="" }
hunk ./Network/Browser.hs 908
-                                      request' (0,redirectcount+1,retrycount,True) (rq { rqURI=newuri' }) 
+                                      request' (0,redirectcount+1,retrycount,True) (rq { rqURI=defaultRequestURI newuri' })
hunk ./Network/Browser.hs 983
-    Request { rqURI=uri
+    Request { rqURI=defaultRequestURI uri
hunk ./Network/Browser.hs 1007
-                       , rqURI=u { uriQuery= '?' : enc }  -- What about old query?
+                       , rqURI=defaultRequestURI $ u { uriQuery= '?' : enc }  -- What about old query?
hunk ./Network/Browser.hs 1013
-                        , rqURI=u
+                        , rqURI=defaultRequestURI u
hunk ./Network/HTTP.hs 293
-     Request { rqURI       :: URI   -- ^ might need changing in future
+     Request { rqURI       :: RequestURI
+                                    -- ^ might need changing in future
hunk ./Network/HTTP.hs 312
-        show m ++ sp ++ alt_uri ++ sp ++ httpVersion ++ crlf
+        show m ++ sp ++ show u ++ sp ++ httpVersion ++ crlf
hunk ./Network/HTTP.hs 314
-        where
-            alt_uri = show $ if null (uriPath u) || head (uriPath u) /= '/' 
-                        then u { uriPath = '/' : uriPath u } 
-                        else u
hunk ./Network/HTTP.hs 457
-  -- we assume that this is the case, so we take the host name from
-  -- the Host header if there is one, otherwise from the request-URI.
-  -- Then we make the request-URI an abs_path and make sure that there
-  -- is a Host header.
hunk ./Network/HTTP.hs 461
-                r { rqURI = (rqURI r){ uriScheme = "", 
-                                       uriAuthority = Nothing } }             
+                r
hunk ./Network/HTTP.hs 470
-                             Nothing -> uriToAuthorityString (rqURI r)
+                             Nothing -> uriToAuthorityString $ resource $ rqURI r
hunk ./Network/HTTP.hs 580
-                host = uriToAuthorityString uri
+                host = uriToAuthorityString $ resource $ uri
hunk ./Network/HTTP.hs 629
-       return $ rslt `bindE` \(ftrs,bdy) -> Right (Request uri rm (hdrs++ftrs) bdy)
+       let rUri = ReqURI uri FromOrigin
+       return $ rslt `bindE` \(ftrs,bdy) -> Right (Request rUri rm (hdrs++ftrs) bdy)
hunk ./test/get.hs 42
-request uri = Request{ rqURI = uri,
+request uri = Request{ rqURI = ReqURI uri ViaProxy,
}

Context:

[Fix for socket close code.
prb@mult.ifario.us**20080502192705] 
[Accept the empty string as a cookie value.
Will Thompson <will@willthompson.co.uk>**20080426132046
 http://wp.netscape.com/newsref/std/cookie_spec.html does not specify whether
 a cookie's value can be the empty string, but there is no obvious reason not
 to accept it.
] 
[Bump version number to 3001.1.0. Incremented minor number since the patch from Eric Mertens extends the API.
bjorn@bringert.net**20080305202825] 
[Export getRequestHead and processRequest, add support for custom RequestMethods
Eric Mertens <emertens@galois.com>**20080305190759] 
[Include uriQuery in request line.
bjorn@bringert.net**20080128094645] 
[Send abs_path as Request-URI to comply with HTTP 1.1 spec.
'Daniel McAllansmith <dm.maillists@gmail.com>'**20080128053024
 RFC2616 Section 5.1.2 specifies that abs_path MUST be used to identify a resource on a origin server or gateway, not absoluteURI which is for use with proxies.
 
 Change Request's Show instance to use /path/to/resource rather than
 http://server/path/to/resource.
] 
[Bump version to 3001.0.4
bjorn@bringert.net**20071213122237] 
[Expose Network.HTTP.Headers in cabal file
Eric Mertens <emertens@galois.com>**20071212220235
 
 Failure to do this breaks :browse functionality in GHCi
 as well as makes these useful functions unavailable
] 
[Resolved conflicts in Network.Stream.
robin@shorestreet.com**20071203042948] 
[Resolve conflict in HTTP.cabal.
robin@shorestreet.com**20071029195007] 
[Split Header functionality into Network.HTTP.Headers module.
robin@shorestreet.com**20070725192851] 
[Added files to .cabal file, made deps explicit in Network.TCP module.
robin@shorestreet.com**20070725184005] 
[Refactored Network.Stream.
robin@shorestreet.com**20070725061114] 
[Made more deps explicit.
robin@shorestreet.com**20070724054038] 
[Made dependencies explicit in import statements.
robin@shorestreet.com**20070724043419] 
[Bumped version number to 3001.0.3.
bjorn@bringert.net**20071130225017] 
[Change myrecv to allow a 0 length. Suggested by Eric Mertens.
bjorn@bringert.net**20071130224542
 On Wed, 2007-08-15 at 23:25 +0200, Bjorn Bringert wrote:
 Why doesn't the existing code work? Does recv fail when given 0?
 
 On Nov 30, 2007, at 23:36 , Eric Mertens wrote:
 Yes, recv can not cope with an argument of 0
 
 http://darcs.haskell.org/packages/network/Network/Socket.hsc
 
 recv :: Socket -> Int -> IO String
 recv sock l = recvLen sock l >>= \ (s,_) -> return s
 
 recvLen :: Socket -> Int -> IO (String, Int)
 recvLen sock@(MkSocket s _family _stype _protocol status) nbytes 
  | nbytes <= 0 = ioError (mkInvalidRecvArgError "Network.Socket.recv")
 
] 
[Set version number to 3001.0.2.
bjorn@bringert.net**20071118211601] 
[Change version to 3001.0.1.
bjorn@bringert.net**20071117212431] 
[Don't treat any chunk size starting with '0' as a 0 chunk size.
bjorn@bringert.net**20071117212214
 Radosław Grzanka reported that Network.HTTP can't get http://www.podshow.com/feeds/gbtv.xml, see http://article.gmane.org/gmane.comp.lang.haskell.cafe/31783
 
 This turned out to be a bug in how Network.HTTP handled Chunked Transfer Encoding. The web server sent the chunk size as "00004000" (according to RFC 2616 this can be non-empty sequence of hex digits). However, Network.HTTP treated any chunk size starting with '0' as a chunk size of 0, which indicates the end of the chunked encoding. 
] 
[TAG 3001.0.0
Duncan Coutts <duncan@haskell.org>**20071021133823] 
[Fix building with ghc-6.4 and base-1.0
Duncan Coutts <duncan@haskell.org>**20071017225318
 Also drop -O since Cabal does that automatically now.
] 
[Added DELETE method.
Greg Heartsfield <scsibug@imap.cc>**20070919075758] 
[Use Cabal configurations.
bjorn@bringert.net**20071008204007] 
[Exporting ResponseCode from Network.HTTP
ricky@dtek.chalmers.se**20070423155719] 
[WWW-Authenticate parsing bug.
bjorn@bringert.net**20070625204602
 RFC1945 says a challenge matches:
 
 challenge      = auth-scheme 1*SP realm *( "," auth-param )
 
 but, as I understand it, the "1*SP" term is not permitted. The fix is of
 course simple:
 
 With this I can successfully perform Basic authentication against my cheap
 ADSL router.
 
 Patch by cb224@cs.york.ac.uk
] 
[Updated authentication scheme names
jgbailey@gmail.com**20070613233759
 
 
 When authenticating, the HTTP library
 responded with "basic" or "digest". Web
 servers expect "Basic" or "Digest", and some
 are case-sensitive. THerefore, this update is necessary.
 
] 
[Added support for proxies with ports
jgbailey@gmail.com**20070612212844
 
 A proxy can be both a host name with a port. This patch adds support for proxies that use a port other than 80.
 
 
] 
[get rid of annoying cpp include kludge
alex@happs.org**20070216191216] 
[Changed version number to 3000.0.0 to avoid ordering problems with old date-based version numbers.
bjorn@bringert.net**20070211094535] 
[Changed version number scheme. Set version number to 1.0.
bjorn@bringert.net**20070206143514] 
[Renamed http.cabal to HTTP.cabal.
bjorn@bringert.net**20070206111455] 
[Bumped version number.
bjorn@bringert.net**20070206111242] 
[Export authority stuff from Network.Browser.
bjorn@bringert.net**20070206110917] 
[Use the non-deprecated Network.URI API
trebla@vex.net**20070201210541] 
[Added -fwarn-missing-signatures. Added type signatures for defaultCookieFilter, userCookieFilter, setCookies, getCookies and defaultGETRequest.
bjorn@bringert.net**20070129202633] 
[Added type signature for Network.Browser.request.
bjorn@bringert.net**20070129201740] 
[Allowing - and : in cookie names/values, plus allowing a trailing semicolon in cookie value.
bakert@gmail.com**20070111105703] 
[Fixed README typo.
bjorn@bringert.net**20061226230117] 
[Set content-type: application/x-www-form-urlencoded in formToRequest. Patch by Artem Gr.
bringert@cs.chalmers.se**20061114125602
 Artem Gr wrote:
 > The "Haskell HTTP package", present in http://haskell.org/http/, 
 > contains the formToRequest, which does not work, because it lacks the 
 > proper Content-Type header definition. Adding /Header HdrContentType 
 > "application/x-www-form-urlencoded"/ to the /rqHeaders/ of the /Request/ 
 > solves the problem. Attached is the patch.
] 
[Removed debian directory, as requested by haskell-http Debian maintainer Arjan Oosting.
bjorn@bringert.net**20060811203429] 
[s/BSD4/BSD3/. Dunno where that came from.
bjorn@bringert.net**20060707085613] 
[Added other-modules and -O according to patch by dcoutts. Couldn't apply his patch because of a darcs bug (!). Bumped version number.
bjorn@bringert.net**20060707085029] 
[Removed obsolote references to the browser package from the README.
bjorn@bringert.net**20060707083845] 
[Copied the Base64, MD5 and MD5Aux modules from the Crypto package to Network.HTTP and merged the http and browser packages back together.
bjorn@bringert.net**20060705194820] 
[Moved the browser module to a separate package, as suggested by shapr.
bjorn@bringert.net**20060423132859] 
[Cleaned up some haddock comments.
bringert@cs.chalmers.se**20060327133857] 
[Added basic server-side functions and modularised
Simon Foster <S.Foster@dcs.shef.ac.uk>**20060324201059
  - Split module up into to sepearate Network.[Stream,TCP,HTTP] modules
  - Created functions receiveHTTP and responseHTTP to allow server side interactions
    (although 100-continue is unsupported and I haven't checked for standard compliancy).
  - Pulled the transfer functions from sendHTTP to global scope to allow access by
    above functions.
] 
[Make Network.Browser support servers in different ports
Einar Karttunen <ekarttun@cs.helsinki.fi>**20060302150224] 
[Make BrowserAction a Functor
Einar Karttunen <ekarttun@cs.helsinki.fi>**20060302150203] 
[Handle GET requests with query string
Einar Karttunen <ekarttun@cs.helsinki.fi>**20060221235500] 
[Don't leave socket half-open on failed connect. Patch by Samuel Bronson.
bjorn@bringert.net**20060115203624] 
[Post requests should not add the query parameters to the URI
Einar Karttunen <ekarttun@cs.helsinki.fi>**20051216193432] 
[Update version number.
bjorn@bringert.net**20051122232535] 
[Added simpleHTTP_, which takes a Stream argument.
bjorn@bringert.net**20050830084009] 
[ Added dependency on the base package. Patch by Henning GÃŒnther.
bjorn@bringert.net**20050818225020] 
[Fixed bugs in writeBlock implementations that would resend the same data over and over. Changes by Lemmih.
bjorn@bringert.net**20050614180545] 
[Fixed typo in dist name.
bjorn@bringert.net**20050505192119] 
[Fixed haddock comments so that they parse.
bjorn@bringert.net**20050505191121] 
[Updated build system and cabal-description.
bjorn@bringert.net**20050505191006] 
[Use Base64 and MD5 from the Crypto package.
bjorn@bringert.net**20050505190723] 
[Export Proxy type from Browser, as suggested by Uwe Schmidt.
bjorn@bringert.net**20050413104916] 
[Fixed homepage url in cabal file
bjorn@bringert.net**20050328212813] 
[Updated to support GHC 6.4: more cabal fields, Setup.lhs uses runghc, use new Network.URI, changed moulde for importing som IO error functions.
bjorn@bringert.net**20050328212438] 
[Moved to http.cabal and changed contents to be compatible with current Cabal.
bjorn@bringert.net**20050218223528] 
[Catch EOF exceptions thrown by recv when 0 bytes are read. Patch by John Goerzen.
bjorn@bringert.net**20050218220503
 
 Description from John Goerzen:
 
 > First, even though I am sending an accurate Content-Length header with
 > my POST message, the server is timing out and returning a 500 Internal
 > Server Error document.
 
 Looks like that was a server bug.
 
 > Second, after reading that error document, Network.HTTP is generating an
 > error of its own.  Here's an strace illustrating it:
 
 This one was a bug in HTTP.  Actually, I am stunned that nobody found it
 before, because it looks to me that it would cause an exception to be
 raised on every single HTTP hit.
 
 It turns out that Network.Socket.recv raises an EOF error when it gets
 back 0 bytes of data.  HTTP is expecting it to return an empty list for
 some reason.
 
] 
[minor debian packaging fixes
ganesh@earth.li**20041213235450] 
[add debian/copyright file
ganesh@earth.li**20041213235441] 
[LICENSE now covers entire package, added all contributors to LICENSE.
bjorn@bringert.net**20041213230231] 
[Support '.' characters in cookie names
ganesh@earth.li**20041213010128] 
[Initial debianisation
ganesh@earth.li**20041213002245] 
[dependencies fixes
ganesh@earth.li**20041213001849] 
[Added -package posix to work around missing posix package dependency in current version of Cabal.
bjorn@bringert.net**20041113133508] 
[distclean now removes Setup.o and Setup.hi
bjorn@bringert.net**20041113132459] 
[Added patch from Andre Furtado which removes the trailing ampersand in urlEncodeVars
bjorn@bringert.net**20041015151040] 
[Imported current HTTP and Browser module versions.
bjorn@bringert.net**20041015145806] 
Patch bundle hash:
5d796dfbb44cadf8ab6ec473d0bb7f781b990a5f