Merge pull request #38 from kmcallister/for-upstream

Fixes for request path handling

Author: metajack

src/libhttp/client/request.rs

@@ -40,6 +40,7 @@ that's due to a Rust bug; when that's resolved, we'll go back to using just `Req
 */
 
 use extra::url::Url;
+use extra::url;
 use method::Method;
 use std::rt::io::{Reader, Writer};
 use std::rt::io::net::get_host_addresses;
@@ -203,8 +204,11 @@ impl RequestWriter<TcpStream> {
         // TODO: get to the point where we can say HTTP/1.1 with good conscience
         // XXX: Rust's current lack of statement-duration lifetime handling prevents this from being
         // one statement ("error: borrowed value does not live long enough")
-        // TODO: don't send the entire URL; just url.{path, query}
-        let s = format!("{} {} HTTP/1.0\r\n", self.method.to_str(), self.url.to_str());
+        let s = format!("{} {}{}{} HTTP/1.0\r\n",
+                        self.method.to_str(),
+                        if self.url.path.len()  > 0 { self.url.path.as_slice() } else { "/" },
+                        if self.url.query.len() > 0 { "?" } else { "" },
+                        url::query_to_str(&self.url.query));
         self.stream.write(s.as_bytes());
 
         self.headers.write_all(&mut self.stream);