Changeset 56511 in webkit
- Timestamp:
- Mar 25, 2010 1:38:57 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r56506 r56511 1 2010-03-25 Fumitoshi Ukai <ukai@chromium.org> 2 3 Reviewed by Eric Seidel. 4 5 [Qt] websocket/tests/long-invalid-header.html fails 6 https://bugs.webkit.org/show_bug.cgi?id=36492 7 8 * websocket/tests/long-invalid-header-expected.txt: trim console message. 9 1 10 2010-03-25 Kinuko Yasuda <kinuko@chromium.org> 2 11 -
trunk/LayoutTests/websocket/tests/long-invalid-header-expected.txt
r56380 r56511 1 CONSOLE MESSAGE: line 0: Bad Upgrade header: pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp1 CONSOLE MESSAGE: line 0: Bad Upgrade header: pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp... 2 2 Make sure WebSocket gives errors on long invalid upgrade header. 3 3 -
trunk/WebCore/ChangeLog
r56507 r56511 1 2010-03-25 Fumitoshi Ukai <ukai@chromium.org> 2 3 Reviewed by Eric Seidel. 4 5 [Qt] websocket/tests/long-invalid-header.html fails 6 https://bugs.webkit.org/show_bug.cgi?id=36492 7 8 trim message at most 128 bytes from the current position. 9 I believe it's enough data to investigate the error reason and 10 it makes test not depend on buffered size. 11 12 * websockets/WebSocketHandshake.cpp: 13 (WebCore::trimConsoleMessage): 14 (WebCore::WebSocketHandshake::readServerHandshake): 15 (WebCore::WebSocketHandshake::readHTTPHeaders): 16 1 17 2010-03-24 Jon Honeycutt <jhoneycutt@apple.com> 2 18 -
trunk/WebCore/websockets/WebSocketHandshake.cpp
r56380 r56511 88 88 } 89 89 90 static String trimConsoleMessage(const char* p, size_t len) 91 { 92 String s = String(p, std::min<size_t>(len, 128)); 93 if (len > 128) 94 s += "..."; 95 return s; 96 } 97 90 98 WebSocketHandshake::WebSocketHandshake(const KURL& url, const String& protocol, ScriptExecutionContext* context) 91 99 : m_url(url) … … 239 247 const String& code = extractResponseCode(header, len); 240 248 if (code.isNull()) { 241 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Short server handshake: " + String(header, len), 0, clientOrigin());249 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Short server handshake: " + trimConsoleMessage(header, len), 0, clientOrigin()); 242 250 return -1; 243 251 } 244 252 if (code.isEmpty()) { 245 253 m_mode = Failed; 246 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "No response code found: " + String(header, len), 0, clientOrigin());254 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "No response code found: " + trimConsoleMessage(header, len), 0, clientOrigin()); 247 255 return len; 248 256 } … … 269 277 if (memcmp(p, webSocketUpgradeHeader, sizeof(webSocketUpgradeHeader) - 1)) { 270 278 m_mode = Failed; 271 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Bad Upgrade header: " + String(p, end - p), 0, clientOrigin());279 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Bad Upgrade header: " + trimConsoleMessage(p, end - p), 0, clientOrigin()); 272 280 return p - header + sizeof(webSocketUpgradeHeader) - 1; 273 281 } … … 281 289 if (memcmp(p, webSocketConnectionHeader, sizeof(webSocketConnectionHeader) - 1)) { 282 290 m_mode = Failed; 283 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Bad Connection header: " + String(p, end - p), 0, clientOrigin());291 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Bad Connection header: " + trimConsoleMessage(p, end - p), 0, clientOrigin()); 284 292 return p - header + sizeof(webSocketConnectionHeader) - 1; 285 293 } … … 392 400 if (p + 1 < end && *(p + 1) == '\n') 393 401 return p + 2; 394 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "CR doesn't follow LF at " + String(p, end - p), 0, clientOrigin());402 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "CR doesn't follow LF at " + trimConsoleMessage(p, end - p), 0, clientOrigin()); 395 403 return 0; 396 404 } 397 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Unexpected CR in name at " + String(p, end - p), 0, clientOrigin());405 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Unexpected CR in name at " + trimConsoleMessage(p, end - p), 0, clientOrigin()); 398 406 return 0; 399 407 case '\n': 400 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Unexpected LF in name at " + String(p, end - p), 0, clientOrigin());408 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Unexpected LF in name at " + trimConsoleMessage(p, end - p), 0, clientOrigin()); 401 409 return 0; 402 410 case ':': … … 422 430 break; 423 431 case '\n': 424 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Unexpected LF in value at " + String(p, end - p), 0, clientOrigin());432 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Unexpected LF in value at " + trimConsoleMessage(p, end - p), 0, clientOrigin()); 425 433 return 0; 426 434 default: … … 433 441 } 434 442 if (p >= end || *p != '\n') { 435 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "CR doesn't follow LF after value at " + String(p, end - p), 0, clientOrigin());443 m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "CR doesn't follow LF after value at " + trimConsoleMessage(p, end - p), 0, clientOrigin()); 436 444 return 0; 437 445 }
Note: See TracChangeset
for help on using the changeset viewer.