761529 - ssltunnel broken in non-proxy mode

Status: RESOLVED FIXED

(Testing :: General, defect)

Description

[Honza Bambas (:mayhemer)]

Attachment: v1

Reporting in xpcshell since this touches it.

Bug 572570 broke ssltunnel non-proxy mode by preventing an ssl update on the client socket.  So, ssl trafic is forwarded to the target server (httpd.js).

This is a simple patch that fixes that, while preserving websocket tests (@content/base/tests) functional.

Next time please let ssltunnel changes pass also through me, thanks.

Comment 1

[Jonathan Griffin (:jgriffin)]

Comment on attachment 630108 [details] [diff] [review]
v1

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

Thanks, and sorry for the bustage.

Comment 2

[Honza Bambas (:mayhemer)]

This is a try build, for ref: https://tbpl.mozilla.org/?tree=Try&rev=b96a4d3b0b9c

Comment 3

[Honza Bambas (:mayhemer)]

Comment on attachment 630108 [details] [diff] [review]
v1

https://hg.mozilla.org/integration/mozilla-inbound/rev/c93e04192c57

Comment 4

[Graeme McCutcheon [:graememcc]]

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

(Merged by Ed Morley)

Comment 5

[Honza Bambas (:mayhemer)]

Comment on attachment 630108 [details] [diff] [review]
v1

http://hg.mozilla.org/mozilla-central/rev/c93e04192c57