Bug 1063703: Assume ws if websocket is true.

[merge]