Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Issue 9185036: Handle Z_BUF_ERROR as a non-fatal error while incrementally decompressing (Closed)

Created:
8 years, 11 months ago by ramant (doing other things)
Modified:
8 years, 11 months ago
CC:
chromium-reviews, cbentzel+watch_chromium.org, darin-cc_chromium.org
Visibility:
Public.

Description

Handle Z_BUF_ERROR as a non-fatal error while incrementally decompressing SYN_STREAM/SYN_REPLY headers. This also fixes bug when server sends SYN_REPLY in separate chunks (i.e. header + zlib chunks ) chrome fails to recognize it. BUG=108596 R=jar TEST=ASAN tests and network unit tests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=117563

Patch Set 1 #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+2 lines, -4 lines) Patch
M net/spdy/spdy_framer.cc View 1 chunk +1 line, -1 line 2 comments Download
M net/spdy/spdy_framer_test.cc View 1 chunk +1 line, -3 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
ramant (doing other things)
Hi Jim, Added the changes from spdy_framer server code to handle zlib's Z_BUF_ERROR. With this ...
8 years, 11 months ago (2012-01-12 01:13:36 UTC) #1
ramant (doing other things)
8 years, 11 months ago (2012-01-12 23:07:08 UTC) #2
jar (doing other things)
lgtm
8 years, 11 months ago (2012-01-12 23:11:22 UTC) #3
wtc
LGTM. http://codereview.chromium.org/9185036/diff/1/net/spdy/spdy_framer.cc File net/spdy/spdy_framer.cc (right): http://codereview.chromium.org/9185036/diff/1/net/spdy/spdy_framer.cc#newcode1529 net/spdy/spdy_framer.cc:1529: if (rv != Z_OK && rv != Z_BUF_ERROR) ...
8 years, 11 months ago (2012-01-12 23:49:38 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rtenneti@chromium.org/9185036/1
8 years, 11 months ago (2012-01-13 00:13:36 UTC) #5
ramant (doing other things)
8 years, 11 months ago (2012-01-13 00:14:58 UTC) #6
http://codereview.chromium.org/9185036/diff/1/net/spdy/spdy_framer.cc
File net/spdy/spdy_framer.cc (right):

http://codereview.chromium.org/9185036/diff/1/net/spdy/spdy_framer.cc#newcode...
net/spdy/spdy_framer.cc:1529: if (rv != Z_OK && rv != Z_BUF_ERROR) {
On 2012/01/12 23:49:38, wtc wrote:
> 
> Z_BUF_ERROR means "no progress is possible".  With that
> knowledge, we may be able to do something simpler.

Wan-Teh and I had stepped through the code and we are satisfied with the fix. It
exits the function because decomp->avail_in is zero.

Will discuss with server group if we could rearrange this code so that it is
more readable.

Done.

Powered by Google App Engine
This is Rietveld 408576698