Skip to content

Commit c75604e

Browse files
imcarolwangimcarolwang
committed
Change WebSocket handshake implementation to align with the .NET approach.
1 parent c10c34d commit c75604e

16 files changed

+706
-59
lines changed

‎src/System.ServiceModel.Http/src/Resources/Strings.resx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,4 +363,19 @@
363363
<data name="WebSocketInvalidProtocolNotInClientList" xml:space="preserve">
364364
<value>The subprotocol '{0}' was not requested by the client. The client requested the following subprotocol(s): '{1}'.</value>
365365
</data>
366+
<data name="net_WebSockets_AcceptUnsupportedProtocol" xml:space="preserve">
367+
<value>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</value>
368+
</data>
369+
<data name="net_webstatus_ConnectFailure" xml:space="preserve">
370+
<value>Unable to connect to the remote server</value>
371+
</data>
372+
<data name="net_WebSockets_ConnectStatusExpected" xml:space="preserve">
373+
<value>The server returned status code '{0}' when status code '{1}' was expected.</value>
374+
</data>
375+
<data name="net_WebSockets_MissingResponseHeader" xml:space="preserve">
376+
<value>The server's response was missing the required header '{0}'.</value>
377+
</data>
378+
<data name="net_WebSockets_InvalidResponseHeader" xml:space="preserve">
379+
<value>The '{0}' header value '{1}' is invalid.</value>
380+
</data>
366381
</root>

‎src/System.ServiceModel.Http/src/Resources/xlf/Strings.cs.xlf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,31 @@
412412
<target state="translated">Server nepřijal žádost o připojení. Verze protokolu WebSocket na straně klienta se pravděpodobně neshoduje s nastavením na straně serveru ({0}).</target>
413413
<note />
414414
</trans-unit>
415+
<trans-unit id="net_WebSockets_AcceptUnsupportedProtocol">
416+
<source>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</source>
417+
<target state="new">The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="net_WebSockets_ConnectStatusExpected">
421+
<source>The server returned status code '{0}' when status code '{1}' was expected.</source>
422+
<target state="new">The server returned status code '{0}' when status code '{1}' was expected.</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="net_WebSockets_InvalidResponseHeader">
426+
<source>The '{0}' header value '{1}' is invalid.</source>
427+
<target state="new">The '{0}' header value '{1}' is invalid.</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="net_WebSockets_MissingResponseHeader">
431+
<source>The server's response was missing the required header '{0}'.</source>
432+
<target state="new">The server's response was missing the required header '{0}'.</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="net_webstatus_ConnectFailure">
436+
<source>Unable to connect to the remote server</source>
437+
<target state="new">Unable to connect to the remote server</target>
438+
<note />
439+
</trans-unit>
415440
</body>
416441
</file>
417442
</xliff>

‎src/System.ServiceModel.Http/src/Resources/xlf/Strings.de.xlf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,31 @@
412412
<target state="translated">Der Server hat die Verbindungsanforderung nicht akzeptiert. Möglicherweise stimmt die Version des WebSocket-Protokolls auf dem Client nicht mit der auf dem Server ("{0}") überein.</target>
413413
<note />
414414
</trans-unit>
415+
<trans-unit id="net_WebSockets_AcceptUnsupportedProtocol">
416+
<source>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</source>
417+
<target state="new">The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="net_WebSockets_ConnectStatusExpected">
421+
<source>The server returned status code '{0}' when status code '{1}' was expected.</source>
422+
<target state="new">The server returned status code '{0}' when status code '{1}' was expected.</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="net_WebSockets_InvalidResponseHeader">
426+
<source>The '{0}' header value '{1}' is invalid.</source>
427+
<target state="new">The '{0}' header value '{1}' is invalid.</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="net_WebSockets_MissingResponseHeader">
431+
<source>The server's response was missing the required header '{0}'.</source>
432+
<target state="new">The server's response was missing the required header '{0}'.</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="net_webstatus_ConnectFailure">
436+
<source>Unable to connect to the remote server</source>
437+
<target state="new">Unable to connect to the remote server</target>
438+
<note />
439+
</trans-unit>
415440
</body>
416441
</file>
417442
</xliff>

‎src/System.ServiceModel.Http/src/Resources/xlf/Strings.es.xlf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,31 @@
412412
<target state="translated">El servidor no aceptó la solicitud de conexión. Es posible que la versión del subprotocolo WebSocket de su cliente no coincida con el del servidor ("{0}").</target>
413413
<note />
414414
</trans-unit>
415+
<trans-unit id="net_WebSockets_AcceptUnsupportedProtocol">
416+
<source>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</source>
417+
<target state="new">The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="net_WebSockets_ConnectStatusExpected">
421+
<source>The server returned status code '{0}' when status code '{1}' was expected.</source>
422+
<target state="new">The server returned status code '{0}' when status code '{1}' was expected.</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="net_WebSockets_InvalidResponseHeader">
426+
<source>The '{0}' header value '{1}' is invalid.</source>
427+
<target state="new">The '{0}' header value '{1}' is invalid.</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="net_WebSockets_MissingResponseHeader">
431+
<source>The server's response was missing the required header '{0}'.</source>
432+
<target state="new">The server's response was missing the required header '{0}'.</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="net_webstatus_ConnectFailure">
436+
<source>Unable to connect to the remote server</source>
437+
<target state="new">Unable to connect to the remote server</target>
438+
<note />
439+
</trans-unit>
415440
</body>
416441
</file>
417442
</xliff>

‎src/System.ServiceModel.Http/src/Resources/xlf/Strings.fr.xlf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,31 @@
412412
<target state="translated">Le serveur a refusé la demande de connexion. Il est possible que la version du protocole WebSocket sur votre client ne corresponde pas à la version située sur le serveur ('{0}').</target>
413413
<note />
414414
</trans-unit>
415+
<trans-unit id="net_WebSockets_AcceptUnsupportedProtocol">
416+
<source>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</source>
417+
<target state="new">The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="net_WebSockets_ConnectStatusExpected">
421+
<source>The server returned status code '{0}' when status code '{1}' was expected.</source>
422+
<target state="new">The server returned status code '{0}' when status code '{1}' was expected.</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="net_WebSockets_InvalidResponseHeader">
426+
<source>The '{0}' header value '{1}' is invalid.</source>
427+
<target state="new">The '{0}' header value '{1}' is invalid.</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="net_WebSockets_MissingResponseHeader">
431+
<source>The server's response was missing the required header '{0}'.</source>
432+
<target state="new">The server's response was missing the required header '{0}'.</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="net_webstatus_ConnectFailure">
436+
<source>Unable to connect to the remote server</source>
437+
<target state="new">Unable to connect to the remote server</target>
438+
<note />
439+
</trans-unit>
415440
</body>
416441
</file>
417442
</xliff>

‎src/System.ServiceModel.Http/src/Resources/xlf/Strings.it.xlf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,31 @@
412412
<target state="translated">Il server non ha accettato la richiesta di connessione. È possibile che la versione del protocollo WebSocket nel client non corrisponda a quella nel server ('{0}').</target>
413413
<note />
414414
</trans-unit>
415+
<trans-unit id="net_WebSockets_AcceptUnsupportedProtocol">
416+
<source>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</source>
417+
<target state="new">The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="net_WebSockets_ConnectStatusExpected">
421+
<source>The server returned status code '{0}' when status code '{1}' was expected.</source>
422+
<target state="new">The server returned status code '{0}' when status code '{1}' was expected.</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="net_WebSockets_InvalidResponseHeader">
426+
<source>The '{0}' header value '{1}' is invalid.</source>
427+
<target state="new">The '{0}' header value '{1}' is invalid.</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="net_WebSockets_MissingResponseHeader">
431+
<source>The server's response was missing the required header '{0}'.</source>
432+
<target state="new">The server's response was missing the required header '{0}'.</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="net_webstatus_ConnectFailure">
436+
<source>Unable to connect to the remote server</source>
437+
<target state="new">Unable to connect to the remote server</target>
438+
<note />
439+
</trans-unit>
415440
</body>
416441
</file>
417442
</xliff>

‎src/System.ServiceModel.Http/src/Resources/xlf/Strings.ja.xlf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,31 @@
412412
<target state="translated">サーバーが接続要求を受け入れませんでした。クライアントの WebSocket プロトコルのバージョンが、サーバー ('{0}') のものと一致していない可能性があります。</target>
413413
<note />
414414
</trans-unit>
415+
<trans-unit id="net_WebSockets_AcceptUnsupportedProtocol">
416+
<source>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</source>
417+
<target state="new">The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="net_WebSockets_ConnectStatusExpected">
421+
<source>The server returned status code '{0}' when status code '{1}' was expected.</source>
422+
<target state="new">The server returned status code '{0}' when status code '{1}' was expected.</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="net_WebSockets_InvalidResponseHeader">
426+
<source>The '{0}' header value '{1}' is invalid.</source>
427+
<target state="new">The '{0}' header value '{1}' is invalid.</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="net_WebSockets_MissingResponseHeader">
431+
<source>The server's response was missing the required header '{0}'.</source>
432+
<target state="new">The server's response was missing the required header '{0}'.</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="net_webstatus_ConnectFailure">
436+
<source>Unable to connect to the remote server</source>
437+
<target state="new">Unable to connect to the remote server</target>
438+
<note />
439+
</trans-unit>
415440
</body>
416441
</file>
417442
</xliff>

‎src/System.ServiceModel.Http/src/Resources/xlf/Strings.ko.xlf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,31 @@
412412
<target state="translated">서버에서 연결 요청을 수락하지 않았습니다. 클라이언트의 WebSocket 프로토콜 버전이 서버의 프로토콜 버전('{0}')과 일치하지 않을 수 있습니다.</target>
413413
<note />
414414
</trans-unit>
415+
<trans-unit id="net_WebSockets_AcceptUnsupportedProtocol">
416+
<source>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</source>
417+
<target state="new">The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="net_WebSockets_ConnectStatusExpected">
421+
<source>The server returned status code '{0}' when status code '{1}' was expected.</source>
422+
<target state="new">The server returned status code '{0}' when status code '{1}' was expected.</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="net_WebSockets_InvalidResponseHeader">
426+
<source>The '{0}' header value '{1}' is invalid.</source>
427+
<target state="new">The '{0}' header value '{1}' is invalid.</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="net_WebSockets_MissingResponseHeader">
431+
<source>The server's response was missing the required header '{0}'.</source>
432+
<target state="new">The server's response was missing the required header '{0}'.</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="net_webstatus_ConnectFailure">
436+
<source>Unable to connect to the remote server</source>
437+
<target state="new">Unable to connect to the remote server</target>
438+
<note />
439+
</trans-unit>
415440
</body>
416441
</file>
417442
</xliff>

‎src/System.ServiceModel.Http/src/Resources/xlf/Strings.pl.xlf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,31 @@
412412
<target state="translated">Serwer nie zaakceptował żądania połączenia. Być może wersja protokołu WebSocket używana przez klienta jest niezgodna z wersją używaną przez serwer („{0}”).</target>
413413
<note />
414414
</trans-unit>
415+
<trans-unit id="net_WebSockets_AcceptUnsupportedProtocol">
416+
<source>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</source>
417+
<target state="new">The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="net_WebSockets_ConnectStatusExpected">
421+
<source>The server returned status code '{0}' when status code '{1}' was expected.</source>
422+
<target state="new">The server returned status code '{0}' when status code '{1}' was expected.</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="net_WebSockets_InvalidResponseHeader">
426+
<source>The '{0}' header value '{1}' is invalid.</source>
427+
<target state="new">The '{0}' header value '{1}' is invalid.</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="net_WebSockets_MissingResponseHeader">
431+
<source>The server's response was missing the required header '{0}'.</source>
432+
<target state="new">The server's response was missing the required header '{0}'.</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="net_webstatus_ConnectFailure">
436+
<source>Unable to connect to the remote server</source>
437+
<target state="new">Unable to connect to the remote server</target>
438+
<note />
439+
</trans-unit>
415440
</body>
416441
</file>
417442
</xliff>

‎src/System.ServiceModel.Http/src/Resources/xlf/Strings.pt-BR.xlf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,31 @@
412412
<target state="translated">O servidor não aceitou a solicitação de conexão. É possível que a versão do protocolo WebSocket no cliente não corresponda à versão no servidor ('{0}').</target>
413413
<note />
414414
</trans-unit>
415+
<trans-unit id="net_WebSockets_AcceptUnsupportedProtocol">
416+
<source>The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</source>
417+
<target state="new">The WebSocket client request requested '{0}' protocol(s), but server is only accepting '{1}' protocol(s).</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="net_WebSockets_ConnectStatusExpected">
421+
<source>The server returned status code '{0}' when status code '{1}' was expected.</source>
422+
<target state="new">The server returned status code '{0}' when status code '{1}' was expected.</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="net_WebSockets_InvalidResponseHeader">
426+
<source>The '{0}' header value '{1}' is invalid.</source>
427+
<target state="new">The '{0}' header value '{1}' is invalid.</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="net_WebSockets_MissingResponseHeader">
431+
<source>The server's response was missing the required header '{0}'.</source>
432+
<target state="new">The server's response was missing the required header '{0}'.</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="net_webstatus_ConnectFailure">
436+
<source>Unable to connect to the remote server</source>
437+
<target state="new">Unable to connect to the remote server</target>
438+
<note />
439+
</trans-unit>
415440
</body>
416441
</file>
417442
</xliff>

0 commit comments

Comments
 (0)