28941 2009-09-03 02:41:26 -0700 Add webSocketEnabled flag in Settings 2009-09-29 18:51:43 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ukai webkit-unassigned ap brettw eric sam oldest_to_newest 144469 0 ukai 2009-09-03 02:41:26 -0700 Add webSocketEnabled flag in Settings to control WebSocket availability. 144470 1 38977 ukai 2009-09-03 02:47:09 -0700 Created attachment 38977 add webSocketEnabled in Settings --- 3 files changed, 23 insertions(+), 0 deletions(-) 144719 2 38977 eric 2009-09-04 00:25:16 -0700 Comment on attachment 38977 add webSocketEnabled in Settings Why? This doesn't do anything yet? Are there other web sockets code paths you're about to add? Generally we don't add dead code (unless it's about to be used...), which seems to be exactly what this patch is doing. 144722 3 ukai 2009-09-04 00:33:46 -0700 (In reply to comment #2) > (From update of attachment 38977 [details]) > Why? This doesn't do anything yet? Are there other web sockets code paths > you're about to add? Generally we don't add dead code (unless it's about to be > used...), which seems to be exactly what this patch is doing. I want this code to support --enable-web-sockets switch (in chromium). Will add hooks once WebSocket API code (bug 28038) is landed. 144767 4 mrowe 2009-09-04 02:32:25 -0700 Why is it necessary for this to be a runtime setting rather than a compile-time choice? 145394 5 eric 2009-09-08 09:43:48 -0700 I expect his response will be that "chromium makes all new features command-line switches, so they need to be run-time switchable." Chromium is constantly shipping from tip of tree (the developer branch) so in-progress features like this default to off, but can be enabled by passing command-line switches. 145440 6 brettw 2009-09-08 10:45:12 -0700 Eric is correct. We like to ship off trunk without worrying about half-completed features. On the dev channel, we can make a feature available for testing by interested devlopers, and still eventually push that build to stable without major changes. 145441 7 ap 2009-09-08 10:47:22 -0700 It would be nice to mention this policy on webkit-dev, along with some guidelines on when these runtime switches can be removed. 145446 8 eric 2009-09-08 10:52:08 -0700 Great minds think alike: http://groups.google.com/group/chromium-dev/browse_thread/thread/be626eabfdf0ca48 149835 9 38977 eric 2009-09-24 14:06:56 -0700 Comment on attachment 38977 add webSocketEnabled in Settings My understanding of the new policy is that this should have "experimental" in the name. 150486 10 40226 ukai 2009-09-28 04:46:58 -0700 Created attachment 40226 rename webSocketsEnabled to experimentalWebSocketEnabled 150580 11 40226 eric 2009-09-28 11:40:06 -0700 Comment on attachment 40226 rename webSocketsEnabled to experimentalWebSocketEnabled I dont' think the explicit resetDefaultsToConsistentValues reset calls are really necessary, but they're certainly not a bad idea either. LGTM. If you want this auto-committed, you'll need to set cq? as well. I can't remember if you're a committer yet or not. 150781 12 40226 commit-queue 2009-09-28 19:00:56 -0700 Comment on attachment 40226 rename webSocketsEnabled to experimentalWebSocketEnabled Rejecting patch 40226 from commit-queue. ukai@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py. 150782 13 ukai 2009-09-28 19:02:56 -0700 (In reply to comment #12) > (From update of attachment 40226 [details]) > Rejecting patch 40226 from commit-queue. > > ukai@chromium.org does not have committer permissions according to > http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py. Hmm, I was too early to set commit-queue+? 150788 14 40226 commit-queue 2009-09-28 20:31:48 -0700 Comment on attachment 40226 rename webSocketsEnabled to experimentalWebSocketEnabled Rejecting patch 40226 from commit-queue. ukai@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py. 150822 15 eric 2009-09-29 01:41:06 -0700 Clearly you did not use bugzilla-tool to do the commit, or run the layout tests, since it looks like you broke all platforms: http://build.webkit.org/changes/1106 http://build.webkit.org/waterfall :( Assuming I'm reading the buildbot output correctly. I'm going to roll out this patch. 150823 16 eric 2009-09-29 01:41:55 -0700 (In reply to comment #13) > (In reply to comment #12) > > (From update of attachment 40226 [details] [details]) > > Rejecting patch 40226 from commit-queue. > > > > ukai@chromium.org does not have committer permissions according to > > http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py. > > Hmm, I was too early to set commit-queue+? No, you just haven't added yourself to committers.py yet. You can't set commit-queue+ until you do. 150824 17 eric 2009-09-29 01:44:25 -0700 I'm glad to see that you have commit bit now! But please get another committer to walk you through your next commit, since there were several process errors here. Most notably, you did not watch the bots after committing. You also did not update the bug with the committed revision (yes, we need to document that somewhere). And you did not close the bug after committing. bugzilla-tool land-diff can do all of these things for you, although you're also welcome to perform the actions manually. 150825 18 ukai 2009-09-29 01:47:29 -0700 (In reply to comment #16) > (In reply to comment #13) > > (In reply to comment #12) > > > (From update of attachment 40226 [details] [details] [details]) > > > Rejecting patch 40226 from commit-queue. > > > > > > ukai@chromium.org does not have committer permissions according to > > > http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py. > > > > Hmm, I was too early to set commit-queue+? > > No, you just haven't added yourself to committers.py yet. You can't set > commit-queue+ until you do. I believe I added myself to committers.py (r48852) before I set commit-queue+... 150827 19 ukai 2009-09-29 01:50:42 -0700 (In reply to comment #15) > Clearly you did not use bugzilla-tool to do the commit, or run the layout > tests, since it looks like you broke all platforms: > http://build.webkit.org/changes/1106 > http://build.webkit.org/waterfall > > :( > > Assuming I'm reading the buildbot output correctly. > > I'm going to roll out this patch. Sorry, I've prepared a fix in http://bugs.webkit.org/show_bug.cgi?id=29840. Do you roll back this? If so, I'll merge the fix here. 150828 20 eric 2009-09-29 01:52:38 -0700 (In reply to comment #18) > I believe I added myself to committers.py (r48852) before I set > commit-queue+... Sorry, that's my fault. I was running the commit-queue in a way such that it was not auto-updating committers.py correctly. I've fixed that now. 150831 21 eric 2009-09-29 01:54:43 -0700 My apologies for my aggressive tone above. It was undeserved. Thank you for so quick a response! 150833 22 ukai 2009-09-29 02:01:19 -0700 (In reply to comment #21) > My apologies for my aggressive tone above. It was undeserved. Thank you for > so quick a response! No problem. I should be more carefully before I committed. Thanks for your help! 150834 23 ukai 2009-09-29 02:01:57 -0700 Landed as r48861 150952 24 sam 2009-09-29 10:43:48 -0700 I am confused why this flag is called experimentalWebSocketsEnabled (I see in one comment it was stated this is a new rule. Where was this rule established). Do we plan on changing the setting once the implementation is done? Does this work for things like "WebSocket" in window? window.hasOwnProperty("WebSocket")? 151147 25 ukai 2009-09-29 18:51:43 -0700 (In reply to comment #24) > I am confused why this flag is called experimentalWebSocketsEnabled (I see in > one comment it was stated this is a new rule. Where was this rule > established). In this thread? https://lists.webkit.org/pipermail/webkit-dev/2009-September/009881.html > Do we plan on changing the setting once the implementation is > done? Does this work for things like "WebSocket" in window? > window.hasOwnProperty("WebSocket")? I assumed a web developer would check with 'typeof window.WebSocket == "undefined"', as described in https://lists.webkit.org/pipermail/webkit-dev/2009-September/010000.html 38977 2009-09-03 02:47:09 -0700 2009-09-28 04:46:52 -0700 add webSocketEnabled in Settings bug-28941-20090903184707.patch text/plain 2497 ukai ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2I5YWNlNi4uZmZmNjVhNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0wOS0wMyAgRnVtaXRvc2hpIFVr YWkgIDx1a2FpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgd2ViU29ja2V0RW5hYmxlZCBpbiBTZXR0aW5ncy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4OTQxCisKKyAgICAg ICAgKiBwYWdlL1NldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0 aW5ncyk6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6c2V0V2ViU29ja2V0c0VuYWJsZWQp OgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdz Ojp3ZWJTb2NrZXRzRW5hYmxlZCk6CisKIDIwMDktMDktMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRz b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcCBiL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5j cHAKaW5kZXggMTMzZGQ5YS4uZTY0ZDYxMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL1NldHRp bmdzLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCkBAIC05Miw2ICs5Miw3IEBA IFNldHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBwYWdlKQogICAgICwgbV9sb2NhbEZpbGVDb250ZW50 U25pZmZpbmdFbmFibGVkKGZhbHNlKQogICAgICwgbV9pbkFwcGxpY2F0aW9uQ2hyb21lTW9kZShm YWxzZSkKICAgICAsIG1fb2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKGZhbHNlKQor ICAgICwgbV93ZWJTb2NrZXRzRW5hYmxlZChmYWxzZSkKICAgICAsIG1fc2hvdWxkUGFpbnRDdXN0 b21TY3JvbGxiYXJzKGZhbHNlKQogICAgICwgbV96b29tc1RleHRPbmx5KGZhbHNlKQogICAgICwg bV9lbmZvcmNlQ1NTTUlNRVR5cGVJblN0cmljdE1vZGUodHJ1ZSkKQEAgLTQzMyw2ICs0MzQsMTEg QEAgdm9pZCBTZXR0aW5nczo6c2V0T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKGJv b2wgZW5hYmxlZCkKICAgICBtX29mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCA9IGVu YWJsZWQ7CiB9CiAKK3ZvaWQgU2V0dGluZ3M6OnNldFdlYlNvY2tldHNFbmFibGVkKGJvb2wgZW5h YmxlZCkKK3sKKyAgICBtX3dlYlNvY2tldHNFbmFibGVkID0gZW5hYmxlZDsKK30KKwogdm9pZCBT ZXR0aW5nczo6c2V0U2hvdWxkUGFpbnRDdXN0b21TY3JvbGxiYXJzKGJvb2wgc2hvdWxkUGFpbnRD dXN0b21TY3JvbGxiYXJzKQogewogICAgIG1fc2hvdWxkUGFpbnRDdXN0b21TY3JvbGxiYXJzID0g c2hvdWxkUGFpbnRDdXN0b21TY3JvbGxiYXJzOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL1Nl dHRpbmdzLmggYi9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAppbmRleCA1NDRkMGQ1Li42ZmVkNzUx IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAorKysgYi9XZWJDb3JlL3BhZ2Uv U2V0dGluZ3MuaApAQCAtMjIwLDYgKzIyMCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgdm9pZCBzZXRPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQoYm9vbCk7CiAgICAg ICAgIGJvb2wgb2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkgY29uc3QgeyByZXR1 cm4gbV9vZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQ7IH0KIAorICAgICAgICB2b2lk IHNldFdlYlNvY2tldHNFbmFibGVkKGJvb2wpOworICAgICAgICBib29sIHdlYlNvY2tldHNFbmFi bGVkKCkgY29uc3QgeyByZXR1cm4gbV93ZWJTb2NrZXRzRW5hYmxlZDsgfQorCiAgICAgICAgIHZv aWQgc2V0U2hvdWxkUGFpbnRDdXN0b21TY3JvbGxiYXJzKGJvb2wpOwogICAgICAgICBib29sIHNo b3VsZFBhaW50Q3VzdG9tU2Nyb2xsYmFycygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkUGFpbnRD dXN0b21TY3JvbGxiYXJzOyB9CiAKQEAgLTMwOCw2ICszMTEsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIGJvb2wgbV9sb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkIDogMTsK ICAgICAgICAgYm9vbCBtX2luQXBwbGljYXRpb25DaHJvbWVNb2RlIDogMTsKICAgICAgICAgYm9v bCBtX29mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCA6IDE7CisgICAgICAgIGJvb2wg bV93ZWJTb2NrZXRzRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9zaG91bGRQYWludEN1c3Rv bVNjcm9sbGJhcnMgOiAxOwogICAgICAgICBib29sIG1fem9vbXNUZXh0T25seSA6IDE7CiAgICAg ICAgIGJvb2wgbV9lbmZvcmNlQ1NTTUlNRVR5cGVJblN0cmljdE1vZGUgOiAxOw== 40226 2009-09-28 04:46:58 -0700 2009-09-28 20:31:48 -0700 rename webSocketsEnabled to experimentalWebSocketEnabled bug-28941-20090928204656.patch text/plain 17486 ukai ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDM2ZmI1ZS4uZmZlMTExMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0wOS0yOCAgRnVtaXRvc2hpIFVr YWkgIDx1a2FpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgZXhwZXJpbWVudGFsV2ViU29ja2V0c0VuYWJsZWQgaW4gU2V0 dGluZ3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y ODk0MQorCisgICAgICAgICogV2ViQ29yZS5iYXNlLmV4cDoKKyAgICAgICAgKiBiaW5kaW5ncy9q cy9KU0RPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RPTVdpbmRvdzo6 d2ViU29ja2V0KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VjhET01XcmFwcGVyOjpnZXRDb25zdHJ1Y3Rvcik6CisgICAgICAgICog YmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViU29ja2V0Q3VzdG9tLmNwcDoKKyAgICAgICAgKiBwYWdl L1NldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpTZXR0aW5ncyk6Cisg ICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6c2V0RXhwZXJpbWVudGFsV2ViU29ja2V0c0VuYWJs ZWQpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRp bmdzOjpleHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZCk6CisKIDIwMDktMDktMjcgIFNhbSBX ZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0 ZWluLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwIGIvV2ViQ29yZS9XZWJD b3JlLmJhc2UuZXhwCmluZGV4IGEyMjliMDYuLjc1NDI3NDEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv V2ViQ29yZS5iYXNlLmV4cAorKysgYi9XZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAKQEAgLTY0NSw2 ICs2NDUsNyBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MyOXNldFdlYkFyY2hpdmVEZWJ1Z01vZGVF bmFibGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczMxc2V0U2hyaW5rc1N0YW5kYWxvbmVJbWFn ZXNUb0ZpdEViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzMnNldEFjY2VsZXJhdGVkQ29tcG9zaXRp bmdFbmFibGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczMyc2V0TmVlZHNBZG9iZUZyYW1lUmVs b2FkaW5nUXVpcmtFYgorX19aTjdXZWJDb3JlOFNldHRpbmdzMzJzZXRFeHBlcmltZW50YWxXZWJT b2NrZXRzRW5hYmxlZEViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzM3NldERvd25sb2FkYWJsZUJp bmFyeUZvbnRzRW5hYmxlZEViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzM3NldEVuZm9yY2VDU1NN SU1FVHlwZUluU3RyaWN0TW9kZUViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzNHNldExvY2FsRmls ZUNvbnRlbnRTbmlmZmluZ0VuYWJsZWRFYgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93 Q3VzdG9tLmNwcAppbmRleCAwOGM3MTQ0Li4wZTk0YWQ3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTRE9NV2luZG93Q3VzdG9tLmNwcApAQCAtNzIwLDYgKzcyMCwxNCBAQCBKU1ZhbHVlIEpTRE9N V2luZG93OjpzaGFyZWRXb3JrZXIoRXhlY1N0YXRlKiBleGVjKSBjb25zdAogI2lmIEVOQUJMRShX RUJfU09DS0VUUykKIEpTVmFsdWUgSlNET01XaW5kb3c6OndlYlNvY2tldChFeGVjU3RhdGUqIGV4 ZWMpIGNvbnN0CiB7CisgICAgRnJhbWUqIGZyYW1lID0gaW1wbCgpLT5mcmFtZSgpOworICAgIGlm ICghZnJhbWUpCisgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOworICAgIFNldHRpbmdzKiBz ZXR0aW5ncyA9IGZyYW1lLT5zZXR0aW5ncygpOworICAgIGlmICghc2V0dGluZ3MpCisgICAgICAg IHJldHVybiBqc1VuZGVmaW5lZCgpOworICAgIGlmICghc2V0dGluZ3MtPmV4cGVyaW1lbnRhbFdl YlNvY2tldHNFbmFibGVkKCkpCisgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogICAgIHJl dHVybiBnZXRET01Db25zdHJ1Y3RvcjxKU1dlYlNvY2tldENvbnN0cnVjdG9yPihleGVjLCB0aGlz KTsKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBw ZXIuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3BwCmluZGV4IDEwZGY4 NWMuLmFlYTg0YzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVy LmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5jcHAKQEAgLTU3OSw2 ICs1NzksMTYgQEAgdjg6OkxvY2FsPHY4OjpGdW5jdGlvbj4gVjhET01XcmFwcGVyOjpnZXRDb25z dHJ1Y3RvcihWOENsYXNzSW5kZXg6OlY4V3JhcHBlclR5cGUKICAgICBpZiAoIWZyYW1lKQogICAg ICAgICByZXR1cm4gdjg6OkxvY2FsPHY4OjpGdW5jdGlvbj4oKTsKIAorI2lmIEVOQUJMRShXRUJf U09DS0VUUykKKyAgICAvLyBNYWtlIHR5cGVvZih3aW5kb3cuV2ViU29ja2V0KSA9PSAndW5kZWZp bmVkJyB3aGVuCisgICAgLy8gZXhwZXJpbWVudGFsV2ViU29ja2V0RW5hYmxlZCBpcyBmYWxzZS4K KyAgICBpZiAodHlwZSA9PSBWOENsYXNzSW5kZXg6OldFQlNPQ0tFVCkgeworICAgICAgICBTZXR0 aW5ncyogc2V0dGluZ3MgPSBmcmFtZS0+c2V0dGluZ3MoKTsKKyAgICAgICAgaWYgKCFzZXR0aW5n cyB8fCAhc2V0dGluZ3MtPmV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFibGVkKCkpCisgICAgICAg ICAgICByZXR1cm4gdjg6OkxvY2FsPHY4OjpGdW5jdGlvbj4oKTsKKyAgICB9CisjZW5kaWYKKwog ICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQgPSBWOFByb3h5Ojpjb250ZXh0KGZy YW1lKTsKICAgICBpZiAoY29udGV4dC5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB2ODo6TG9j YWw8djg6OkZ1bmN0aW9uPigpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhXZWJTb2NrZXRDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhX ZWJTb2NrZXRDdXN0b20uY3BwCmluZGV4IGJhZjZlMGUuLjAyNDQxOWQgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4V2ViU29ja2V0Q3VzdG9tLmNwcAorKysgYi9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYlNvY2tldEN1c3RvbS5jcHAKQEAgLTM1LDYgKzM1 LDcgQEAKICNpbmNsdWRlICJXZWJTb2NrZXQuaCIKIAogI2luY2x1ZGUgIkZyYW1lLmgiCisjaW5j bHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKICNpbmNsdWRlICJWOE9i amVjdEV2ZW50TGlzdGVuZXIuaCIKICNpbmNsdWRlICJWOFByb3h5LmgiCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwIGIvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAppbmRl eCA3MDhkNTk1Li42NTE0NWY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3Bw CisrKyBiL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKQEAgLTExNyw2ICsxMTcsNyBAQCBTZXR0 aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkKICAgICAsIG1fYWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0VuYWJsZWQodHJ1ZSkKICAgICAsIG1fZXhwZXJpbWVudGFsTm90aWZpY2F0aW9uc0VuYWJsZWQo ZmFsc2UpCiAgICAgLCBtX3BsdWdpbkhhbHRlckVuYWJsZWQoZmFsc2UpCisgICAgLCBtX2V4cGVy aW1lbnRhbFdlYlNvY2tldHNFbmFibGVkKGZhbHNlKQogewogICAgIC8vIEEgRnJhbWUgbWF5IG5v dCBoYXZlIGJlZW4gY3JlYXRlZCB5ZXQsIHNvIHdlIGluaXRpYWxpemUgdGhlIEF0b21pY1N0cmlu ZyAKICAgICAvLyBoYXNoIGJlZm9yZSB0cnlpbmcgdG8gdXNlIGl0LgpAQCAtNTI4LDQgKzUyOSwx MSBAQCB2b2lkIFNldHRpbmdzOjpzZXRTaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyhib29s IHNob3VsZFVzZUhpZ2hSZXNvbHV0aW9uVGltZQogfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoV0VC X1NPQ0tFVFMpCit2b2lkIFNldHRpbmdzOjpzZXRFeHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxl ZChib29sIGVuYWJsZWQpCit7CisgICAgbV9leHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZCA9 IGVuYWJsZWQ7Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmggYi9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAppbmRl eCBiM2RhZjE5Li4yZTZiNGU2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAor KysgYi9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaApAQCAtMjY3LDYgKzI2NywxMSBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0UGx1Z2luQWxsb3dlZFJ1blRpbWUodW5zaWdu ZWQpOwogICAgICAgICB1bnNpZ25lZCBwbHVnaW5BbGxvd2VkUnVuVGltZSgpIGNvbnN0IHsgcmV0 dXJuIG1fcGx1Z2luQWxsb3dlZFJ1blRpbWU7IH0KIAorI2lmIEVOQUJMRShXRUJfU09DS0VUUykK KyAgICAgICAgdm9pZCBzZXRFeHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZChib29sKTsKKyAg ICAgICAgYm9vbCBleHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJu IG1fZXhwZXJpbWVudGFsV2ViU29ja2V0c0VuYWJsZWQ7IH0KKyNlbmRpZgorCiAgICAgcHJpdmF0 ZToKICAgICAgICAgUGFnZSogbV9wYWdlOwogICAgICAgICAKQEAgLTMzNSw2ICszNDAsMTAgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fZXhwZXJpbWVudGFsTm90aWZpY2F0 aW9uc0VuYWJsZWQgOiAxOwogICAgICAgICBib29sIG1fcGx1Z2luSGFsdGVyRW5hYmxlZCA6IDE7 CiAKKyNpZiBFTkFCTEUoV0VCX1NPQ0tFVFMpCisgICAgICAgIGJvb2wgbV9leHBlcmltZW50YWxX ZWJTb2NrZXRzRW5hYmxlZCA6IDE7CisjZW5kaWYKKwogI2lmIFVTRShTQUZBUklfVEhFTUUpCiAg ICAgICAgIHN0YXRpYyBib29sIGdTaG91bGRQYWludE5hdGl2ZUNvbnRyb2xzOwogI2VuZGlmCmRp ZmYgLS1naXQgYS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmlu ZGV4IDdmOTdmMGMuLmQ5MTM5YTQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDktMjggIEZ1 bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFi bGVkIGluIFdlYlByZWZlcmVuY2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Mjg5NDEKKworICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZUtl eXNQcml2YXRlLmg6CisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbToKKyAgICAg ICAgKCtbV2ViUHJlZmVyZW5jZXMgaW5pdGlhbGl6ZV0pOgorICAgICAgICAoLVtXZWJQcmVmZXJl bmNlcyBleHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZF0pOgorICAgICAgICAoLVtXZWJQcmVm ZXJlbmNlcyBzZXRFeHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZDpdKToKKyAgICAgICAgKiBX ZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmll dy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXNDaGFuZ2VkTm90aWZpY2F0aW9u Ol0pOgorCiAyMDA5LTA5LTI0ICBKb24gSG9uZXljdXR0ICA8amhvbmV5Y3V0dEBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxpY2UgTGl1LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oIGIvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCmluZGV4IDc3YmM3ZTguLmY3NGE4ZDAgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAorKysg Yi9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKQEAgLTU2LDYg KzU2LDcgQEAKICNkZWZpbmUgV2ViS2l0RGF0YWJhc2VzRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJX ZWJLaXREYXRhYmFzZXNFbmFibGVkUHJlZmVyZW5jZUtleSIKICNkZWZpbmUgV2ViS2l0TG9jYWxT dG9yYWdlRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRMb2NhbFN0b3JhZ2VFbmFibGVkUHJl ZmVyZW5jZUtleSIKICNkZWZpbmUgV2ViS2l0RXhwZXJpbWVudGFsTm90aWZpY2F0aW9uc0VuYWJs ZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0RXhwZXJpbWVudGFsTm90aWZpY2F0aW9uc0VuYWJsZWRQ cmVmZXJlbmNlS2V5IgorI2RlZmluZSBXZWJLaXRFeHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxl ZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRFeHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZFByZWZl cmVuY2VLZXkiCiAjZGVmaW5lIFdlYktpdEFsbG93QW5pbWF0ZWRJbWFnZXNQcmVmZXJlbmNlS2V5 IEAiV2ViS2l0QWxsb3dBbmltYXRlZEltYWdlc1ByZWZlcmVuY2VLZXkiCiAjZGVmaW5lIFdlYktp dEFsbG93QW5pbWF0ZWRJbWFnZUxvb3BpbmdQcmVmZXJlbmNlS2V5IEAiV2ViS2l0QWxsb3dBbmlt YXRlZEltYWdlTG9vcGluZ1ByZWZlcmVuY2VLZXkiCiAjZGVmaW5lIFdlYktpdERpc3BsYXlJbWFn ZXNLZXkgQCJXZWJLaXREaXNwbGF5SW1hZ2VzS2V5IgpkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVu Y2VzLm1tCmluZGV4IDY4YmVjNTQuLmQyZTE3YmEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJQcmVmZXJlbmNlcy5tbQorKysgYi9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVy ZW5jZXMubW0KQEAgLTMyMSw2ICszMjEsNyBAQCBzdGF0aWMgV2ViQ2FjaGVNb2RlbCBjYWNoZU1v ZGVsRm9yTWFpbkJ1bmRsZSh2b2lkKQogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6 WUVTXSwgIFdlYktpdERhdGFiYXNlc0VuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNO dW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktpdExvY2FsU3RvcmFnZUVuYWJsZWRQcmVm ZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktp dEV4cGVyaW1lbnRhbE5vdGlmaWNhdGlvbnNFbmFibGVkUHJlZmVyZW5jZUtleSwKKyAgICAgICAg W05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRFeHBlcmltZW50YWxXZWJTb2Nr ZXRzRW5hYmxlZFByZWZlcmVuY2VLZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9v bDpZRVNdLCAgV2ViS2l0QWxsb3dBbmltYXRlZEltYWdlc1ByZWZlcmVuY2VLZXksCiAgICAgICAg IFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdLCAgV2ViS2l0QWxsb3dBbmltYXRlZEltYWdl TG9vcGluZ1ByZWZlcmVuY2VLZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZ RVNdLCAgV2ViS2l0RGlzcGxheUltYWdlc0tleSwKQEAgLTEwMjIsNiArMTAyMywxNiBAQCBzdGF0 aWMgV2ViQ2FjaGVNb2RlbCBjYWNoZU1vZGVsRm9yTWFpbkJ1bmRsZSh2b2lkKQogICAgIFtzZWxm IF9zZXRCb29sVmFsdWU6ZXhwZXJpbWVudGFsTm90aWZpY2F0aW9uc0VuYWJsZWQgZm9yS2V5Oldl YktpdEV4cGVyaW1lbnRhbE5vdGlmaWNhdGlvbnNFbmFibGVkUHJlZmVyZW5jZUtleV07CiB9CiAK Ky0gKEJPT0wpZXhwZXJpbWVudGFsV2ViU29ja2V0c0VuYWJsZWQKK3sKKyAgICByZXR1cm4gW3Nl bGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRFeHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZFBy ZWZlcmVuY2VLZXldOworfQorCistICh2b2lkKXNldEV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFi bGVkOihCT09MKWV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFibGVkCit7CisgICAgW3NlbGYgX3Nl dEJvb2xWYWx1ZTpleHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZCBmb3JLZXk6V2ViS2l0RXhw ZXJpbWVudGFsV2ViU29ja2V0c0VuYWJsZWRQcmVmZXJlbmNlS2V5XTsKK30KKwogKyAoV2ViUHJl ZmVyZW5jZXMgKilfZ2V0SW5zdGFuY2VGb3JJZGVudGlmaWVyOihOU1N0cmluZyAqKWlkZW50CiB7 CiAgICAgTE9HKEVuY29kaW5nLCAicmVxdWVzdGluZyBmb3IgJUBcbiIsIGlkZW50KTsKZGlmZiAt LWdpdCBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaCBiL1dlYktp dC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCA3YTNlNWJjLi42NWY2 MGFkIDEwMDY0NAotLS0gYS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRl LmgKKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCkBAIC0x MTAsNiArMTEwLDkgQEAgZXh0ZXJuIE5TU3RyaW5nICpXZWJQcmVmZXJlbmNlc1JlbW92ZWROb3Rp ZmljYXRpb247CiAtIChCT09MKWV4cGVyaW1lbnRhbE5vdGlmaWNhdGlvbnNFbmFibGVkOwogLSAo dm9pZClzZXRFeHBlcmltZW50YWxOb3RpZmljYXRpb25zRW5hYmxlZDooQk9PTClub3RpZmljYXRp b25zRW5hYmxlZDsKIAorLSAoQk9PTClleHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZDsKKy0g KHZvaWQpc2V0RXhwZXJpbWVudGFsV2ViU29ja2V0c0VuYWJsZWQ6KEJPT0wpd2Vic29ja2V0c0Vu YWJsZWQ7CisKIC8vIHplcm8gbWVhbnMgZG8gQXV0b1NjYWxlCiAtIChmbG9hdClQREZTY2FsZUZh Y3RvcjsKIC0gKHZvaWQpc2V0UERGU2NhbGVGYWN0b3I6KGZsb2F0KXNjYWxlOwpkaWZmIC0tZ2l0 IGEvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQppbmRleCA3ZDQ0NWViLi5iMWI0MTY1IDEwMDY0NAotLS0gYS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViVmlldy5tbQorKysgYi9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAt MTI3OCw2ICsxMjc4LDcgQEAgc3RhdGljIGJvb2wgZmFzdERvY3VtZW50VGVhcmRvd25FbmFibGVk KCkKICAgICBzZXR0aW5ncy0+c2V0RGF0YWJhc2VzRW5hYmxlZChbcHJlZmVyZW5jZXMgZGF0YWJh c2VzRW5hYmxlZF0pOwogICAgIHNldHRpbmdzLT5zZXRMb2NhbFN0b3JhZ2VFbmFibGVkKFtwcmVm ZXJlbmNlcyBsb2NhbFN0b3JhZ2VFbmFibGVkXSk7CiAgICAgc2V0dGluZ3MtPnNldEV4cGVyaW1l bnRhbE5vdGlmaWNhdGlvbnNFbmFibGVkKFtwcmVmZXJlbmNlcyBleHBlcmltZW50YWxOb3RpZmlj YXRpb25zRW5hYmxlZF0pOworICAgIHNldHRpbmdzLT5zZXRFeHBlcmltZW50YWxXZWJTb2NrZXRz RW5hYmxlZChbcHJlZmVyZW5jZXMgZXhwZXJpbWVudGFsV2ViU29ja2V0c0VuYWJsZWRdKTsKICAg ICBzZXR0aW5ncy0+c2V0UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZChbcHJlZmVyZW5jZXMgcHJpdmF0 ZUJyb3dzaW5nRW5hYmxlZF0pOwogICAgIHNldHRpbmdzLT5zZXRTYW5zU2VyaWZGb250RmFtaWx5 KFtwcmVmZXJlbmNlcyBzYW5zU2VyaWZGb250RmFtaWx5XSk7CiAgICAgc2V0dGluZ3MtPnNldFNl cmlmRm9udEZhbWlseShbcHJlZmVyZW5jZXMgc2VyaWZGb250RmFtaWx5XSk7CmRpZmYgLS1naXQg YS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IDk0ZGI5 MWUuLmUxYTdiMzUgMTAwNjQ0Ci0tLSBhL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1dlYktp dC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDktMDktMjggIEZ1bWl0b3NoaSBV a2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIGV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFibGVkIGluIFdl YlByZWZlcmVuY2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Mjg5NDEKKworICAgICAgICAqIEludGVyZmFjZXMvSVdlYlByZWZlcmVuY2VzUHJpdmF0 ZS5pZGw6CisgICAgICAgICogV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmg6CisgICAgICAgICog V2ViUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViUHJlZmVyZW5jZXM6OmluaXRpYWxpemVE ZWZhdWx0U2V0dGluZ3MpOgorICAgICAgICAoV2ViUHJlZmVyZW5jZXM6OnNldEV4cGVyaW1lbnRh bFdlYlNvY2tldHNFbmFibGVkKToKKyAgICAgICAgKFdlYlByZWZlcmVuY2VzOjpleHBlcmltZW50 YWxXZWJTb2NrZXRzRW5hYmxlZCk6CisgICAgICAgICogV2ViUHJlZmVyZW5jZXMuaDoKKyAgICAg ICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6Om5vdGlmeVByZWZlcmVuY2VzQ2hh bmdlZCk6CisgICAgICAgIChjb3JlKToKKwogMjAwOS0wOS0yNSAgRGFyaW4gQWRsZXIgIDxkYXJp bkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU3RldmUgRmFsa2VuYnVyZy4KZGlm ZiAtLWdpdCBhL1dlYktpdC93aW4vSW50ZXJmYWNlcy9JV2ViUHJlZmVyZW5jZXNQcml2YXRlLmlk bCBiL1dlYktpdC93aW4vSW50ZXJmYWNlcy9JV2ViUHJlZmVyZW5jZXNQcml2YXRlLmlkbAppbmRl eCBlMjZkMDQyLi5kOTk0MjExIDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL0ludGVyZmFjZXMvSVdl YlByZWZlcmVuY2VzUHJpdmF0ZS5pZGwKKysrIGIvV2ViS2l0L3dpbi9JbnRlcmZhY2VzL0lXZWJQ cmVmZXJlbmNlc1ByaXZhdGUuaWRsCkBAIC04Miw2ICs4Miw5IEBAIGludGVyZmFjZSBJV2ViUHJl ZmVyZW5jZXNQcml2YXRlIDogSVVua25vd24KICAgICBIUkVTVUxUIGV4cGVyaW1lbnRhbE5vdGlm aWNhdGlvbnNFbmFibGVkKFtvdXQsIHJldHZhbF0gQk9PTCAqZW5hYmxlZCk7CiAgICAgSFJFU1VM VCBzZXRFeHBlcmltZW50YWxOb3RpZmljYXRpb25zRW5hYmxlZChbaW5dIEJPT0wgZW5hYmxlZCk7 CiAKKyAgICBIUkVTVUxUIGV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFibGVkKFtvdXQsIHJldHZh bF0gQk9PTCAqZW5hYmxlZCk7CisgICAgSFJFU1VMVCBzZXRFeHBlcmltZW50YWxXZWJTb2NrZXRz RW5hYmxlZChbaW5dIEJPT0wgZW5hYmxlZCk7CisKICAgICBIUkVTVUxUIHNldFNob3VsZFVzZUhp Z2hSZXNvbHV0aW9uVGltZXJzKFtpbl0gQk9PTCB1c2VIaWdoUmVzb2x1dGlvblRpbWVycyk7CiAg ICAgSFJFU1VMVCBzaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyhbb3V0LCByZXR2YWxdIEJP T0wqIHVzZUhpZ2hSZXNvbHV0aW9uVGltZXJzKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9X ZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaCBiL1dlYktpdC93aW4vV2ViUHJlZmVyZW5jZUtleXNQ cml2YXRlLmgKaW5kZXggNzE3MWNmMC4uZTBjMmI2ZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9X ZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAorKysgYi9XZWJLaXQvd2luL1dlYlByZWZlcmVuY2VL ZXlzUHJpdmF0ZS5oCkBAIC01NCw2ICs1NCw3IEBACiAjZGVmaW5lIFdlYktpdERhdGFiYXNlc0Vu YWJsZWRQcmVmZXJlbmNlS2V5ICJXZWJLaXREYXRhYmFzZXNFbmFibGVkIgogI2RlZmluZSBXZWJL aXRMb2NhbFN0b3JhZ2VFbmFibGVkUHJlZmVyZW5jZUtleSAiV2ViS2l0TG9jYWxTdG9yYWdlRW5h YmxlZCIKICNkZWZpbmUgV2ViS2l0RXhwZXJpbWVudGFsTm90aWZpY2F0aW9uc0VuYWJsZWRQcmVm ZXJlbmNlS2V5ICJXZWJLaXRFeHBlcmltZW50YWxOb3RpZmljYXRpb25zRW5hYmxlZCIKKyNkZWZp bmUgV2ViS2l0RXhwZXJpbWVudGFsV2ViU29ja2V0c0VuYWJsZWRQcmVmZXJlbmNlS2V5ICJXZWJL aXRFeHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0QWxsb3dBbmlt YXRlZEltYWdlc1ByZWZlcmVuY2VLZXkgIldlYktpdEFsbG93QW5pbWF0ZWRJbWFnZXNQcmVmZXJl bmNlS2V5IgogI2RlZmluZSBXZWJLaXRBbGxvd0FuaW1hdGVkSW1hZ2VMb29waW5nUHJlZmVyZW5j ZUtleSAiV2ViS2l0QWxsb3dBbmltYXRlZEltYWdlTG9vcGluZ1ByZWZlcmVuY2VLZXkiCiAjZGVm aW5lIFdlYktpdERpc3BsYXlJbWFnZXNLZXkgIldlYktpdERpc3BsYXlJbWFnZXNLZXkiCmRpZmYg LS1naXQgYS9XZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmNwcCBiL1dlYktpdC93aW4vV2ViUHJl ZmVyZW5jZXMuY3BwCmluZGV4IGUxYmE0MDcuLjRmOTQyYTUgMTAwNjQ0Ci0tLSBhL1dlYktpdC93 aW4vV2ViUHJlZmVyZW5jZXMuY3BwCisrKyBiL1dlYktpdC93aW4vV2ViUHJlZmVyZW5jZXMuY3Bw CkBAIC0yMTMsNiArMjEzLDcgQEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6aW5pdGlhbGl6ZURlZmF1 bHRTZXR0aW5ncygpCiAgICAgQ0ZEaWN0aW9uYXJ5QWRkVmFsdWUoZGVmYXVsdHMsIENGU1RSKFdl YktpdERhdGFiYXNlc0VuYWJsZWRQcmVmZXJlbmNlS2V5KSwga0NGQm9vbGVhblRydWUpOwogICAg IENGRGljdGlvbmFyeUFkZFZhbHVlKGRlZmF1bHRzLCBDRlNUUihXZWJLaXRMb2NhbFN0b3JhZ2VF bmFibGVkUHJlZmVyZW5jZUtleSksIGtDRkJvb2xlYW5UcnVlKTsKICAgICBDRkRpY3Rpb25hcnlB ZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0RXhwZXJpbWVudGFsTm90aWZpY2F0aW9uc0Vu YWJsZWRQcmVmZXJlbmNlS2V5KSwga0NGQm9vbGVhbkZhbHNlKTsKKyAgICBDRkRpY3Rpb25hcnlB ZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIoV2ViS2l0RXhwZXJpbWVudGFsV2ViU29ja2V0c0VuYWJs ZWRQcmVmZXJlbmNlS2V5KSwga0NGQm9vbGVhbkZhbHVzZSk7CiAgICAgQ0ZEaWN0aW9uYXJ5QWRk VmFsdWUoZGVmYXVsdHMsIENGU1RSKFdlYktpdEFsbG93QW5pbWF0ZWRJbWFnZXNQcmVmZXJlbmNl S2V5KSwga0NGQm9vbGVhblRydWUpOwogICAgIENGRGljdGlvbmFyeUFkZFZhbHVlKGRlZmF1bHRz LCBDRlNUUihXZWJLaXRBbGxvd0FuaW1hdGVkSW1hZ2VMb29waW5nUHJlZmVyZW5jZUtleSksIGtD RkJvb2xlYW5UcnVlKTsKICAgICBDRkRpY3Rpb25hcnlBZGRWYWx1ZShkZWZhdWx0cywgQ0ZTVFIo V2ViS2l0RGlzcGxheUltYWdlc0tleSksIGtDRkJvb2xlYW5UcnVlKTsKQEAgLTEzMTEsNiArMTMx MiwxOCBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlByZWZlcmVuY2VzOjpleHBlcmlt ZW50YWxOb3RpZmljYXRpb25zRW5hYmxlZChCT09MKgogICAgIHJldHVybiBTX09LOwogfQogCitI UkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlByZWZlcmVuY2VzOjpzZXRFeHBlcmltZW50YWxX ZWJTb2NrZXRzRW5hYmxlZChCT09MIGVuYWJsZWQpCit7CisgICAgc2V0Qm9vbFZhbHVlKENGU1RS KFdlYktpdEV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFibGVkUHJlZmVyZW5jZUtleSksIGVuYWJs ZWQpOworICAgIHJldHVybiBTX09LOworfQorCitIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdl YlByZWZlcmVuY2VzOjpleHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZChCT09MKiBlbmFibGVk KQoreworICAgICplbmFibGVkID0gYm9vbFZhbHVlRm9yS2V5KENGU1RSKFdlYktpdEV4cGVyaW1l bnRhbFdlYlNvY2tldHNFbmFibGVkUHJlZmVyZW5jZUtleSkpOworICAgIHJldHVybiBTX09LOwor fQorCiBIUkVTVUxUIFdlYlByZWZlcmVuY2VzOjpzZXRab29tc1RleHRPbmx5KEJPT0wgem9vbXNU ZXh0T25seSkKIHsKICAgICBzZXRCb29sVmFsdWUoQ0ZTVFIoV2ViS2l0Wm9vbXNUZXh0T25seVBy ZWZlcmVuY2VLZXkpLCB6b29tc1RleHRPbmx5KTsKZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2Vi UHJlZmVyZW5jZXMuaCBiL1dlYktpdC93aW4vV2ViUHJlZmVyZW5jZXMuaAppbmRleCBiNTM0Mjc3 Li4xNDAzNWQwIDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmgKKysrIGIv V2ViS2l0L3dpbi9XZWJQcmVmZXJlbmNlcy5oCkBAIC0zMzIsNiArMzMyLDEyIEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgc2V0RXhwZXJpbWVudGFsTm90 aWZpY2F0aW9uc0VuYWJsZWQoCiAgICAgICAgIC8qIFtpbl0gKi8gQk9PTCBlbmFibGVkKTsKIAor ICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBleHBlcmltZW50YWxXZWJTb2Nr ZXRzRW5hYmxlZCgKKyAgICAgICAgLyogW3JldHZhbF1bb3V0XSAqLyBCT09MICplbmFibGVkKTsK KworICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBzZXRFeHBlcmltZW50YWxX ZWJTb2NrZXRzRW5hYmxlZCgKKyAgICAgICAgLyogW2luXSAqLyBCT09MIGVuYWJsZWQpOworCiAg ICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIHNldFNob3VsZFBhaW50TmF0aXZl Q29udHJvbHMoIAogICAgIC8qIFtpbl0gKi8gQk9PTCBzaG91bGRQYWludCk7CiAKZGlmZiAtLWdp dCBhL1dlYktpdC93aW4vV2ViVmlldy5jcHAgYi9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCmluZGV4 IGViM2EwZjMuLjg5ZTQ2ODggMTAwNjQ0Ci0tLSBhL1dlYktpdC93aW4vV2ViVmlldy5jcHAKKysr IGIvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcApAQCAtNDQwOSw2ICs0NDA5LDExIEBAIEhSRVNVTFQg V2ViVmlldzo6bm90aWZ5UHJlZmVyZW5jZXNDaGFuZ2VkKElXZWJOb3RpZmljYXRpb24qIG5vdGlm aWNhdGlvbikKICAgICAgICAgcmV0dXJuIGhyOwogICAgIHNldHRpbmdzLT5zZXRFeHBlcmltZW50 YWxOb3RpZmljYXRpb25zRW5hYmxlZChlbmFibGVkKTsKIAorICAgIGhyID0gcHJlZnNQcml2YXRl LT5leHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZCgmZW5hYmxlZCk7CisgICAgaWYgKEZBSUxF RChocikpCisgICAgICAgIHJldHVybiBocjsKKyAgICBzZXR0aW5ncy0+c2V0RXhwZXJpbWVudGFs V2ViU29ja2V0c0VuYWJsZWQoZW5hYmxlZCk7CisKICAgICBociA9IHByZWZzUHJpdmF0ZS0+aXNX ZWJTZWN1cml0eUVuYWJsZWQoJmVuYWJsZWQpOwogICAgIGlmIChGQUlMRUQoaHIpKQogICAgICAg ICByZXR1cm4gaHI7CkBAIC01NjI1LDQgKzU2MzAsMyBAQCBQYWdlKiBjb3JlKElXZWJWaWV3KiBp V2ViVmlldykKIAogICAgIHJldHVybiBwYWdlOwogfQotCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggZWIyOGMzZi4uN2IyN2Nm YSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDA5LTA5LTI4ICBGdW1pdG9zaGkgVWthaSAgPHVr YWlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBleHBlcmltZW50YWxXZWJTb2NrZXRzRW5hYmxlZCBpbiBXZWJQcmVmZXJl bmNlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4 OTQxCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW06Cisg ICAgICAgIChyZXNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzKToKKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAocmVzZXREZWZhdWx0 c1RvQ29uc2lzdGVudFZhbHVlcyk6CisKIDIwMDktMDktMjcgIEpha3ViIFdpZWN6b3JlayAgPGZh dzIxN0BnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0g Yi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KaW5kZXgg ZTc3NTg3Zi4uNzFlZTdiYyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv bWFjL0R1bXBSZW5kZXJUcmVlLm1tCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21h Yy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAtNDA3LDYgKzQwNyw3IEBAIHN0YXRpYyB2b2lkIHJlc2V0 RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMoKQogICAgIFtwcmVmZXJlbmNlcyBzZXRDYWNoZU1v ZGVsOldlYkNhY2hlTW9kZWxEb2N1bWVudEJyb3dzZXJdOwogICAgIFtwcmVmZXJlbmNlcyBzZXRY U1NBdWRpdG9yRW5hYmxlZDpOT107CiAgICAgW3ByZWZlcmVuY2VzIHNldEV4cGVyaW1lbnRhbE5v dGlmaWNhdGlvbnNFbmFibGVkOk5PXTsKKyAgICBbcHJlZmVyZW5jZXMgc2V0RXhwZXJpbWVudGFs V2ViU29ja2V0c0VuYWJsZWQ6Tk9dOwogCiAgICAgW3ByZWZlcmVuY2VzIHNldFByaXZhdGVCcm93 c2luZ0VuYWJsZWQ6Tk9dOwogICAgIFtwcmVmZXJlbmNlcyBzZXRBdXRob3JBbmRVc2VyU3R5bGVz RW5hYmxlZDpZRVNdOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2lu L0R1bXBSZW5kZXJUcmVlLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1w UmVuZGVyVHJlZS5jcHAKaW5kZXggZTg5MTA1Ni4uZTQ3YzdlOCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9XZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCkBAIC03MzcsNiArNzM3 LDcgQEAgc3RhdGljIHZvaWQgcmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlcyhJV2ViUHJl ZmVyZW5jZXMqIHByZWZlcmVuY2VzKQogICAgICAgICBwcmVmc1ByaXZhdGUtPnNldEF1dGhvckFu ZFVzZXJTdHlsZXNFbmFibGVkKFRSVUUpOwogICAgICAgICBwcmVmc1ByaXZhdGUtPnNldERldmVs b3BlckV4dHJhc0VuYWJsZWQoRkFMU0UpOwogICAgICAgICBwcmVmc1ByaXZhdGUtPnNldEV4cGVy aW1lbnRhbE5vdGlmaWNhdGlvbnNFbmFibGVkKFRSVUUpOworICAgICAgICBwcmVmc1ByaXZhdGUt PnNldEV4cGVyaW1lbnRhbFdlYlNvY2tldHNFbmFibGVkKEZBTFNFKTsKICAgICAgICAgcHJlZnNQ cml2YXRlLT5zZXRTaG91bGRQYWludE5hdGl2ZUNvbnRyb2xzKEZBTFNFKTsgLy8gRklYTUUgLSBu ZWVkIHRvIG1ha2UgRFJUIHBhc3Mgd2l0aCBXaW5kb3dzIG5hdGl2ZSBjb250cm9scyA8aHR0cDov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU1OTI+CiAgICAgICAgIHByZWZzUHJp dmF0ZS0+c2V0WFNTQXVkaXRvckVuYWJsZWQoRkFMU0UpOwogICAgICAgICBwcmVmc1ByaXZhdGUt PnNldE9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChUUlVFKTs=