Add more flexibility to the HTTP upgrade handshake