60880 2011-05-16 04:01:18 -0700 WebSocket: WebSocketHandshake prints a carriage return to console 2011-05-17 01:10:11 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 60878 1 yutak yutak ap tkent oldest_to_newest 404405 0 yutak 2011-05-16 04:01:18 -0700 LayoutTest/http/tests/websocket/tests/handshake-error-expected.txt contains a carriage return in the first line. This caused svn-apply to fail (see bug 60878). This situation happened because of a bug in WebSocketHandshake; it prints a carriage return to console if status line is broken. Let's fix this. 404411 1 93634 yutak 2011-05-16 04:25:28 -0700 Created attachment 93634 Patch 404413 2 93634 yutak 2011-05-16 04:33:14 -0700 Comment on attachment 93634 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93634&action=review > LayoutTests/http/tests/websocket/tests/handshake-error-expected.txt:1 > +CONSOLE MESSAGE: line 0: No response code found: ThisWillCauseHandshakeError This hunk removes a carriage return at the end of line. EWS bots do not seem happy about this part, so I may have to commit this patch manually. 404870 3 93634 tkent 2011-05-16 18:11:05 -0700 Comment on attachment 93634 Patch ok 404972 4 yutak 2011-05-17 01:10:11 -0700 Manually committed r86659. 93634 2011-05-16 04:25:28 -0700 2011-05-16 18:11:05 -0700 Patch bug-60880-20110516202526.patch text/plain 4087 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogODY1NTIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2ZTY4YWQ3M2UyZjEyNjQyZjQwMWZi ZmE3NWIxYjAwNmMwNTNmODdjLi4xMmUwMTdjMjU5N2M4Yzk3OGJhNjM3YzViNDVkMmRiZmRhZWI5 ZGI2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDUtMTYgIFl1dGEgS2l0YW11cmEgIDx5 dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViU29ja2V0OiBXZWJTb2NrZXRIYW5kc2hha2UgcHJpbnRzIGEgY2Fycmlh Z2UgcmV0dXJuIHRvIGNvbnNvbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTYwODgwCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0 cy9oYW5kc2hha2UtZXJyb3ItZXhwZWN0ZWQudHh0OgorICAgICAgICBSZW1vdmUgYSBjYXJyaWFn ZSByZXR1cm4gaW4gdGhlIGZpcnN0IGxpbmUuCisKIDIwMTEtMDUtMTYgIFJvYmVydCBIb2dhbiAg PHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRz a3kuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9o YW5kc2hha2UtZXJyb3ItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJz b2NrZXQvdGVzdHMvaGFuZHNoYWtlLWVycm9yLWV4cGVjdGVkLnR4dAppbmRleCBlN2RjY2ZiOWFj OWM5MDkxM2Y3NThjNWVjZjA3NDg5NGEzY2EyODgxLi5jZmEyY2U4MTQ2NDE4MjQxZTQyMTYwOWRm MjdhNDQyZmRiYmQ5MWQ3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNv Y2tldC90ZXN0cy9oYW5kc2hha2UtZXJyb3ItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2hhbmRzaGFrZS1lcnJvci1leHBlY3RlZC50eHQK QEAgLTEsNCArMSw0IEBACi1DT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogTm8gcmVzcG9uc2UgY29k ZSBmb3VuZDogVGhpc1dpbGxDYXVzZUhhbmRzaGFrZUVycm9yDQorQ09OU09MRSBNRVNTQUdFOiBs aW5lIDA6IE5vIHJlc3BvbnNlIGNvZGUgZm91bmQ6IFRoaXNXaWxsQ2F1c2VIYW5kc2hha2VFcnJv cgogSGFuZHNoYWtlIGVycm9yIHRlc3QKIAogT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2Vy aWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGZhNDA1Y2FjM2U0NDc1MWI3YjYwMDhlZjBjYTY1ZjUwZjRkOWU1ZmEuLmVmYzE3 YjQwMTk3M2Q5ZTc5OWM3NWFhN2Y0YWY5MWI1MTBiYzVkZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAxMS0wNS0xNiAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJTb2Nr ZXQ6IFdlYlNvY2tldEhhbmRzaGFrZSBwcmludHMgYSBjYXJyaWFnZSByZXR1cm4gdG8gY29uc29s ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA4ODAK KworICAgICAgICAqIHdlYnNvY2tldHMvV2ViU29ja2V0SGFuZHNoYWtlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OldlYlNvY2tldEhhbmRzaGFrZTo6cmVhZFN0YXR1c0xpbmUpOgorICAgICAgICBX ZWJTb2NrZXRIYW5kc2hha2Ugc2hvdWxkIG5vdCBwcmludCBhIGNhcnJpYWdlIHJldHVybiB0byBj b25zb2xlLiBUbyBmaXggdGhpcywKKyAgICAgICAgV2UgZmlyc3QgY2hlY2sgd2hldGhlciB0aGUg c3RhdHVzIGxpbmUgZW5kcyB3aXRoIENSTEYuIEFmdGVyIHRoYXQsCisgICAgICAgIHdlIGNhbiBw cmludCB0aGUgZmlyc3QgKGxpbmVMZW5ndGggLSAyKSBjaGFyYWN0ZXJzIG9mIHRoZSBzdGF0dXMg bGluZQorICAgICAgICB3aGljaCBkbyBub3QgY29udGFpbiBhIGNhcnJpYWdlIHJldHVybi4KKwog MjAxMS0wNS0wNSAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuY3BwIGIvU291cmNlL1dlYkNvcmUv d2Vic29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuY3BwCmluZGV4IDAxNjRmMmFmOGYyNmJmZGY0 ODdiOGUwZTg5MzRlODQwMThmZWYwYzQuLjdlZGVjZGJmNDZmMTI1MjEwMDc4MzljYWI2MDU1ODI4 MzMzMjA2NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0 SGFuZHNoYWtlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldEhh bmRzaGFrZS5jcHAKQEAgLTQ1MCwyMCArNDUwLDIwIEBAIGludCBXZWJTb2NrZXRIYW5kc2hha2U6 OnJlYWRTdGF0dXNMaW5lKGNvbnN0IGNoYXIqIGhlYWRlciwgc2l6ZV90IGhlYWRlckxlbmd0aCwK ICAgICAgICAgcmV0dXJuIC0xOyAvLyBXZSBoYXZlIG5vdCByZWNlaXZlZCAnXG4nIHlldC4KIAog ICAgIGNvbnN0IGNoYXIqIGVuZCA9IHAgKyAxOwotICAgIGlmIChlbmQgLSBoZWFkZXIgPiBtYXhp bXVtTGVuZ3RoKSB7CisgICAgaW50IGxpbmVMZW5ndGggPSBlbmQgLSBoZWFkZXI7CisgICAgaWYg KGxpbmVMZW5ndGggPiBtYXhpbXVtTGVuZ3RoKSB7CiAgICAgICAgIG1fY29udGV4dC0+YWRkTWVz c2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwg IlN0YXR1cyBsaW5lIGlzIHRvbyBsb25nIiwgMCwgY2xpZW50T3JpZ2luKCksIDApOwogICAgICAg ICByZXR1cm4gbWF4aW11bUxlbmd0aDsKICAgICB9Ci0gICAgaW50IGxpbmVMZW5ndGggPSBlbmQg LSBoZWFkZXI7CiAKLSAgICBpZiAoIXNwYWNlMSB8fCAhc3BhY2UyKSB7Ci0gICAgICAgIG1fY29u dGV4dC0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1l c3NhZ2VMZXZlbCwgIk5vIHJlc3BvbnNlIGNvZGUgZm91bmQ6ICIgKyB0cmltQ29uc29sZU1lc3Nh Z2UoaGVhZGVyLCBsaW5lTGVuZ3RoIC0gMSksIDAsIGNsaWVudE9yaWdpbigpLCAwKTsKKyAgICAv LyBUaGUgbGluZSBtdXN0IGVuZCB3aXRoICJcclxuIi4KKyAgICBpZiAobGluZUxlbmd0aCA8IDIg fHwgKihlbmQgLSAyKSAhPSAnXHInKSB7CisgICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShK U01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgIlN0YXR1 cyBsaW5lIGRvZXMgbm90IGVuZCB3aXRoIENSTEYiLCAwLCBjbGllbnRPcmlnaW4oKSwgMCk7CiAg ICAgICAgIHJldHVybiBsaW5lTGVuZ3RoOwogICAgIH0KIAotICAgIC8vIFRoZSBsaW5lIG11c3Qg ZW5kIHdpdGggIlxyXG4iLgotICAgIGlmICgqKGVuZCAtIDIpICE9ICdccicpIHsKLSAgICAgICAg bV9jb250ZXh0LT5hZGRNZXNzYWdlKEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVy cm9yTWVzc2FnZUxldmVsLCAiU3RhdHVzIGxpbmUgZG9lcyBub3QgZW5kIHdpdGggQ1JMRiIsIDAs IGNsaWVudE9yaWdpbigpLCAwKTsKKyAgICBpZiAoIXNwYWNlMSB8fCAhc3BhY2UyKSB7CisgICAg ICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBl LCBFcnJvck1lc3NhZ2VMZXZlbCwgIk5vIHJlc3BvbnNlIGNvZGUgZm91bmQ6ICIgKyB0cmltQ29u c29sZU1lc3NhZ2UoaGVhZGVyLCBsaW5lTGVuZ3RoIC0gMiksIDAsIGNsaWVudE9yaWdpbigpLCAw KTsKICAgICAgICAgcmV0dXJuIGxpbmVMZW5ndGg7CiAgICAgfQogCg==