Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Use url.port instead of hardcoding port 80 #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use url.port instead of hardcoding port 80 #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions http_client.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use std::result;
use std::result::{Result, Ok, Err};
use std::cell::Cell;
use std::str;
use std::uint;
use extra::net::ip::{
get_addr, format_addr,
IpAddr, IpGetAddrErr, Ipv4, Ipv6
Expand Down Expand Up @@ -64,7 +65,7 @@ pub enum RequestError {
ErrorMisc
}

/// Request
/// Request
#[deriving(Eq)]
pub enum RequestEvent {
Status(StatusCode),
Expand Down Expand Up @@ -120,8 +121,12 @@ impl<C: Connection, CF: ConnectionFactory<C>> HttpRequest<C, CF> {
debug!("http_client: using IP %? for %?", format_addr(&ip_addr), self.url.to_str());

let socket = {
debug!("http_client: connecting to %?", ip_addr);
let socket = self.connection_factory.connect(copy ip_addr, 80);
let port = match self.url.port.clone() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With

let port = match self.url.port {
    Some(port) => uint::from_str(port).get(),
    _ => 80
};

I was getting

$ make
cc  -fPIC http_parser.c -o http_parser.o -c
ar rcs libhttp_parser.a http_parser.o
rustc  http_client.rc -o libhttp_client.dummy
http_client.rc:125:16: 125:26 error: cannot move out of dereference of & pointer
http_client.rc:125                 Some(port) => uint::from_str(port).get(),
                                   ^~~~~~~~~~
error: aborting due to previous error
make: *** [libhttp_client.dummy] Error 101
                                                                    ^~~~

How do I do that? Thanks for your help.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code sample and line from the error don't match. The first one looks like it should Just Work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy and paste error. I've updated the error message I'm getting. This is with Rust 0.8-pre from a few days back.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I grabbed the latest rust and it breaks all sorts of things :) Seems like copy is gone and extra::net::ip moved. I'll switch to rust 0.7 and test.

Is the general policy of servo to track the last release, or how does that work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using release-0.7 tag of rust (rustc 0.7 (a2db7c1 2013-07-02 09:25:44 -0700)... this module doesn't build unless I update parser.rs

+use std::vec;
-            do data.as_imm_buf |buf, _| {
+            do vec::as_imm_buf(data) |buf, _| {

Then I can build. I still get this error:

http_client.rc:125:16: 125:26 error: cannot move out of dereference of & pointer
http_client.rc:125                 Some(port) => uint::from_str(port).get(),
                                   ^~~~~~~~~~

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The general policy for Servo rustc versions is we don't upgrade until we need to, so you can replicate the version we're using from the submodule at https://github.com/mozilla/servo/tree/master/src/compiler.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is very helpful! I'll do configure --prefix=~/local/servo-rust and keep that installation around for testing rust-http-client.

Thanks!

Some(port) => uint::from_str(port).get(),
_ => 80
};
debug!("http_client: connecting to %? on %?", ip_addr, port);
let socket = self.connection_factory.connect(copy ip_addr, port);
if socket.is_ok() {
result::unwrap(socket)
} else {
Expand Down Expand Up @@ -284,9 +289,9 @@ impl<C: Connection, CF: ConnectionFactory<C>> HttpRequest<C, CF> {
}

#[allow(non_implicitly_copyable_typarams)]
pub fn sequence<C: Connection, CF: ConnectionFactory<C>>(request: &mut HttpRequest<C, CF>) ->
pub fn sequence<C: Connection, CF: ConnectionFactory<C>>(request: &mut HttpRequest<C, CF>) ->
~[RequestEvent] {

let events = @mut ~[];
do request.begin |event| {
events.push(event)
Expand Down