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

Issue 8156001: net: rework the NPN patch. (Closed)

Created:
9 years, 2 months ago by agl
Modified:
9 years, 1 month ago
CC:
chromium-reviews, cbentzel+watch_chromium.org, eroman, darin-cc_chromium.org, mmenke, Paweł Hajdan Jr.
Visibility:
Public.

Description

net: rework the NPN patch. This change moves the protocol selection logic out of NSS and into Chromium code. This allows some things to be a little cleaner (no more wire-encoded NPN strings) and also allows for some tricks that we have been considering for SPDY+WebSockets. As a consequence of this change, next protocols are now a std::vector<std::string> rather than an encoded char* BUG=none TEST=SPDY still works with Google sites. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106093

Patch Set 1 #

Patch Set 2 : ... #

Total comments: 12

Patch Set 3 : ... #

Total comments: 20

Patch Set 4 : ... #

Patch Set 5 : ... #

Total comments: 22

Patch Set 6 : ... #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+505 lines, -293 lines) Patch
M chrome/browser/net/preconnect.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/ui/webui/net_internals_ui.cc View 1 2 3 1 chunk +7 lines, -4 lines 0 comments Download
M net/base/ssl_config_service.h View 1 2 3 1 chunk +6 lines, -6 lines 0 comments Download
M net/http/http_network_layer.cc View 1 2 3 2 chunks +13 lines, -15 lines 0 comments Download
M net/http/http_network_transaction.cc View 1 2 3 1 chunk +2 lines, -2 lines 0 comments Download
M net/http/http_network_transaction_unittest.cc View 1 2 3 22 chunks +51 lines, -26 lines 0 comments Download
M net/http/http_stream_factory.h View 1 2 3 4 chunks +14 lines, -7 lines 0 comments Download
M net/http/http_stream_factory.cc View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M net/socket/ssl_client_socket_nss.h View 1 2 3 2 chunks +11 lines, -0 lines 0 comments Download
M net/socket/ssl_client_socket_nss.cc View 1 2 3 4 5 4 chunks +58 lines, -37 lines 0 comments Download
M net/spdy/spdy_network_transaction_unittest.cc View 1 2 3 3 chunks +8 lines, -7 lines 0 comments Download
M net/third_party/nss/patches/nextproto.patch View 1 2 3 4 5 14 chunks +189 lines, -119 lines 0 comments Download
M net/third_party/nss/ssl/ssl.h View 1 2 3 4 5 1 chunk +42 lines, -3 lines 0 comments Download
M net/third_party/nss/ssl/ssl3con.c View 1 chunk +1 line, -1 line 0 comments Download
M net/third_party/nss/ssl/ssl3ext.c View 1 2 3 3 chunks +20 lines, -38 lines 0 comments Download
M net/third_party/nss/ssl/sslerr.h View 1 2 3 4 5 1 chunk +1 line, -0 lines 0 comments Download
M net/third_party/nss/ssl/sslimpl.h View 1 2 3 4 chunks +7 lines, -10 lines 0 comments Download
M net/third_party/nss/ssl/sslsock.c View 1 2 3 4 5 3 chunks +72 lines, -15 lines 1 comment Download

Messages

Total messages: 12 (0 generated)
agl
9 years, 2 months ago (2011-10-05 20:15:39 UTC) #1
wtc
Review comments on Patch Set 2. I went through the CL quickly, so I'd like ...
9 years, 2 months ago (2011-10-05 23:34:25 UTC) #2
agl
http://codereview.chromium.org/8156001/diff/1001/chrome/browser/ui/webui/net_internals_ui.cc File chrome/browser/ui/webui/net_internals_ui.cc (right): http://codereview.chromium.org/8156001/diff/1001/chrome/browser/ui/webui/net_internals_ui.cc#newcode1208 chrome/browser/ui/webui/net_internals_ui.cc:1208: } Yes http://codereview.chromium.org/8156001/diff/1001/net/socket/ssl_client_socket_nss.cc File net/socket/ssl_client_socket_nss.cc (right): http://codereview.chromium.org/8156001/diff/1001/net/socket/ssl_client_socket_nss.cc#newcode2539 net/socket/ssl_client_socket_nss.cc:2539: } ...
9 years, 2 months ago (2011-10-07 19:19:17 UTC) #3
wtc
agl: let me respond to your comments first. I will review Patch Set 3 next. ...
9 years, 2 months ago (2011-10-11 22:27:57 UTC) #4
wtc
Patch Set 3 LGTM. BUT, I strongly prefer that NSS has default NPN selection code ...
9 years, 2 months ago (2011-10-11 23:43:04 UTC) #5
wtc
I'd like to repeat my previous suggestion for the CL's commit message: It'd be nice ...
9 years, 2 months ago (2011-10-11 23:45:50 UTC) #6
agl
PTAL. The only substantive changes are that I've reintroduced the old functions to NSS, which ...
9 years, 2 months ago (2011-10-17 17:37:24 UTC) #7
wtc
Patch Set 5 LGTM! I remember I sent my review comments earlier today, but they're ...
9 years, 2 months ago (2011-10-18 00:58:08 UTC) #8
agl
Thanks! Throwing the commit switch. http://codereview.chromium.org/8156001/diff/34001/net/socket/ssl_client_socket_nss.cc File net/socket/ssl_client_socket_nss.cc (right): http://codereview.chromium.org/8156001/diff/34001/net/socket/ssl_client_socket_nss.cc#newcode2505 net/socket/ssl_client_socket_nss.cc:2505: unsigned int* proto_out_len) { ...
9 years, 2 months ago (2011-10-18 16:44:43 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/agl@chromium.org/8156001/43001
9 years, 2 months ago (2011-10-18 16:45:18 UTC) #10
commit-bot: I haz the power
Change committed as 106093
9 years, 2 months ago (2011-10-18 18:56:36 UTC) #11
wtc
9 years, 1 month ago (2011-10-28 02:06:26 UTC) #12
agl: while inspecting the about:net-internals logs, I found
that SSL_SetNextProtoCallback always fails with the -5998
error (PR_WOULD_BLOCK_ERROR).  It turns out to be a missing
return statement.  (Brian Smith also found this bug in his
code review.)

Could you fix this (since I don't know how to regenerate the
patch)?  Thanks.

http://codereview.chromium.org/8156001/diff/43001/net/third_party/nss/ssl/ssl...
File net/third_party/nss/ssl/sslsock.c (right):

http://codereview.chromium.org/8156001/diff/43001/net/third_party/nss/ssl/ssl...
net/third_party/nss/ssl/sslsock.c:1328: ssl_ReleaseSSL3HandshakeLock(ss);

BUG: we need to return SECSuccess at the end of this function.

Powered by Google App Engine
This is Rietveld 408576698