72687 2011-11-17 21:11:18 -0800 [Qt] Enable WebSocket hybi tests 2011-11-18 21:00:04 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt P3 Normal --- 50099 1 yutak yutak hausmann ossy webkit.review.bot yael oldest_to_newest 505463 0 yutak 2011-11-17 21:11:18 -0800 Currently, WebKitQt only supports the old WebSocket protocol (hixie-76). The old protocol is known to have a security defect, and should be phased out into the new protocol. The new protocol (hybi-17) is already implemented in WebCore and we can switch to the new protocol using WebCore::Settings. In this bug, I'd like to: - Add an option to QWebSettings (which corresponds to one in WebCore::Settings), - Let LayoutTestControllerQt be able to switch WebSocket protocols (using overridePreference()), - Unskip WebSocket hybi tests. 505474 1 115735 yutak 2011-11-17 21:35:37 -0800 Created attachment 115735 Patch 505492 2 hausmann 2011-11-17 21:56:02 -0800 (In reply to comment #0) > Currently, WebKitQt only supports the old WebSocket protocol (hixie-76). The old protocol is known to have a security defect, and should be phased out into the new protocol. > > The new protocol (hybi-17) is already implemented in WebCore and we can switch to the new protocol using WebCore::Settings. In this bug, I'd like to: > - Add an option to QWebSettings (which corresponds to one in WebCore::Settings), > - Let LayoutTestControllerQt be able to switch WebSocket protocols (using overridePreference()), > - Unskip WebSocket hybi tests. QWebSettings is public API, and at that point I'm wondering: Do we want to expose the users of the API to the complexity of choosing the protocol version? Could we simply make the newer protocol the default? If we need to be able to test both with layout tests, then I think a helper function to toggle this could be added to DumpRenderTreeSupportQt. My guts feeling is that this change could be done without any addition to the public API. 505507 3 yutak 2011-11-17 22:18:04 -0800 (In reply to comment #2) > > QWebSettings is public API, and at that point I'm wondering: Do we want to expose the users of the API to the complexity of choosing the protocol version? Agreed, it shouldn't be exposed to public. Actually, in Apple's Mac/Win ports, this attribute is hidden in WebPreferencePrivate, so we should do the same in Qt port. > > Could we simply make the newer protocol the default? If we need to be able to test both with layout tests, then I think a helper function to toggle this could be added to DumpRenderTreeSupportQt. My guts feeling is that this change could be done without any addition to the public API. I'd like to make sure the tests are up and running first (actually I found test failures which need to be fixed before switching the default protocols). I didn't know DumpRenderTreeSupportQt; this seems like a perfect place to put functions that are needed to implement overridePreference(). I'd like to write another patch that implements overridePreference() without changing the public interface. 505508 4 115735 yutak 2011-11-17 22:19:04 -0800 Comment on attachment 115735 Patch I shouldn't have changed the public API. 505548 5 hausmann 2011-11-17 23:55:29 -0800 (In reply to comment #3) > (In reply to comment #2) > > > > QWebSettings is public API, and at that point I'm wondering: Do we want to expose the users of the API to the complexity of choosing the protocol version? > > Agreed, it shouldn't be exposed to public. Actually, in Apple's Mac/Win ports, this attribute is hidden in WebPreferencePrivate, so we should do the same in Qt port. > > > > > Could we simply make the newer protocol the default? If we need to be able to test both with layout tests, then I think a helper function to toggle this could be added to DumpRenderTreeSupportQt. My guts feeling is that this change could be done without any addition to the public API. > > I'd like to make sure the tests are up and running first (actually I found test failures which need to be fixed before switching the default protocols). > > I didn't know DumpRenderTreeSupportQt; this seems like a perfect place to put functions that are needed to implement overridePreference(). I'd like to write another patch that implements overridePreference() without changing the public interface. Sounds good. Thanks for taking the Qt port into account. Much appreciated! 505557 6 115752 yutak 2011-11-18 00:16:09 -0800 Created attachment 115752 Patch v2 (don't change public API) 505608 7 115752 hausmann 2011-11-18 01:58:30 -0800 Comment on attachment 115752 Patch v2 (don't change public API) r=me 505687 8 yutak 2011-11-18 04:54:25 -0800 Thanks! 505721 9 115752 webkit.review.bot 2011-11-18 06:00:50 -0800 Comment on attachment 115752 Patch v2 (don't change public API) Clearing flags on attachment: 115752 Committed r100763: <http://trac.webkit.org/changeset/100763> 505722 10 webkit.review.bot 2011-11-18 06:00:54 -0800 All reviewed patches have been landed. Closing bug. 505760 11 ossy 2011-11-18 07:06:15 -0800 One test in still broken: --- /ramdisk/qt-linux-release/build/layout-test-results/http/tests/websocket/tests/hybi/workers/close-code-and-reason-expected.txt +++ /ramdisk/qt-linux-release/build/layout-test-results/http/tests/websocket/tests/hybi/workers/close-code-and-reason-actual.txt @@ -3,10 +3,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -ws.onclose() was called. -PASS PASS: worker: event.wasClean is false -PASS PASS: worker: event.code is codeAbnormalClosure -PASS PASS: worker: event.reason is emptyString WebSocketTest.onopen() was called with testId = 0. WebSocketTest.onclose() was called with testId = 0. PASS PASS: worker: event.wasClean is true 506323 12 yutak 2011-11-18 21:00:04 -0800 Oops sorry, I'm going to skip that. It should be the same one as I mentioned in the Skipped file in this patch, and I'll investigate this failure sometime next week. 115735 2011-11-17 21:35:37 -0800 2011-11-18 00:16:03 -0800 Patch bug-72687-20111118143535.patch text/plain 6389 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDE1ZTEzNTJhOWI5 ZWYwYWI1YzlhZGZmN2IzMDI2ZDk1YWYwODViZjcuLjhlNzdhNGFjOGU3MDFmMjk3ZWNlMDI3NDEw YjQwNmIyZjgyZTAxMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTEt MTcgIFl1dGEgS2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW1F0XSBB ZGQgYW4gb3B0aW9uIHRvIHN3aXRjaCBXZWJTb2NrZXQgcHJvdG9jb2xzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjY4NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6 CisgICAgICAgIChRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSk6CisgICAgICAgIEFwcGx5IHRo ZSB2YWx1ZSBvZiBIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkIGF0dHJpYnV0ZSB0byBX ZWJDb3JlOjpTZXR0aW5ncy4KKyAgICAgICAgKFFXZWJTZXR0aW5nczo6UVdlYlNldHRpbmdzKToK KyAgICAgICAgU2V0IHRoZSBkZWZhdWx0IHZhbHVlIG9mIEhpeGllNzZXZWJTb2NrZXRQcm90b2Nv bEVuYWJsZWQgYXR0cmlidXRlIHRvIHRydWUsIHdoaWNoIG1lYW5zCisgICAgICAgIHRoZSBvbGQg aGl4aWU3NiBwcm90b2NvbCBpcyB1c2VkIGJ5IGRlZmF1bHQuCisgICAgICAgICogQXBpL3F3ZWJz ZXR0aW5ncy5oOgorICAgICAgICBEZWZpbmUgIkhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJs ZWQiIGF0dHJpYnV0ZS4KKwogMjAxMS0xMS0xNyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVz bWFubkBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBMYXllciB2aW9sYXRpb246IHF0X3J1bnRp bWUuY3BwIGFjY2Vzc2VzIFFXZWJFbGVtZW50IGFuZCBRVERSVE5vZGUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L0Fw aS9xd2Vic2V0dGluZ3MuY3BwCmluZGV4IDM0MzA5YjIzMjA2NDIwZTFjYTg5NDhmMTlhZmU3NTM5 Y2QwODlkYTQuLjMzYTI5YjcwZmExNjI2MmY4OWM2OTkxOWFlODYwNTE4YTY1NmZiM2EgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKKysrIGIvU291cmNl L1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcApAQCAtMjYxLDYgKzI2MSwxMiBAQCB2b2lk IFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5KCkKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZ2xvYmFsLT5hdHRyaWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6U2l0ZVNw ZWNpZmljUXVpcmtzRW5hYmxlZCkpOwogICAgICAgICBzZXR0aW5ncy0+c2V0TmVlZHNTaXRlU3Bl Y2lmaWNRdWlya3ModmFsdWUpOwogCisjaWYgRU5BQkxFKFdFQl9TT0NLRVRTKQorICAgICAgICB2 YWx1ZSA9IGF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRpbmdzOjpIaXhpZTc2V2ViU29ja2V0UHJv dG9jb2xFbmFibGVkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnbG9i YWwtPmF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRpbmdzOjpIaXhpZTc2V2ViU29ja2V0UHJvdG9j b2xFbmFibGVkKSk7CisgICAgICAgIHNldHRpbmdzLT5zZXRVc2VIaXhpZTc2V2ViU29ja2V0UHJv dG9jb2wodmFsdWUpOworI2VuZGlmCisKICAgICAgICAgc2V0dGluZ3MtPnNldFVzZXNQYWdlQ2Fj aGUoV2ViQ29yZTo6cGFnZUNhY2hlKCktPmNhcGFjaXR5KCkpOwogICAgIH0gZWxzZSB7CiAgICAg ICAgIFFMaXN0PFFXZWJTZXR0aW5nc1ByaXZhdGUqPiBzZXR0aW5ncyA9ICo6OmFsbFNldHRpbmdz KCk7CkBAIC01MTYsNiArNTIyLDcgQEAgUVdlYlNldHRpbmdzOjpRV2ViU2V0dGluZ3MoKQogICAg IGQtPmF0dHJpYnV0ZXMuaW5zZXJ0KFFXZWJTZXR0aW5nczo6VGlsZWRCYWNraW5nU3RvcmVFbmFi bGVkLCBmYWxzZSk7CiAgICAgZC0+YXR0cmlidXRlcy5pbnNlcnQoUVdlYlNldHRpbmdzOjpGcmFt ZUZsYXR0ZW5pbmdFbmFibGVkLCBmYWxzZSk7CiAgICAgZC0+YXR0cmlidXRlcy5pbnNlcnQoUVdl YlNldHRpbmdzOjpTaXRlU3BlY2lmaWNRdWlya3NFbmFibGVkLCB0cnVlKTsKKyAgICBkLT5hdHRy aWJ1dGVzLmluc2VydChRV2ViU2V0dGluZ3M6OkhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJs ZWQsIHRydWUpOwogICAgIGQtPm9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhID0gNSAqIDEwMjQg KiAxMDI0OwogICAgIGQtPmRlZmF1bHRUZXh0RW5jb2RpbmcgPSBRTGF0aW4xU3RyaW5nKCJpc28t ODg1OS0xIik7CiAjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDgsIDApCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaCBiL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCmluZGV4IDQwZjdmNzNmOTRkMTk4YmYxZGYzNmEy OGM2YWMwYTczNTU2M2Y5OGYuLmEwNmMxZGY4NTJlOTdiMzdmOWEwNTg3NTY0NmIyNjdmNGE0ZDFm MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCkBAIC04MSw3ICs4MSw4IEBAIHB1 YmxpYzoKICAgICAgICAgU2l0ZVNwZWNpZmljUXVpcmtzRW5hYmxlZCwKICAgICAgICAgSmF2YXNj cmlwdENhbkNsb3NlV2luZG93cywKICAgICAgICAgV2ViR0xFbmFibGVkLAotICAgICAgICBIeXBl cmxpbmtBdWRpdGluZ0VuYWJsZWQKKyAgICAgICAgSHlwZXJsaW5rQXVkaXRpbmdFbmFibGVkLAor ICAgICAgICBIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkCiAgICAgfTsKICAgICBlbnVt IFdlYkdyYXBoaWMgewogICAgICAgICBNaXNzaW5nSW1hZ2VHcmFwaGljLApkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDRlZmMzNDRjYTQ5MzU3NzY3 ZmNkNDQwNTIzOTgyZmM1M2NkODk4NjEuLmFlNTIwNjJkNGM5ZjNlN2IzZjE3NTNhODNkYTcwYTRl ODBkNmJkN2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMS0xMS0xNyAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNo cm9taXVtLm9yZz4KKworICAgICAgICBbUXRdIEFkZCBhbiBvcHRpb24gdG8gc3dpdGNoIFdlYlNv Y2tldCBwcm90b2NvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTcyNjg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcDoKKyAg ICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpvdmVycmlkZVByZWZlcmVuY2UpOgorICAgICAg ICBIYW5kbGUgIldlYktpdEhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQiIHByZWZlcmVu Y2Uga2V5LgorCiAyMDExLTExLTE3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgog CiAgICAgICAgIGZ1enp5X21hdGNoIGRvZXNuJ3QgcmVjb2duaXplICJEYW4gQiIgb3IgImh5YXR0 IgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xs ZXJRdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0 LmNwcAppbmRleCA2NGY4OTFiZmFjNGFiYzkyYTQ0OTJmZGMzODQ0MGY5YjJjNDIwZTc1Li4xNWM0 NDk1OWZhZDFjNDNhYWI2YjZhOWIzMTZjNzljNjUzZTBlYmVmIDEwMDY0NAotLS0gYS9Ub29scy9E dW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcAorKysgYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcApAQCAtNjkxLDYgKzY5 MSw4IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6Om92ZXJyaWRlUHJlZmVyZW5jZShjb25z dCBRU3RyaW5nJiBuYW1lLCBjb25zdCBRVmFyaWFuCiAgICAgICAgIHNldHRpbmdzLT5zZXRBdHRy aWJ1dGUoUVdlYlNldHRpbmdzOjpXZWJHTEVuYWJsZWQsIHZhbHVlLnRvQm9vbCgpKTsKICAgICBl bHNlIGlmIChuYW1lID09ICJXZWJLaXRIeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWQiKQogICAgICAg ICBzZXR0aW5ncy0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6SHlwZXJsaW5rQXVkaXRpbmdF bmFibGVkLCB2YWx1ZS50b0Jvb2woKSk7CisgICAgZWxzZSBpZiAobmFtZSA9PSAiV2ViS2l0SGl4 aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZCIpCisgICAgICAgIHNldHRpbmdzLT5zZXRBdHRy aWJ1dGUoUVdlYlNldHRpbmdzOjpIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkLCB2YWx1 ZS50b0Jvb2woKSk7CiAgICAgZWxzZQogICAgICAgICBwcmludGYoIkVSUk9SOiBMYXlvdXRUZXN0 Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNlKCkgZG9lcyBub3Qgc3VwcG9ydCB0aGUgJyVz JyBwcmVmZXJlbmNlXG4iLAogICAgICAgICAgICAgbmFtZS50b0xhdGluMSgpLmRhdGEoKSk7CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggMDUxNGY5Y2FmOGZhZDcwY2JiYWQzNWY4NDhlOGNkMWFlMTIzN2Q5NS4uNDdhNmZjZWQ4 NTQzZWIwMTMwNmE4YzIwY2VlNzRkNGNjOTEwOGM2MyAxMDA3NTUKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDExLTExLTE3ICBZdXRhIEtpdGFtdXJhICA8eXV0YWtAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFtRdF0gQWRkIGFuIG9wdGlvbiB0byBzd2l0Y2ggV2ViU29ja2V0IHByb3RvY29scworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI2ODcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L1Nr aXBwZWQ6CisgICAgICAgIFVuc2tpcCBXZWJTb2NrZXQgaHliaSB0ZXN0cy4gU2tpcCBzb21lIG9m IHRoZW0gdGhhdCBhcmUga25vd24gdG8gZmFpbCBwcm9iYWJseSBkdWUgdG8KKyAgICAgICAgYSBi dWcgaW4gU29ja2V0U3RyZWFtSGFuZGxlUXQgaW1wbGVtZW50YXRpb24uCisKIDIwMTEtMTEtMTcg IFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgogCiAgICAgICAgIFtjaHJvbWl1 bV0gRml4IGJyb2tlbiBleHBlY3RhdGlvbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDUy NmE0MDhjMjRlZTdjOTdhYjc2NTM5YjEyYTEzYmQ5NGY5ZDkwMDkuLmZhZWUyM2QzZTQ0N2RkNjUy ZDY4MjZkNmMyODFhOTVlZDZmMGM1MTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtMTYw Miw4ICsxNjAyLDExIEBAIHByaW50aW5nL21lZGlhLXF1ZXJpZXMtcHJpbnQuaHRtbAogIyBmYWls aW5nIHdlYnNvY2tldCB0ZXN0cwogIyA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSAjCiAKLSMgU2tpcHBl ZCB1bnRpbCBuZXcgV2ViU29ja2V0IHByb3RvY29sIGlzIGltcGxlbWVudGVkLiBodHRwOi8vd2Vi a2l0Lm9yZy9iLzUwMDk5Ci1odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpLworIyBTb2Nr ZXRTdHJlYW1IYW5kbGVRdCBzZWVtcyB0byBoYXZlIHNvbWUgYnVnIGluIHBsYXRmb3JtQ2xvc2Uo KSBiZWhhdmlvci4KK2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvY2xvc2UtYmVmb3Jl LW9wZW4uaHRtbAoraHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9jbG9zZS1jb2RlLWFu ZC1yZWFzb24uaHRtbAoraHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9jbG9zZS5odG1s CitodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3dvcmtlcnMvY2xvc2UuaHRtbAogCiAj ID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09ICMKICMgbmV3IHRlc3RzIHdpdGhvdXQgZXhwZWN0ZWQgcmVz dWx0cwo= 115752 2011-11-18 00:16:09 -0800 2011-11-18 06:00:50 -0800 Patch v2 (don't change public API) bug-72687-20111118171607.patch text/plain 6925 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDE1ZTEzNTJhOWI5 ZWYwYWI1YzlhZGZmN2IzMDI2ZDk1YWYwODViZjcuLjM5MzY4NTBiOTYwZmNiMmI1OWZlODhmYmQz NTg5MmI3NjQwMDMzMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTEt MTggIFl1dGEgS2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW1F0XSBF bmFibGUgV2ViU29ja2V0IGh5YmkgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTcyNjg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRR dC5jcHA6CisgICAgICAgIChEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6ZGVmYXVsdEhpeGllNzZX ZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQpOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVTdXBwb3J0 UXQ6OnNldEhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQpOgorICAgICAgICBDYWxsIFdl YkNvcmU6OlNldHRpbmdzOjpzZXRVc2VIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2woKSB0byBzd2l0 Y2ggV2ViU29ja2V0IHByb3RvY29scy4KKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVu ZGVyVHJlZVN1cHBvcnRRdC5oOgorCiAyMDExLTExLTE3ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9u LmhhdXNtYW5uQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIExheWVyIHZpb2xhdGlvbjogcXRf cnVudGltZS5jcHAgYWNjZXNzZXMgUVdlYkVsZW1lbnQgYW5kIFFURFJUTm9kZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3Vw cG9ydFF0LmNwcAppbmRleCBlMTlkY2I2ZWRlZmE4OWE1NTc2Y2VhOGM2YmExMjFlZWJjYzI4OTlk Li41MzY1ZDNkZTFhZmVkNmE2YmJmMmI0YTRlMDY3MmVjNWY5NTBmYWIwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3Vw cG9ydFF0LmNwcApAQCAtMTIzNyw2ICsxMjM3LDIyIEBAIHZvaWQgRHVtcFJlbmRlclRyZWVTdXBw b3J0UXQ6OnJlc2V0SW50ZXJuYWxzT2JqZWN0KFFXZWJGcmFtZSogZnJhbWUpCiAjZW5kaWYKIH0K IAorYm9vbCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6ZGVmYXVsdEhpeGllNzZXZWJTb2NrZXRQ cm90b2NvbEVuYWJsZWQoKQoreworICAgIHJldHVybiB0cnVlOworfQorCit2b2lkIER1bXBSZW5k ZXJUcmVlU3VwcG9ydFF0OjpzZXRIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkKFFXZWJQ YWdlKiBwYWdlLCBib29sIGVuYWJsZWQpCit7CisjaWYgRU5BQkxFKFdFQl9TT0NLRVRTKQorICAg IGlmIChQYWdlKiBjb3JlUGFnZSA9IFFXZWJQYWdlUHJpdmF0ZTo6Y29yZShwYWdlKSkKKyAgICAg ICAgY29yZVBhZ2UtPnNldHRpbmdzKCktPnNldFVzZUhpeGllNzZXZWJTb2NrZXRQcm90b2NvbChl bmFibGVkKTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKHBhZ2UpOworICAgIFVOVVNFRF9QQVJB TShlbmFibGVkKTsKKyNlbmRpZgorfQorCiAvLyBQcm92aWRlIGEgYmFja3dhcmQgY29tcGF0aWJp bGl0eSB3aXRoIHByZXZpb3VzbHkgZXhwb3J0ZWQgcHJpdmF0ZSBzeW1ib2xzIGFzIG9mIFF0V2Vi S2l0IDQuNiByZWxlYXNlCiAKIHZvaWQgUVdFQktJVF9FWFBPUlQgcXRfcmVzdW1lQWN0aXZlRE9N T2JqZWN0cyhRV2ViRnJhbWUqIGZyYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5oIGIvU291cmNlL1dlYktpdC9x dC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5oCmluZGV4IDQ0M2E1ZjEz MjY1Y2U4MDhhZDdlNTQ4ZTU1Yjc3MmYyNTg1NDk2ZWEuLjUxYmViYzM1NGM4MzRkMDYzZDAyZWVj NzZhOWIzZjgzZWVkZTVlZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmgKQEAgLTIzNSw2ICsyMzUsOSBA QCBwdWJsaWM6CiAjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDgsIDApCiAg ICAgc3RhdGljIGJvb2wgdGhpcmRQYXJ0eUNvb2tpZVBvbGljeUFsbG93cyhRTmV0d29ya0Nvb2tp ZUphciosIGNvbnN0IFFVcmwmLCBjb25zdCBRVXJsJiBmaXJzdFBhcnR5VXJsKTsKICNlbmRpZgor CisgICAgc3RhdGljIGJvb2wgZGVmYXVsdEhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQo KTsKKyAgICBzdGF0aWMgdm9pZCBzZXRIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkKFFX ZWJQYWdlKiwgYm9vbCk7CiB9OwogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0ZWZjMzQ0Y2E0OTM1Nzc2N2ZjZDQ0MDUyMzk4MmZj NTNjZDg5ODYxLi4yZWE4YThhMGZjMjAwYzgzOGU2MTYwY2E4YTlhYTRiMWVmYTQ1NDZkIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTcgQEAKKzIwMTEtMTEtMTggIFl1dGEgS2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW1F0XSBFbmFibGUgV2ViU29ja2V0IGh5YmkgdGVzdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNjg3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTGV0IExheW91dFRlc3RDb250cm9sbGVy UXQgYmUgYWJsZSB0byBzd2l0Y2ggV2ViU29ja2V0IHByb3RvY29scyB2aWEgb3ZlcnJpZGVQcmVm ZXJlbmNlKCkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYlBhZ2U6OnJlc2V0U2V0dGluZ3MpOgorICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwOgorICAgICAg ICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6Om92ZXJyaWRlUHJlZmVyZW5jZSk6CisKIDIwMTEtMTEt MTcgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgZnV6enlfbWF0 Y2ggZG9lc24ndCByZWNvZ25pemUgIkRhbiBCIiBvciAiaHlhdHQiCmRpZmYgLS1naXQgYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcCBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCmluZGV4IDJjYTQxNWU3YzhkNTk5MzNjOWYy ZmQyODlkYjBlNzMzYjNkODMxZjQuLmYzZTMwZGRkYmEzZGNhY2M0NzhmMzE1YTc0MjJjZDk3N2Nm YjNhMDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVl UXQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3Bw CkBAIC0yMTAsNiArMjEwLDcgQEAgdm9pZCBXZWJQYWdlOjpyZXNldFNldHRpbmdzKCkKICAgICBz ZXR0aW5ncygpLT5zZXRVc2VyU3R5bGVTaGVldFVybChRVXJsKCkpOyAvLyByZXNldCB0byBkZWZh dWx0CiAKICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6c2V0TWluaW11bVRpbWVySW50ZXJ2 YWwodGhpcywgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6OmRlZmF1bHRNaW5pbXVtVGltZXJJbnRl cnZhbCgpKTsKKyAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6c2V0SGl4aWU3NldlYlNvY2tl dFByb3RvY29sRW5hYmxlZCh0aGlzLCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6ZGVmYXVsdEhp eGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQoKSk7CiAKICAgICBEdW1wUmVuZGVyVHJlZVN1 cHBvcnRRdDo6cmVzZXRJbnRlcm5hbHNPYmplY3QobWFpbkZyYW1lKCkpOwogCmRpZmYgLS1naXQg YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcCBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCmluZGV4IDY0 Zjg5MWJmYWM0YWJjOTJhNDQ5MmZkYzM4NDQwZjliMmM0MjBlNzUuLjI2MjBjYjkzOTQ3YWVhMjI5 YmI4NjIzM2Q5NDEzMWIwNmFiNjlmMWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCkBAIC02OTEsNiArNjkxLDggQEAgdm9pZCBM YXlvdXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNlKGNvbnN0IFFTdHJpbmcmIG5h bWUsIGNvbnN0IFFWYXJpYW4KICAgICAgICAgc2V0dGluZ3MtPnNldEF0dHJpYnV0ZShRV2ViU2V0 dGluZ3M6OldlYkdMRW5hYmxlZCwgdmFsdWUudG9Cb29sKCkpOwogICAgIGVsc2UgaWYgKG5hbWUg PT0gIldlYktpdEh5cGVybGlua0F1ZGl0aW5nRW5hYmxlZCIpCiAgICAgICAgIHNldHRpbmdzLT5z ZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpIeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWQsIHZhbHVl LnRvQm9vbCgpKTsKKyAgICBlbHNlIGlmIChuYW1lID09ICJXZWJLaXRIaXhpZTc2V2ViU29ja2V0 UHJvdG9jb2xFbmFibGVkIikKKyAgICAgICAgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6OnNldEhp eGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQobV90b3BMb2FkaW5nRnJhbWUtPnBhZ2UoKSwg dmFsdWUudG9Cb29sKCkpOwogICAgIGVsc2UKICAgICAgICAgcHJpbnRmKCJFUlJPUjogTGF5b3V0 VGVzdENvbnRyb2xsZXI6Om92ZXJyaWRlUHJlZmVyZW5jZSgpIGRvZXMgbm90IHN1cHBvcnQgdGhl ICclcycgcHJlZmVyZW5jZVxuIiwKICAgICAgICAgICAgIG5hbWUudG9MYXRpbjEoKS5kYXRhKCkp OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IDY5OWI4MTUyNTBiNmIwZjlhNDk4NDMyNWQ4YmM0YmExY2M5YWI3NmUuLmI3NDYy MDFjMzcwNDU1ZTRlYWNiMzQ2MjQxNjQyNThiYzFmNjVlMTQgMTAwNzU1Ci0tLSBhL0xheW91dFRl c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAxMS0xMS0xOCAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9taXVtLm9yZz4KKworICAg ICAgICBbUXRdIEVuYWJsZSBXZWJTb2NrZXQgaHliaSB0ZXN0cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzI2ODcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L1NraXBwZWQ6CisgICAg ICAgIFVuc2tpcCBXZWJTb2NrZXQgaHliaSB0ZXN0cy4gU2tpcCBzb21lIG9mIHRoZW0gd2hpY2gg YXJlIGtub3duIHRvIGZhaWwgcHJvYmFibHkgZHVlIHRvCisgICAgICAgIGEgYnVnIGluIFNvY2tl dFN0cmVhbUhhbmRsZVF0IGltcGxlbWVudGF0aW9uLgorCiAyMDExLTExLTE3ICBQZXRlciBLYXN0 aW5nICA8cGthc3RpbmdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIGFjaWQzLmh0 bWwgZGlkbid0IGFjdHVhbGx5IGdldCByZWJhc2VsaW5lZCBsaWtlIEkgd2FudGVkLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRm b3JtL3F0L1NraXBwZWQKaW5kZXggNTI2YTQwOGMyNGVlN2M5N2FiNzY1MzliMTJhMTNiZDk0Zjlk OTAwOS4uZmFlZTIzZDNlNDQ3ZGQ2NTJkNjgyNmQ2YzI4MWE5NWVkNmYwYzUxMyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9Ta2lwcGVkCkBAIC0xNjAyLDggKzE2MDIsMTEgQEAgcHJpbnRpbmcvbWVkaWEtcXVl cmllcy1wcmludC5odG1sCiAjIGZhaWxpbmcgd2Vic29ja2V0IHRlc3RzCiAjID09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09ICMKIAotIyBTa2lwcGVkIHVudGlsIG5ldyBXZWJTb2NrZXQgcHJvdG9jb2wgaXMg aW1wbGVtZW50ZWQuIGh0dHA6Ly93ZWJraXQub3JnL2IvNTAwOTkKLWh0dHAvdGVzdHMvd2Vic29j a2V0L3Rlc3RzL2h5YmkvCisjIFNvY2tldFN0cmVhbUhhbmRsZVF0IHNlZW1zIHRvIGhhdmUgc29t ZSBidWcgaW4gcGxhdGZvcm1DbG9zZSgpIGJlaGF2aW9yLgoraHR0cC90ZXN0cy93ZWJzb2NrZXQv dGVzdHMvaHliaS9jbG9zZS1iZWZvcmUtb3Blbi5odG1sCitodHRwL3Rlc3RzL3dlYnNvY2tldC90 ZXN0cy9oeWJpL2Nsb3NlLWNvZGUtYW5kLXJlYXNvbi5odG1sCitodHRwL3Rlc3RzL3dlYnNvY2tl dC90ZXN0cy9oeWJpL2Nsb3NlLmh0bWwKK2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5Ymkv d29ya2Vycy9jbG9zZS5odG1sCiAKICMgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0gIwogIyBuZXcgdGVz dHMgd2l0aG91dCBleHBlY3RlZCByZXN1bHRzCg==