Skip to content

Commit fea2d41

Browse files
olsonjefferybrson
authored andcommitted
---
yaml --- r: 15994 b: refs/heads/try c: b0b1752 h: refs/heads/master v: v3
1 parent 321e99d commit fea2d41

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: c7656f67ad6c6ee687332f613a6074f76107c1b8
5+
refs/heads/try: b0b175214a794a9f84f65ae8687522491f8b9c4b
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libstd/net_tcp.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@ mod test {
14241424
let sock = result::unwrap(accept_result);
14251425
log(debug, "SERVER: successfully accepted"+
14261426
"connection!");
1427-
let received_req_bytes = sock.read(2000u);
1427+
let received_req_bytes = sock.read(0u);
14281428
alt received_req_bytes {
14291429
result::ok(data) {
14301430
server_ch.send(
@@ -1492,7 +1492,7 @@ mod test {
14921492
log(debug, "SERVER: successfully accepted"+
14931493
"connection!");
14941494
let received_req_bytes =
1495-
sock.read(2000u);
1495+
sock.read(0u);
14961496
alt received_req_bytes {
14971497
result::ok(data) {
14981498
server_ch.send(
@@ -1529,7 +1529,7 @@ mod test {
15291529
let sock = result::unwrap(connect_result);
15301530
let resp_bytes = str::bytes(resp);
15311531
tcp_write_single(sock, resp_bytes);
1532-
let read_result = sock.read(2000u);
1532+
let read_result = sock.read(0u);
15331533
if read_result.is_failure() {
15341534
log(debug, "CLIENT: failure to read");
15351535
""

branches/try/src/libstd/uv_ll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ mod test {
12801280
fn impl_uv_tcp_server_and_request() unsafe {
12811281
let bind_ip = "0.0.0.0";
12821282
let request_ip = "127.0.0.1";
1283-
let port = 8888;
1283+
let port = 8887;
12841284
let kill_server_msg = "does a dog have buddha nature?";
12851285
let server_resp_msg = "mu!";
12861286
let client_port = comm::port::<str>();

0 commit comments

Comments
 (0)