1046915 - Advertise latest h2-draft as "h2" as well

Status: RESOLVED FIXED

(Core :: Networking: HTTP, defect)

Description

[u408661]

This should be prefable, enabled by default on EARLY_BETA_OR_EARLIER and otherwise disabled by default. We would advertise both versions, so "h2-14" and "h2"

Comment 1

[u408661]

Attachment: patch

Here's a patch. The only really ugly bit is setting the X-Firefox-Spdy header to the token we negotiated (instead of always setting it to one or the other). Not totally necessary, but I thought it was a nice touch to be able to debug/see what token we negotiated. Tested negotiating "h2" with a node-spdy server configured to advertise h2 instead of h2-14.

And yes, before anyone asks, I tested with twitter (and it still negotiates h2-14 just fine) :)

Comment 2

[Patrick McManus [:mcmanus]]

I'm keeping this one in my back pocket until ff35 :)

Comment 3

[Patrick McManus [:mcmanus]]

Comment on attachment 8472477 [details] [diff] [review]
patch

Review of attachment 8472477 [details] [diff] [review]:
-----------------------------------------------------------------

I think we should land this off, so that as the various bits of LC proceed we can just flip pref bits based on our confidence

::: modules/libpref/init/all.js
@@ +1137,5 @@
>  pref("network.http.spdy.enabled.v3", true);
>  pref("network.http.spdy.enabled.v3-1", true);
>  pref("network.http.spdy.enabled.http2draft", true);
> +#ifdef EARLY_BETA_OR_EARLIER
> +pref("network.http.spdy.enabled.http2", true);

let's just change this to false, false

::: netwerk/protocol/http/ASpdySession.cpp
@@ +77,5 @@
>    VersionString[1] = NS_LITERAL_CSTRING("spdy/3.1");
>  
>    Version[2] = NS_HTTP2_DRAFT_VERSION;
>    VersionString[2] = NS_LITERAL_CSTRING(NS_HTTP2_DRAFT_TOKEN);
> +

make h2-14 [3] and h2 [2], so that h2-14 is preferred

Comment 4

[u408661]

try's good: https://tbpl.mozilla.org/?tree=Try&rev=78f24affbe1c

remote:   https://hg.mozilla.org/integration/mozilla-inbound/rev/f7a1b71b0a57

Comment 5

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/f7a1b71b0a57