767506 - Select proper proxy caps for non-SSL CONNECT

Status: RESOLVED INCOMPLETE

(Core :: Networking: HTTP, defect)

Description

[Jason Duell]

Attachment: v1: fix proxy capabilities logic for non-SSL CONNECT

Not sure how much difference this makes: AFAICT mProxyCapabilities/mCapabilities are generally set to the same values.  Maybe Honza knows...

Comment 1

[Patrick McManus [:mcmanus]]

Comment on attachment 635848 [details] [diff] [review]
v1: fix proxy capabilities logic for non-SSL CONNECT

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

This makes sense to me, but I'd rather honza r? it

Comment 2

[Honza Bambas (:mayhemer)]

Comment on attachment 635848 [details] [diff] [review]
v1: fix proxy capabilities logic for non-SSL CONNECT

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

This seems to be OK.

r=honzab

::: netwerk/protocol/http/nsHttpHandler.cpp
@@ +1434,5 @@
> +    bool usingConnect = false;
> +    if (proxyInfo) {
> +        usingConnect = https;   // SSL always uses CONNECT
> +        PRUint32 resolveFlags = 0;
> +        if (NS_SUCCEEDED(proxyInfo->GetResolveFlags(&resolveFlags)) &&

Maybe don't do this when usingConnect is already true?

BTW, this effectively copies the code from nsHttpConnectionInfo ctor.  Would be nice to have this decision only on one place.  But up to you.

Comment 3

[Jason Duell]

Attachment: v2: fixes nits

fixes Honza's nits.

Comment 4

[Jason Duell]

https://hg.mozilla.org/integration/mozilla-inbound/rev/38cfb0413e04

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Unfortunately, this had to be backed out due to causing perma-orange in the websockets tests on all platforms. (Note that there are intermittent failures with the same signature, so be careful on Try when testing a new fix).
https://hg.mozilla.org/integration/mozilla-inbound/rev/d7aa6473ce02

Example log:
https://tbpl.mozilla.org/php/getParsedLog.php?id=13175732&tree=Mozilla-Inbound