mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

backout 627d6b32976b so it can be re-merged with valid description

This commit is contained in:
Patrick McManus 2011-06-21 10:45:03 -04:00
Родитель c973256a9b
Коммит ce224ccb4c
1 изменённых файлов: 2 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
netwerk/protocol/websocket/nsWebSocketHandler.cpp
Просмотреть файл

@ -838,17 +838,6 @@ nsWebSocketHandler::ProcessInput(PRUint8 *buffer, PRUint32 count)
LOG(("WebSocketHandler:: text frame received\n"));
if (mListener) {
nsCString utf8Data((const char *)payload, payloadLength);
// section 8.1 says to replace received non utf-8 sequences
// (which are non-conformant to send) with u+fffd,
// but secteam feels that silently rewriting messages is
// inappropriate - so we will fail the connection instead.
if (!IsUTF8(utf8Data)) {
LOG(("WebSocketHandler:: text frame invalid utf-8\n"));
AbortSession(NS_ERROR_ILLEGAL_VALUE);
return NS_ERROR_ILLEGAL_VALUE;
}
nsCOMPtr<nsIRunnable> event =
new CallOnMessageAvailable(mListener, mContext,
utf8Data, -1);
@ -876,17 +865,6 @@ nsWebSocketHandler::ProcessInput(PRUint8 *buffer, PRUint32 count)
PRUint16 msglen = payloadLength - 2;
if (msglen > 0) {
nsCString utf8Data((const char *)payload + 2, msglen);
// section 8.1 says to replace received non utf-8 sequences
// (which are non-conformant to send) with u+fffd,
// but secteam feels that silently rewriting messages is
// inappropriate - so we will fail the connection instead.
if (!IsUTF8(utf8Data)) {
LOG(("WebSocketHandler:: close frame invalid utf-8\n"));
AbortSession(NS_ERROR_ILLEGAL_VALUE);
return NS_ERROR_ILLEGAL_VALUE;
}
LOG(("WebSocketHandler:: close msg %s\n",
utf8Data.get()));
}
@ -934,10 +912,10 @@ nsWebSocketHandler::ProcessInput(PRUint8 *buffer, PRUint32 count)
else if (opcode == kBinary) {
LOG(("WebSocketHandler:: binary frame received\n"));
if (mListener) {
nsCString binaryData((const char *)payload, payloadLength);
nsCString utf8Data((const char *)payload, payloadLength);
nsCOMPtr<nsIRunnable> event =
new CallOnMessageAvailable(mListener, mContext,
binaryData, payloadLength);
utf8Data, payloadLength);
NS_DispatchToMainThread(event);
}
}