---

brson · brson · commit bb015d8eda27 · 2012-07-26T18:40:57.000-07:00
yaml --- r: 31462 b: refs/heads/dist-snap c: 97d59a8 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: b50279ba94840c8c82f0aa50b8cb6a457505bdb2
+refs/heads/dist-snap: 97d59a8ade04bec36ad99a5649d91fd8a97e7d30
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/dist-snap/src/libstd/net_tcp.rs b/branches/dist-snap/src/libstd/net_tcp.rs
@@ -1118,8 +1118,7 @@ extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
         log(debug, #fmt("tcp on_read_cb nread: %d", nread as int));
         let reader_ch = (*socket_data_ptr).reader_ch;
         let buf_base = uv::ll::get_base_from_buf(buf);
-        let buf_len = uv::ll::get_len_from_buf(buf);
-        let new_bytes = vec::unsafe::from_buf(buf_base, buf_len as uint);
+        let new_bytes = vec::unsafe::from_buf(buf_base, nread as uint);
         comm::send(reader_ch, result::ok(new_bytes));
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1118,8 +1118,7 @@ extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,`
`1118`	`1118`	`log(debug, #fmt("tcp on_read_cb nread: %d", nread as int));`
`1119`	`1119`	`let reader_ch = (*socket_data_ptr).reader_ch;`
`1120`	`1120`	`let buf_base = uv::ll::get_base_from_buf(buf);`
`1121`		`- let buf_len = uv::ll::get_len_from_buf(buf);`
`1122`		`- let new_bytes = vec::unsafe::from_buf(buf_base, buf_len as uint);`
	`1121`	`+ let new_bytes = vec::unsafe::from_buf(buf_base, nread as uint);`
`1123`	`1122`	`comm::send(reader_ch, result::ok(new_bytes));`
`1124`	`1123`	`}`
`1125`	`1124`	`}`