Updated Branches: refs/heads/master b5bd1cdc3 -> 243d403a6
SPDY: Use TSIOBufferReaderStart where appropriate Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/243d403a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/243d403a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/243d403a Branch: refs/heads/master Commit: 243d403a6bf38278e9a8794dabf67d6eccb9ce4a Parents: b5bd1cd Author: James Peach <[email protected]> Authored: Wed Oct 17 11:19:06 2012 -0700 Committer: James Peach <[email protected]> Committed: Wed Oct 17 11:19:06 2012 -0700 ---------------------------------------------------------------------- plugins/experimental/spdy/http.cc | 2 +- plugins/experimental/spdy/spdy.cc | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/243d403a/plugins/experimental/spdy/http.cc ---------------------------------------------------------------------- diff --git a/plugins/experimental/spdy/http.cc b/plugins/experimental/spdy/http.cc index b5e0432..276de33 100644 --- a/plugins/experimental/spdy/http.cc +++ b/plugins/experimental/spdy/http.cc @@ -164,7 +164,7 @@ debug_http_header( TSIOBufferBlock blk; TSHttpHdrPrint(buffer, header, iobuf.buffer); - blk = TSIOBufferStart(iobuf.buffer); + blk = TSIOBufferReaderStart(iobuf.reader); avail = TSIOBufferBlockReadAvail(blk, iobuf.reader); ptr = (const char *)TSIOBufferBlockReadStart(blk, iobuf.reader, &nbytes); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/243d403a/plugins/experimental/spdy/spdy.cc ---------------------------------------------------------------------- diff --git a/plugins/experimental/spdy/spdy.cc b/plugins/experimental/spdy/spdy.cc index ce91ee8..ba9ac7d 100644 --- a/plugins/experimental/spdy/spdy.cc +++ b/plugins/experimental/spdy/spdy.cc @@ -178,13 +178,12 @@ dispatch_spdy_control_frame( static size_t count_bytes_available( - TSIOBuffer buffer, - TSIOBufferReader reader) + TSIOBufferReader reader) { TSIOBufferBlock block; size_t count = 0; - block = TSIOBufferStart(buffer); + block = TSIOBufferReaderStart(reader); while (block) { const char * ptr; int64_t nbytes; @@ -225,7 +224,7 @@ next_frame: // entering. Unfortunately this does happen :( debug_plugin("short read %" PRId64 " bytes, expected at least %u, real count %zu", nbytes, spdy::message_header::size, - count_bytes_available(io->input.buffer, io->input.reader)); + count_bytes_available(io->input.reader)); return; }
