65250 2011-07-27 05:23:29 -0700 WebSocket: Pass the value of useHixie76Protocol flag to WebSocket object 2011-07-28 05:21:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 65247 1 yutak yutak abarth ap tkent webkit.review.bot oldest_to_newest 442869 0 yutak 2011-07-27 05:23:29 -0700 To implement bug 65247, we need to determine the WebSocket protocol used by the WebSocketChannel associated with it. WebSocket objects may reside in worker threads. WorkerContext does not provide the way to obtain Settings values, thus we need to get the value from WebSocketChannel (which is in the loader thread). 442903 1 102141 yutak 2011-07-27 06:35:47 -0700 Created attachment 102141 Patch 442948 2 102141 ap 2011-07-27 08:43:08 -0700 Comment on attachment 102141 Patch This looks like a case where a bool is better than an enum, because callers don't use true/false literals, and there is no confusion. 443433 3 102141 webkit.review.bot 2011-07-28 05:21:18 -0700 Comment on attachment 102141 Patch Clearing flags on attachment: 102141 Committed r91919: <http://trac.webkit.org/changeset/91919> 443434 4 webkit.review.bot 2011-07-28 05:21:23 -0700 All reviewed patches have been landed. Closing bug. 102141 2011-07-27 06:35:47 -0700 2011-07-28 05:21:18 -0700 Patch bug-65250-20110727223545.patch text/plain 10995 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogOTE3NzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZDViNzhlYzkyYTkwNjRi ZDAyODY5N2I0NzAzYjIzNzE3ZGNkMTlmLi43NzMyOGQxNGY1NDllY2FlOTJkMTMwMDMzOWY0MjE3 ZWJiMzAzZDI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTEtMDctMjcgIFl1dGEg S2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViU29ja2V0OiBQYXNz IHRoZSB2YWx1ZSBvZiB1c2VIaXhpZTc2UHJvdG9jb2wgZmxhZyB0byBXZWJTb2NrZXQgb2JqZWN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTI1MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB1c2VI aXhpZTc2UHJvdG9jb2woKSBtZXRob2QgdG8gV2ViU29ja2V0Q2hhbm5lbCBhbmQgaXRzIGZhbWls eS4gVG8gaW1wbGVtZW50IGh5Ymktc3BlY2lmaWMKKyAgICAgICAgYXR0cmlidXRlcyBpbiBXZWJT b2NrZXQgb2JqZWN0LCBXZWJTb2NrZXQgY2xhc3MgbmVlZHMgdG8gYmUgYWJsZSB0byBnZXQgdGhl IHZhbHVlIG9mCisgICAgICAgIHVzZUhpeGllNzZQcm90b2NvbCBmbGFnIG9mIFdlYlNvY2tldENo YW5uZWwuCisKKyAgICAgICAgSWYgdGhlIFdlYlNvY2tldCBvYmplY3QgaXMgY3JlYXRlZCBpbiBh IHdvcmtlciB0aHJlYWQsIHRoZSBmbGFnIHZhbHVlIG11c3QgYmUgb2J0YWluZWQgZnJvbQorICAg ICAgICBXZWJTb2NrZXRDaGFubmVsIHdoaWNoIHJlc2lkZXMgaW4gdGhlIGxvYWRlciB0aHJlYWQg KHRocm91Z2ggV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwpLgorICAgICAgICBTaW5j ZSB0aGUgdmFsdWUgZG9lcyBub3QgY2hhbmdlIGFmdGVyIGNyZWF0aW9uIG9mIFdlYlNvY2tldENo YW5uZWwsIGl0IGNhbiBiZSBjYWNoZWQgaW4KKyAgICAgICAgdGhlIHdvcmtlciB0aHJlYWQuCisK KyAgICAgICAgVGhlcmUgaXMgbm8gY2hhbmdlIGluIGJlaGF2aW9yLCB0aHVzIG5vIG5ldyB0ZXN0 cy4KKworICAgICAgICAqIHdlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwuaDoK KyAgICAgICAgKiB3ZWJzb2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3Jh cHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENs aWVudFdyYXBwZXI6OlRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcik6Cisg ICAgICAgIChXZWJDb3JlOjpUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXI6 OnVzZUhpeGllNzZQcm90b2NvbCk6CisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRhYmxlV2ViU29j a2V0Q2hhbm5lbENsaWVudFdyYXBwZXI6OnNldFVzZUhpeGllNzZQcm90b2NvbCk6CisgICAgICAg ICogd2Vic29ja2V0cy9UaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXIuaDoK KyAgICAgICAgKiB3ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6V2ViU29ja2V0Q2hhbm5lbDo6dXNlSGl4aWU3NlByb3RvY29sKToKKyAgICAgICAgKiB3 ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuaDoKKyAgICAgICAgKiB3ZWJzb2NrZXRzL1dvcmtl clRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oldvcmtl clRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOjp1c2VIaXhpZTc2UHJvdG9jb2wpOgorICAgICAg ICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWw6OlBlZXI6OnVzZUhp eGllNzZQcm90b2NvbCk6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJUaHJlYWRhYmxlV2ViU29j a2V0Q2hhbm5lbDo6QnJpZGdlOjpzZXRXZWJTb2NrZXRDaGFubmVsKToKKyAgICAgICAgKFdlYkNv cmU6OldvcmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOjpCcmlkZ2U6Om1haW5UaHJlYWRD cmVhdGVXZWJTb2NrZXRDaGFubmVsKToKKyAgICAgICAgKiB3ZWJzb2NrZXRzL1dvcmtlclRocmVh ZGFibGVXZWJTb2NrZXRDaGFubmVsLmg6CisKIDIwMTEtMDctMjYgIFZpZXQtVHJ1bmcgTHV1ICA8 dmlldHRydW5nbHV1QGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbXByb3ZlIChpLmUuLCBzcGVl ZCB1cCkgLmd5cChpKSBmaWxlcyBmb3IgQ2hyb21pdW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwuaCBiL1NvdXJjZS9XZWJD b3JlL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwuaAppbmRleCAzNDRlYzZj NDhkZjJmNmIzNGQxMGYzYWZlNTM5YzE5MTlkYTA0YzQ2Li5kNzIyOWI0NmQ0YTdlMzA4MjNlMTE0 ZjgyODkzYWJiZTZmZDY3ZjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRz L1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd2Vic29j a2V0cy9UaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbC5oCkBAIC00OSw2ICs0OSw3IEBAIHB1Ymxp YzoKICAgICBUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbCgpIHsgfQogICAgIHN0YXRpYyBQYXNz UmVmUHRyPFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsPiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCosIFdlYlNvY2tldENoYW5uZWxDbGllbnQqLCBjb25zdCBLVVJMJiwgY29uc3QgU3Ry aW5nJiBwcm90b2NvbCk7CiAKKyAgICB2aXJ0dWFsIGJvb2wgdXNlSGl4aWU3NlByb3RvY29sKCkg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBjb25uZWN0KCkgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBz ZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkgPSAwOwogICAgIHZpcnR1YWwgdW5zaWduZWQgbG9u ZyBidWZmZXJlZEFtb3VudCgpIGNvbnN0ID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGll bnRXcmFwcGVyLmNwcAppbmRleCA3NDAyNDgyM2NjZWFiZjAyNmI3MjU0YTEyMjM1NTVmN2Y1Mzcw ZTA1Li5hYTA2MDllZGFlNjdhYTBkZjExY2YxNzIwZTMwZmY3MGEwYzMzYTEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xp ZW50V3JhcHBlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9UaHJlYWRhYmxl V2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXIuY3BwCkBAIC00Myw2ICs0Myw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcjo6 VGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyKFdlYlNvY2tldENoYW5uZWxD bGllbnQqIGNsaWVudCkKICAgICA6IG1fY2xpZW50KGNsaWVudCkKICAgICAsIG1fc3luY01ldGhv ZERvbmUoZmFsc2UpCisgICAgLCBtX3VzZUhpeGllNzZQcm90b2NvbCh0cnVlKQogICAgICwgbV9z ZW50KGZhbHNlKQogICAgICwgbV9idWZmZXJlZEFtb3VudCgwKQogICAgICwgbV9zdXNwZW5kZWQo ZmFsc2UpCkBAIC02OSw2ICs3MCwxNiBAQCBib29sIFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVs Q2xpZW50V3JhcHBlcjo6c3luY01ldGhvZERvbmUoKSBjb25zdAogICAgIHJldHVybiBtX3N5bmNN ZXRob2REb25lOwogfQogCitib29sIFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3Jh cHBlcjo6dXNlSGl4aWU3NlByb3RvY29sKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV91c2VIaXhp ZTc2UHJvdG9jb2w7Cit9CisKK3ZvaWQgVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRX cmFwcGVyOjpzZXRVc2VIaXhpZTc2UHJvdG9jb2woYm9vbCB1c2VIaXhpZTc2UHJvdG9jb2wpCit7 CisgICAgbV91c2VIaXhpZTc2UHJvdG9jb2wgPSB1c2VIaXhpZTc2UHJvdG9jb2w7Cit9CisKIGJv b2wgVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyOjpzZW50KCkgY29uc3QK IHsKICAgICByZXR1cm4gbV9zZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd2Vic29j a2V0cy9UaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVy LmgKaW5kZXggZWQ4YmNlNDc1YWUxOTIwMGI3OTVmMjQ3ZjExMmQ0ZjQ1ZjFiMGU5NC4uNzQzNmE2 M2Y4YWZhY2RhY2E4ZTlmMTRmZDY1ZTg3YmE2ZmVmMmRiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvd2Vic29ja2V0cy9UaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFu bmVsQ2xpZW50V3JhcHBlci5oCkBAIC01Myw2ICs1MywxMSBAQCBwdWJsaWM6CiAgICAgdm9pZCBz ZXRTeW5jTWV0aG9kRG9uZSgpOwogICAgIGJvb2wgc3luY01ldGhvZERvbmUoKSBjb25zdDsKIAor ICAgIC8vIFRoZSB2YWx1ZSBvZiB1c2VIaXhpZTc2UHJvdG9jb2wgZmxhZyBpcyBjYWNoYWJsZTsg dGhpcyB2YWx1ZSBpcyBzYXZlZCBhZnRlciBXZWJTb2NrZXRDaGFubmVsIChvbiB0aGUgbWFpbgor ICAgIC8vIHRocmVhZCkgaXMgY29uc3RydWN0ZWQuCisgICAgYm9vbCB1c2VIaXhpZTc2UHJvdG9j b2woKSBjb25zdDsKKyAgICB2b2lkIHNldFVzZUhpeGllNzZQcm90b2NvbChib29sKTsKKwogICAg IGJvb2wgc2VudCgpIGNvbnN0OwogICAgIHZvaWQgc2V0U2VudChib29sKTsKIApAQCAtODAsNiAr ODUsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICBXZWJTb2NrZXRDaGFubmVsQ2xpZW50KiBtX2NsaWVu dDsKICAgICBib29sIG1fc3luY01ldGhvZERvbmU7CisgICAgYm9vbCBtX3VzZUhpeGllNzZQcm90 b2NvbDsKICAgICBib29sIG1fc2VudDsKICAgICB1bnNpZ25lZCBsb25nIG1fYnVmZmVyZWRBbW91 bnQ7CiAgICAgYm9vbCBtX3N1c3BlbmRlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dl YnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRz L1dlYlNvY2tldENoYW5uZWwuY3BwCmluZGV4IGU1NjExNGYzZjQ2MzBhMDI0NWU2MGZkZDRlMjFj ZmM4ZDhkN2NhNTYuLmMxYTQwNzRhZmVmYzg0MmZlZmQwMWJiNjg1NmQwM2Y1NzAxYzU1YjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcApAQCAt MTE2LDYgKzExNiwxMSBAQCBXZWJTb2NrZXRDaGFubmVsOjp+V2ViU29ja2V0Q2hhbm5lbCgpCiAg ICAgZmFzdEZyZWUobV9idWZmZXIpOwogfQogCitib29sIFdlYlNvY2tldENoYW5uZWw6OnVzZUhp eGllNzZQcm90b2NvbCgpCit7CisgICAgcmV0dXJuIG1fdXNlSGl4aWU3NlByb3RvY29sOworfQor CiB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmNvbm5lY3QoKQogewogICAgIExPRyhOZXR3b3JrLCAi V2ViU29ja2V0Q2hhbm5lbCAlcCBjb25uZWN0IiwgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuaCBiL1NvdXJjZS9XZWJDb3JlL3dl YnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oCmluZGV4IGY3YTQ3MGUxM2QyZDA2ZGU4YTc0Yjk2 YWY1ODNiNTVkMzg1MTEzMDcuLjY1NWI0N2Y3MWI4MDA2NGQ4NzEzOGIyMTUwYWYyZmFiNGQ2YTQ5 OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5l bC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oCkBA IC01NCw2ICs1NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIFBhc3NS ZWZQdHI8V2ViU29ja2V0Q2hhbm5lbD4gY3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNv bnRleHQsIFdlYlNvY2tldENoYW5uZWxDbGllbnQqIGNsaWVudCwgY29uc3QgS1VSTCYgdXJsLCBj b25zdCBTdHJpbmcmIHByb3RvY29sKSB7IHJldHVybiBhZG9wdFJlZihuZXcgV2ViU29ja2V0Q2hh bm5lbChjb250ZXh0LCBjbGllbnQsIHVybCwgcHJvdG9jb2wpKTsgfQogICAgICAgICB2aXJ0dWFs IH5XZWJTb2NrZXRDaGFubmVsKCk7CiAKKyAgICAgICAgdmlydHVhbCBib29sIHVzZUhpeGllNzZQ cm90b2NvbCgpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgY29ubmVjdCgpOwogICAgICAgICB2aXJ0 dWFsIGJvb2wgc2VuZChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpOwogICAgICAgICB2aXJ0dWFsIHVu c2lnbmVkIGxvbmcgYnVmZmVyZWRBbW91bnQoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3dlYnNvY2tldHMvV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwuY3BwIGIv U291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9Xb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5l bC5jcHAKaW5kZXggYzBlNDYwNjY5ZjlhN2NjODEzMGExYmUyNjExNDkwMTA0M2Y4YzkxNi4uZjU4 MzRlYmZkYTExMDllNWZmNTNlZjlhODg4YTFmNTEwOWYxZTg4NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvd2Vic29ja2V0cy9Xb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9Xb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0 Q2hhbm5lbC5jcHAKQEAgLTYyLDYgKzYyLDEyIEBAIFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRD aGFubmVsOjp+V29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwoKQogICAgICAgICBtX2Jy aWRnZS0+ZGlzY29ubmVjdCgpOwogfQogCitib29sIFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRD aGFubmVsOjp1c2VIaXhpZTc2UHJvdG9jb2woKQoreworICAgIEFTU0VSVChtX3dvcmtlckNsaWVu dFdyYXBwZXIpOworICAgIHJldHVybiBtX3dvcmtlckNsaWVudFdyYXBwZXItPnVzZUhpeGllNzZQ cm90b2NvbCgpOworfQorCiB2b2lkIFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOjpj b25uZWN0KCkKIHsKICAgICBpZiAobV9icmlkZ2UpCkBAIC0xMzAsNiArMTM2LDEzIEBAIFdvcmtl clRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOjpQZWVyOjp+UGVlcigpCiAgICAgICAgIG1fbWFp bldlYlNvY2tldENoYW5uZWwtPmRpc2Nvbm5lY3QoKTsKIH0KIAorYm9vbCBXb3JrZXJUaHJlYWRh YmxlV2ViU29ja2V0Q2hhbm5lbDo6UGVlcjo6dXNlSGl4aWU3NlByb3RvY29sKCkKK3sKKyAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOworICAgIEFTU0VSVChtX21haW5XZWJTb2NrZXRDaGFubmVs KTsKKyAgICByZXR1cm4gbV9tYWluV2ViU29ja2V0Q2hhbm5lbC0+dXNlSGl4aWU3NlByb3RvY29s KCk7Cit9CisKIHZvaWQgV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWw6OlBlZXI6OmNv bm5lY3QoKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CkBAIC0yNTgsMTAgKzI3MSwx MSBAQCB2b2lkIFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOjpQZWVyOjpkaWRDbG9z ZSh1bnNpZ25lZCBsb25nIHVuaGFuZGxlZEJ1ZgogICAgIG1fbG9hZGVyUHJveHkucG9zdFRhc2tG b3JNb2RlVG9Xb3JrZXJDb250ZXh0KGNyZWF0ZUNhbGxiYWNrVGFzaygmd29ya2VyQ29udGV4dERp ZENsb3NlLCBtX3dvcmtlckNsaWVudFdyYXBwZXIsIHVuaGFuZGxlZEJ1ZmZlcmVkQW1vdW50LCBj bG9zaW5nSGFuZHNoYWtlQ29tcGxldGlvbiksIG1fdGFza01vZGUpOwogfQogCi12b2lkIFdvcmtl clRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsOjpCcmlkZ2U6OnNldFdlYlNvY2tldENoYW5uZWwo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgQnJpZGdlKiB0aGlzUHRyLCBQZWVyKiBw ZWVyLCBQYXNzUmVmUHRyPFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcj4g d29ya2VyQ2xpZW50V3JhcHBlcikKK3ZvaWQgV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5u ZWw6OkJyaWRnZTo6c2V0V2ViU29ja2V0Q2hhbm5lbChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBj b250ZXh0LCBCcmlkZ2UqIHRoaXNQdHIsIFBlZXIqIHBlZXIsIFBhc3NSZWZQdHI8VGhyZWFkYWJs ZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyPiB3b3JrZXJDbGllbnRXcmFwcGVyLCBib29s IHVzZUhpeGllNzZQcm90b2NvbCkKIHsKICAgICBBU1NFUlRfVU5VU0VEKGNvbnRleHQsIGNvbnRl eHQtPmlzV29ya2VyQ29udGV4dCgpKTsKICAgICB0aGlzUHRyLT5tX3BlZXIgPSBwZWVyOworICAg IHdvcmtlckNsaWVudFdyYXBwZXItPnNldFVzZUhpeGllNzZQcm90b2NvbCh1c2VIaXhpZTc2UHJv dG9jb2wpOwogICAgIHdvcmtlckNsaWVudFdyYXBwZXItPnNldFN5bmNNZXRob2REb25lKCk7CiB9 CiAKQEAgLTI3Niw3ICsyOTAsNyBAQCB2b2lkIFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFu bmVsOjpCcmlkZ2U6Om1haW5UaHJlYWRDcmVhdGVXZWJTb2NrZXRDaGFubmVsKAogICAgIHRoaXNQ dHItPm1fbG9hZGVyUHJveHkucG9zdFRhc2tGb3JNb2RlVG9Xb3JrZXJDb250ZXh0KAogICAgICAg ICBjcmVhdGVDYWxsYmFja1Rhc2soJkJyaWRnZTo6c2V0V2ViU29ja2V0Q2hhbm5lbCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgIEFsbG93Q3Jvc3NUaHJlYWRBY2Nlc3ModGhpc1B0ciksCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICBBbGxvd0Nyb3NzVGhyZWFkQWNjZXNzKHBlZXIpLCBj bGllbnRXcmFwcGVyKSwgdGFza01vZGUpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgQWxs b3dDcm9zc1RocmVhZEFjY2VzcyhwZWVyKSwgY2xpZW50V3JhcHBlciwgcGVlci0+dXNlSGl4aWU3 NlByb3RvY29sKCkpLCB0YXNrTW9kZSk7CiB9CiAKIFdvcmtlclRocmVhZGFibGVXZWJTb2NrZXRD aGFubmVsOjpCcmlkZ2U6OkJyaWRnZShQYXNzUmVmUHRyPFRocmVhZGFibGVXZWJTb2NrZXRDaGFu bmVsQ2xpZW50V3JhcHBlcj4gd29ya2VyQ2xpZW50V3JhcHBlciwgUGFzc1JlZlB0cjxXb3JrZXJD b250ZXh0PiB3b3JrZXJDb250ZXh0LCBjb25zdCBTdHJpbmcmIHRhc2tNb2RlLCBjb25zdCBLVVJM JiB1cmwsIGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS93ZWJzb2NrZXRzL1dvcmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsLmggYi9Tb3VyY2Uv V2ViQ29yZS93ZWJzb2NrZXRzL1dvcmtlclRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsLmgKaW5k ZXggMGRlMjkyZTYyYjlmMzQ5OTRmZmVmNmQ0YWMzNWRlYjFlYzA3ZjUzOS4uZjIzMGZkN2FmYWY5 MmRiZmIxOWFlMDgxNWJkMmY1NTE0Y2UyYTllMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv d2Vic29ja2V0cy9Xb3JrZXJUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3dlYnNvY2tldHMvV29ya2VyVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWwuaApA QCAtNjAsNiArNjAsNyBAQCBwdWJsaWM6CiAgICAgfQogICAgIHZpcnR1YWwgfldvcmtlclRocmVh ZGFibGVXZWJTb2NrZXRDaGFubmVsKCk7CiAKKyAgICB2aXJ0dWFsIGJvb2wgdXNlSGl4aWU3NlBy b3RvY29sKCk7CiAgICAgdmlydHVhbCB2b2lkIGNvbm5lY3QoKTsKICAgICB2aXJ0dWFsIGJvb2wg c2VuZChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpOwogICAgIHZpcnR1YWwgdW5zaWduZWQgbG9uZyBi dWZmZXJlZEFtb3VudCgpIGNvbnN0OwpAQCAtODgsNiArODksNyBAQCBwcml2YXRlOgogICAgICAg ICB9CiAgICAgICAgIH5QZWVyKCk7CiAKKyAgICAgICAgYm9vbCB1c2VIaXhpZTc2UHJvdG9jb2wo KTsKICAgICAgICAgdm9pZCBjb25uZWN0KCk7CiAgICAgICAgIHZvaWQgc2VuZChjb25zdCBTdHJp bmcmIG1lc3NhZ2UpOwogICAgICAgICB2b2lkIGJ1ZmZlcmVkQW1vdW50KCk7CkBAIC0xMzQsNyAr MTM2LDcgQEAgcHJpdmF0ZToKICAgICBwcml2YXRlOgogICAgICAgICBCcmlkZ2UoUGFzc1JlZlB0 cjxUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXI+LCBQYXNzUmVmUHRyPFdv cmtlckNvbnRleHQ+LCBjb25zdCBTdHJpbmcmIHRhc2tNb2RlLCBjb25zdCBLVVJMJiwgY29uc3Qg U3RyaW5nJiBwcm90b2NvbCk7CiAKLSAgICAgICAgc3RhdGljIHZvaWQgc2V0V2ViU29ja2V0Q2hh bm5lbChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgQnJpZGdlKiB0aGlzUHRyLCBQZWVyKiwgUGFz c1JlZlB0cjxUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXI+KTsKKyAgICAg ICAgc3RhdGljIHZvaWQgc2V0V2ViU29ja2V0Q2hhbm5lbChTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgQnJpZGdlKiB0aGlzUHRyLCBQZWVyKiwgUGFzc1JlZlB0cjxUaHJlYWRhYmxlV2ViU29ja2V0 Q2hhbm5lbENsaWVudFdyYXBwZXI+LCBib29sIHVzZUhpeGllNzZQcm90b2NvbCk7CiAKICAgICAg ICAgLy8gRXhlY3V0ZWQgb24gdGhlIG1haW4gdGhyZWFkIHRvIGNyZWF0ZSBhIFBlZXIgZm9yIHRo aXMgYnJpZGdlLgogICAgICAgICBzdGF0aWMgdm9pZCBtYWluVGhyZWFkQ3JlYXRlV2ViU29ja2V0 Q2hhbm5lbChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgQnJpZGdlKiB0aGlzUHRyLCBQYXNzUmVm UHRyPFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcj4sIGNvbnN0IFN0cmlu ZyYgdGFza01vZGUsIGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmIHByb3RvY29sKTsK