155497 2016-03-15 11:32:48 -0700 [GTK] WebInspector broken after r197620 2016-03-22 10:26:12 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Critical --- 155745 1 alex alex adam.bergkvist andersca bburg bugs-noreply cgarcia commit-queue darin dbates graouts joepeck mattbaker mcatanzaro nvasilyev pnormand sam oldest_to_newest 1175019 0 alex 2016-03-15 11:32:48 -0700 I get these errors when I try to open it: resource:///org/webkitgtk/inspector/UserInterface/Base/Setting.js:61:44: CONSOLE ERROR SecurityError: DOM Exception 18: An attempt was made to break through the security policy of the user agent. resource:///org/webkitgtk/inspector/UserInterface/Main.html:1:21: CONSOLE ERROR ReferenceError: Can't find variable: InspectorFrontendAPI resource:///org/webkitgtk/inspector/UserInterface/Main.html:1:21: CONSOLE ERROR ReferenceError: Can't find variable: InspectorFrontendAPI resource:///org/webkitgtk/inspector/UserInterface/Main.html:1:21: CONSOLE ERROR ReferenceError: Can't find variable: InspectorFrontendAPI resource:///org/webkitgtk/inspector/UserInterface/Main.html:1:21: CONSOLE ERROR ReferenceError: Can't find variable: InspectorFrontendAPI resource:///org/webkitgtk/inspector/UserInterface/Protocol/InspectorBackendCommands.js:32:17: CONSOLE ERROR ReferenceError: Can't find variable: InspectorBackend 1175020 1 webkit-bug-importer 2016-03-15 11:34:11 -0700 <rdar://problem/25171910> 1175032 2 timothy 2016-03-15 12:06:24 -0700 You likely need the same change that landed for Mac to fix this. See bug 155265. http://trac.webkit.org/changeset/197920/trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 1175718 3 274289 alex 2016-03-17 06:16:57 -0700 Created attachment 274289 Patch 1175725 4 274289 cgarcia 2016-03-17 06:55:25 -0700 Comment on attachment 274289 Patch This patch is correct, because we register resource scheme as local, but I think that was a mistake in the first place. A GResources is not like a local file, you can't replace by another file, for example, they are inmutable, always available and never fail to load. So, I think we should stop doing considering resource:// as local, which should also fix this problem. 1175727 5 274291 cgarcia 2016-03-17 06:56:51 -0700 Created attachment 274291 Alternative patch This is an alternative approach to stop considering resource:// as local. 1176114 6 274291 pnormand 2016-03-18 01:34:46 -0700 Comment on attachment 274291 Alternative patch View in context: https://bugs.webkit.org/attachment.cgi?id=274291&action=review > Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm:833 > +bool WebInspectorProxy::isValidInspectorURL(const URL& url) > +{ > + return url.isLocalFile(); > +} Shouldn't this rather use WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal() ? 1176116 7 cgarcia 2016-03-18 01:42:43 -0700 (In reply to comment #6) > Comment on attachment 274291 [details] > Alternative patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=274291&action=review > > > Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm:833 > > +bool WebInspectorProxy::isValidInspectorURL(const URL& url) > > +{ > > + return url.isLocalFile(); > > +} > > Shouldn't this rather use > WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal() ? No, we changed that for GTK+ when we started to use GResources for the inspector, so now that we no longer consider GResources as local, we can bring back the previous code. 1176207 8 alex 2016-03-18 10:18:49 -0700 (In reply to comment #4) > Comment on attachment 274289 [details] > Patch > > This patch is correct, because we register resource scheme as local, but I > think that was a mistake in the first place. A GResources is not like a > local file, you can't replace by another file, for example, they are > inmutable, always available and never fail to load. So, I think we should > stop doing considering resource:// as local, which should also fix this > problem. I sounds like a better approach to me, thanks. 1176699 9 274291 pnormand 2016-03-21 05:04:17 -0700 Comment on attachment 274291 Alternative patch Alright then, looks good to me! 1176700 10 cgarcia 2016-03-21 05:07:59 -0700 (In reply to comment #9) > Comment on attachment 274291 [details] > Alternative patch > > Alright then, looks good to me! Thanks! This requires WebKit2 owner approval, since I'm changing WebKit2 cross-platform code 1176803 11 274291 darin 2016-03-21 12:09:50 -0700 Comment on attachment 274291 Alternative patch View in context: https://bugs.webkit.org/attachment.cgi?id=274291&action=review Why add these functions just so we can make assertions? Lets just remove the assertions and not add the functions. > Source/WebKit2/UIProcess/WebInspectorProxy.h:61 > +}; Semicolon here is incorrect. 1176944 12 cgarcia 2016-03-22 02:35:08 -0700 (In reply to comment #11) > Comment on attachment 274291 [details] > Alternative patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=274291&action=review > > Why add these functions just so we can make assertions? Lets just remove the > assertions and not add the functions. There's also one actual check, and then the two assertions. But I think we can indeed get rid of it entirely, since then we are comparing the given URL with the platform provided main URL, so the initial check looks like an optimization that is never actually happening. > > Source/WebKit2/UIProcess/WebInspectorProxy.h:61 > > +}; > > Semicolon here is incorrect. 1176951 13 274646 cgarcia 2016-03-22 05:16:15 -0700 Created attachment 274646 Patch for landing. Darin, please set cq+ if you are ok with this. 1177026 14 274646 commit-queue 2016-03-22 10:26:05 -0700 Comment on attachment 274646 Patch for landing. Clearing flags on attachment: 274646 Committed r198532: <http://trac.webkit.org/changeset/198532> 1177028 15 commit-queue 2016-03-22 10:26:12 -0700 All reviewed patches have been landed. Closing bug. 274289 2016-03-17 06:16:57 -0700 2016-03-21 01:12:07 -0700 Patch bug-155497-20160317141645.patch text/plain 1775 alex U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4MzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTA1ZjVjNjVkZDcyYjUx OWU3NTIyZDlkM2VkNDdlMmVlNmRiOTgxOS4uZmI0ZDJjM2FiYzliNDkzMzcxNWQ2ZmJjYzcyZmI0 OWM4MzcyYTk3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTAzLTE3ICBBbGVq YW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFdlYklu c3BlY3RvciBicm9rZW4gYWZ0ZXIgcjE5NzYyMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2UgaGF2ZSB1c2VkIHRoZSBzYW1lIHdvcmthcm91bmQgQXBw bGUgaXMgdXNpbmcgYW5kIGFsbG93aW5nCisgICAgICAgIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJv bUZpbGVVUkxzLiBXZSBoYXZlIHJlcGxhY2VkIHRoZSBsaW5lIHdpdGgKKyAgICAgICAgdGhlIG9s ZCBhbGxvdyBmaWxlcywgaW4gdGhlb3J5IGl0IGlzIG5vdCByZXF1aXJlZCBmb3IgdXMgYW55bW9y ZQorICAgICAgICBub3cgdGhhdCB3ZSB1c2UgcmVzb3VyY2UuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5z cGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSk6CisKIDIwMTYtMDMtMTcg IEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIEVuYWJsZSBD b250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50IHNhbmRib3gKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKaW5kZXggMmMw ZTE0NTQ0OWYzNjA5Mzg2MzQ2YTE0ZDk0ZWU1OWM5ZTkwY2JmNi4uNGIyMmM1ZDI0NDNkYzY5NTlk YmNlMjE3NGE4NzBmMzk0NTRjNzI0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKQEAgLTc0LDcgKzc0LDcgQEAgV2Vi UGFnZVByb3h5KiBXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdl KCkKICAgICBwcmVmZXJlbmNlcy0+c2V0RGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCh0cnVlKTsKICAg ICBwcmVmZXJlbmNlcy0+c2V0TG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQo dHJ1ZSk7CiAjZW5kaWYKLSAgICBwcmVmZXJlbmNlcy0+c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZp bGVVUkxzKHRydWUpOworICAgIHByZWZlcmVuY2VzLT5zZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zy b21GaWxlVVJMcyh0cnVlKTsKICAgICBwcmVmZXJlbmNlcy0+c2V0SmF2YVNjcmlwdFJ1bnRpbWVG bGFncyh7CiAgICAgfSk7CiAgICAgUmVmUHRyPFdlYlBhZ2VHcm91cD4gcGFnZUdyb3VwID0gV2Vi UGFnZUdyb3VwOjpjcmVhdGUoaW5zcGVjdG9yUGFnZUdyb3VwSWRlbnRpZmllcigpLCBmYWxzZSwg ZmFsc2UpOwo= 274291 2016-03-17 06:56:51 -0700 2016-03-22 05:16:15 -0700 Alternative patch wk2-inspector-files.diff text/plain 8383 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3Mjg1YjA5Li4zNTQ5NWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTYtMDMtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIFdlYkluc3BlY3RvciBicm9rZW4gYWZ0ZXIgcjE5NzYyMAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NDk3CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yNTE3MTkxMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgcmVzb3VyY2Ugc2NoZW1lIHRvIHRoZSBsaXN0IG9m IHNlY3VyZSBwcm90b2NvbHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY2hlbWVSZWdpc3RyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpzZWN1cmVTY2hlbWVzKToKKworMjAxNi0wMy0xNyAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgUkVHUkVT U0lPTihyMTk1NjYxKTogW0dUS10gdmVyeSBzbG93IHNjcm9sbGluZwogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1MzM0CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1NjaGVtZVJlZ2lzdHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1NjaGVtZVJlZ2lzdHJ5LmNwcAppbmRleCBlNWY3M2IyLi40ZTFkNWU1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY2hlbWVSZWdpc3RyeS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2NoZW1lUmVnaXN0cnkuY3BwCkBAIC02Niw2ICs2Niw5 IEBAIHN0YXRpYyBVUkxTY2hlbWVzTWFwJiBzZWN1cmVTY2hlbWVzKCkKICNpZiBVU0UoUVVJQ0tf TE9PSykKICAgICAgICAgc2VjdXJlU2NoZW1lcy5nZXQoKS5hZGQoUUxQcmV2aWV3UHJvdG9jb2wo KSk7CiAjZW5kaWYKKyNpZiBQTEFURk9STShHVEspCisgICAgICAgIHNlY3VyZVNjaGVtZXMuZ2V0 KCkuYWRkKCJyZXNvdXJjZSIpOworI2VuZGlmCiAgICAgfQogCiAgICAgcmV0dXJuIHNlY3VyZVNj aGVtZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmRmYzFkNC4uZDg3ODVjMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDM1IEBACisyMDE2LTAzLTE3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdh bGlhLmNvbT4KKworICAgICAgICBbR1RLXSBXZWJJbnNwZWN0b3IgYnJva2VuIGFmdGVyIHIxOTc2 MjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTQ5 NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjUxNzE5MTA+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCByZWdpc3RlcmluZyByZXNvdXJjZTov LyBVUkxzIGFzIGxvY2FsLCBiZWNhdXNlIHRoZXkgYXJlIG5vdAorICAgICAgICBsaWtlIGEgbG9j YWwgZmlsZSBhdCBhbGwuIEFkZCBhIG5ldyBtZXRob2QgaXNWYWxpZEluc3BlY3RvclVSTCgpCisg ICAgICAgIGltcGxlbWVudGVkIGJ5IGV2ZXJ5IHBvcnQgYW5kIHVzZWQgaW5zdGVhZCBvZgorICAg ICAgICBTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxTY2hlbWVBc0xvY2FsKCkgd2hlbiBj aGVja2luZworICAgICAgICBpbnNwZWN0b3IgVVJMcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OmlzTWFpbk9yVGVzdEluc3Bl Y3RvclBhZ2UpOiBVc2UgaXNWYWxpZEluc3BlY3RvclVSTCgpLgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJJbnNwZWN0b3JQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViSW5zcGVj dG9yUHJveHlFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6aXNW YWxpZEluc3BlY3RvclVSTCk6IFJldHVybiB0cnVlIGZvcgorICAgICAgICBsb2NhbCBmaWxlcy4K KyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OmlzVmFsaWRJbnNwZWN0b3JVUkwpOiBSZXR1 cm4gdHJ1ZSBmb3IKKyAgICAgICAgcmVzb3VyY2U6Ly8gVVJMcy4KKyAgICAgICAgKFdlYktpdDo6 V2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSk6IERvIG5vdAor ICAgICAgICBzZXQgc2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzIHNldHRpbmcgdG8gdHJ1 ZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NQb29sR3RrLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3Mp OiBEbyBub3QKKyAgICAgICAgcmVnaXN0ZXIgcmVzb3VyY2U6Ly8gVVJMUyBhcyBsb2NhbC4KKyAg ICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tOgorICAgICAgICAo V2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6aXNWYWxpZEluc3BlY3RvclVSTCk6IFJldHVybiB0 cnVlIGZvcgorICAgICAgICBsb2NhbCBmaWxlcy4KKwogMjAxNi0wMy0xNiAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gVXBk YXRlIE9wdGlvbnNHVEsuY21ha2UgYW5kIE5FV1MgZm9yIDIuMTEuOTIgcmVsZWFzZS4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCmluZGV4IDZkZmNk ZTguLjZmMmEzYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNw ZWN0b3JQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3Rv clByb3h5LmNwcApAQCAtNDMsNyArNDMsNiBAQAogI2luY2x1ZGUgIldlYlByb2Nlc3NQb29sLmgi CiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9Ob3RJbXBs ZW1lbnRlZC5oPgotI2luY2x1ZGUgPFdlYkNvcmUvU2NoZW1lUmVnaXN0cnkuaD4KICNpbmNsdWRl IDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogI2lmIEVOQUJMRShJTlNQRUNUT1JfU0VSVkVSKQpA QCAtMzMzLDEyICszMzIsMTIgQEAgYm9vbCBXZWJJbnNwZWN0b3JQcm94eTo6aXNJbnNwZWN0b3JQ YWdlKFdlYlBhZ2VQcm94eSYgd2ViUGFnZSkKIHN0YXRpYyBib29sIGlzTWFpbk9yVGVzdEluc3Bl Y3RvclBhZ2UoV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3RSZWYpCiB7CiAgICAgVVJMIHJlcXVlc3RV UkwoVVJMKCksIHRvSW1wbChyZXF1ZXN0UmVmKS0+cmVzb3VyY2VSZXF1ZXN0KCkudXJsKCkpOwot ICAgIGlmICghV2ViQ29yZTo6U2NoZW1lUmVnaXN0cnk6OnNob3VsZFRyZWF0VVJMU2NoZW1lQXNM b2NhbChyZXF1ZXN0VVJMLnByb3RvY29sKCkpKQorICAgIGlmICghV2ViSW5zcGVjdG9yUHJveHk6 OmlzVmFsaWRJbnNwZWN0b3JVUkwocmVxdWVzdFVSTCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIC8vIFVzZSBVUkwgc28gd2UgY2FuIGNvbXBhcmUganVzdCB0aGUgcGF0aHMuCiAgICAg VVJMIG1haW5QYWdlVVJMKFVSTCgpLCBXZWJJbnNwZWN0b3JQcm94eTo6aW5zcGVjdG9yUGFnZVVS TCgpKTsKLSAgICBBU1NFUlQoV2ViQ29yZTo6U2NoZW1lUmVnaXN0cnk6OnNob3VsZFRyZWF0VVJM U2NoZW1lQXNMb2NhbChtYWluUGFnZVVSTC5wcm90b2NvbCgpKSk7CisgICAgQVNTRVJUKFdlYklu c3BlY3RvclByb3h5Ojppc1ZhbGlkSW5zcGVjdG9yVVJMKG1haW5QYWdlVVJMKSk7CiAgICAgaWYg KGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyhyZXF1ZXN0VVJMLnBhdGgoKSkgPT0gZGVjb2RlVVJM RXNjYXBlU2VxdWVuY2VzKG1haW5QYWdlVVJMLnBhdGgoKSkpCiAgICAgICAgIHJldHVybiB0cnVl OwogCkBAIC0zNDgsNyArMzQ3LDcgQEAgc3RhdGljIGJvb2wgaXNNYWluT3JUZXN0SW5zcGVjdG9y UGFnZShXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdFJlZikKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgVVJMIHRlc3RQYWdlVVJMKFVSTCgpLCB0ZXN0UGFnZVVSTFN0cmluZyk7Ci0gICAgQVNT RVJUKFdlYkNvcmU6OlNjaGVtZVJlZ2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwo dGVzdFBhZ2VVUkwucHJvdG9jb2woKSkpOworICAgIEFTU0VSVChXZWJJbnNwZWN0b3JQcm94eTo6 aXNWYWxpZEluc3BlY3RvclVSTCh0ZXN0UGFnZVVSTCkpOwogICAgIHJldHVybiBkZWNvZGVVUkxF c2NhcGVTZXF1ZW5jZXMocmVxdWVzdFVSTC5wYXRoKCkpID09IGRlY29kZVVSTEVzY2FwZVNlcXVl bmNlcyh0ZXN0UGFnZVVSTC5wYXRoKCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJJbnNwZWN0b3JQcm94eS5oCmluZGV4IGNmZmEyNjYuLjY3YzI0M2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCkBAIC01Niw2ICs1NiwxMCBA QCBPQkpDX0NMQVNTIFdLV2ViSW5zcGVjdG9yV0tXZWJWaWV3OwogI2luY2x1ZGUgPEV2YXMuaD4K ICNlbmRpZgogCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBVUkw7Cit9OworCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViRnJhbWVQcm94eTsKQEAgLTE0MSw2ICsxNDUsNyBAQCBw dWJsaWM6CiAgICAgc3RhdGljIFN0cmluZyBpbnNwZWN0b3JQYWdlVVJMKCk7CiAgICAgc3RhdGlj IFN0cmluZyBpbnNwZWN0b3JUZXN0UGFnZVVSTCgpOwogICAgIHN0YXRpYyBTdHJpbmcgaW5zcGVj dG9yQmFzZVVSTCgpOworICAgIHN0YXRpYyBib29sIGlzVmFsaWRJbnNwZWN0b3JVUkwoY29uc3Qg V2ViQ29yZTo6VVJMJik7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SX1NFUlZFUikKICAgICB2b2lk IGVuYWJsZVJlbW90ZUluc3BlY3Rpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5jcHAKaW5kZXggMjEzMjI0Ni4uNzk0Mjdj YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQ cm94eUVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0 b3JQcm94eUVmbC5jcHAKQEAgLTE5OSw2ICsxOTksMTEgQEAgU3RyaW5nIFdlYkluc3BlY3RvclBy b3h5OjppbnNwZWN0b3JCYXNlVVJMKCkKICAgICByZXR1cm4gYnVpbGRlci50b1N0cmluZygpOwog fQogCitib29sIFdlYkluc3BlY3RvclByb3h5Ojppc1ZhbGlkSW5zcGVjdG9yVVJMKGNvbnN0IFdl YkNvcmU6OlVSTCYgdXJsKQoreworICAgIHJldHVybiB1cmwuaXNMb2NhbEZpbGUoKTsKK30KKwog dW5zaWduZWQgV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtSW5zcGVjdGVkV2luZG93SGVpZ2h0 KCkKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcAppbmRleCAyYzBlMTQ1Li5kZWI4 NGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3Rv clByb3h5R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3Bl Y3RvclByb3h5R3RrLmNwcApAQCAtNzQsNyArNzQsNiBAQCBXZWJQYWdlUHJveHkqIFdlYkluc3Bl Y3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UoKQogICAgIHByZWZlcmVuY2Vz LT5zZXREZXZlbG9wZXJFeHRyYXNFbmFibGVkKHRydWUpOwogICAgIHByZWZlcmVuY2VzLT5zZXRM b2dzUGFnZU1lc3NhZ2VzVG9TeXN0ZW1Db25zb2xlRW5hYmxlZCh0cnVlKTsKICNlbmRpZgotICAg IHByZWZlcmVuY2VzLT5zZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHModHJ1ZSk7CiAgICAg cHJlZmVyZW5jZXMtPnNldEphdmFTY3JpcHRSdW50aW1lRmxhZ3MoewogICAgIH0pOwogICAgIFJl ZlB0cjxXZWJQYWdlR3JvdXA+IHBhZ2VHcm91cCA9IFdlYlBhZ2VHcm91cDo6Y3JlYXRlKGluc3Bl Y3RvclBhZ2VHcm91cElkZW50aWZpZXIoKSwgZmFsc2UsIGZhbHNlKTsKQEAgLTI2Niw2ICsyNjUs MTEgQEAgU3RyaW5nIFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JCYXNlVVJMKCkKICAgICBy ZXR1cm4gU3RyaW5nKCJyZXNvdXJjZTovLy9vcmcvd2Via2l0Z3RrL2luc3BlY3Rvci9Vc2VySW50 ZXJmYWNlLyIpOwogfQogCitib29sIFdlYkluc3BlY3RvclByb3h5Ojppc1ZhbGlkSW5zcGVjdG9y VVJMKGNvbnN0IFdlYkNvcmU6OlVSTCYgdXJsKQoreworICAgIHJldHVybiB1cmwucHJvdG9jb2xJ cygicmVzb3VyY2UiKTsKK30KKwogdW5zaWduZWQgV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3Jt SW5zcGVjdGVkV2luZG93SGVpZ2h0KCkKIHsKICAgICByZXR1cm4gZ3RrX3dpZGdldF9nZXRfYWxs b2NhdGVkX2hlaWdodChpbnNwZWN0ZWRQYWdlKCktPnZpZXdXaWRnZXQoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlByb2Nlc3NQb29sR3RrLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUHJvY2Vzc1Bvb2xHdGsuY3BwCmluZGV4IGQ4 MjZhMDE4Li40ZWZjZTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3Rr L1dlYlByb2Nlc3NQb29sR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3Rr L1dlYlByb2Nlc3NQb29sR3RrLmNwcApAQCAtODksMTIgKzg5LDYgQEAgV1RGOjpTdHJpbmcgV2Vi UHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rv cnkoKQogdm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcyhX ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogICAgIGluaXRJbnNw ZWN0b3JTZXJ2ZXIoKTsKLQotICAgIGlmICghcGFyYW1ldGVycy51cmxTY2hlbWVzUmVnaXN0ZXJl ZEFzTG9jYWwuY29udGFpbnMoInJlc291cmNlIikpIHsKLSAgICAgICAgV2ViQ29yZTo6U2NoZW1l UmVnaXN0cnk6OnJlZ2lzdGVyVVJMU2NoZW1lQXNMb2NhbCgicmVzb3VyY2UiKTsKLSAgICAgICAg cGFyYW1ldGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlZEFzTG9jYWwuYXBwZW5kKCJyZXNvdXJjZSIp OwotICAgIH0KLQogICAgIHBhcmFtZXRlcnMubWVtb3J5Q2FjaGVEaXNhYmxlZCA9IG1fbWVtb3J5 Q2FjaGVEaXNhYmxlZCB8fCBjYWNoZU1vZGVsKCkgPT0gQ2FjaGVNb2RlbERvY3VtZW50Vmlld2Vy OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3Bl Y3RvclByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0 b3JQcm94eU1hYy5tbQppbmRleCA3NjBiNzI2Li4wNmY3MmNjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW0KQEAgLTgyNyw2 ICs4MjcsMTEgQEAgU3RyaW5nIFdlYkluc3BlY3RvclByb3h5OjppbnNwZWN0b3JCYXNlVVJMKCkK ICAgICByZXR1cm4gW1tOU1VSTCBmaWxlVVJMV2l0aFBhdGg6cGF0aF0gYWJzb2x1dGVTdHJpbmdd OwogfQogCitib29sIFdlYkluc3BlY3RvclByb3h5Ojppc1ZhbGlkSW5zcGVjdG9yVVJMKGNvbnN0 IFVSTCYgdXJsKQoreworICAgIHJldHVybiB1cmwuaXNMb2NhbEZpbGUoKTsKK30KKwogfSAvLyBu YW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBQTEFURk9STShNQUMpICYmIFdLX0FQSV9FTkFC TEVECg== 274646 2016-03-22 05:16:15 -0700 2016-03-22 10:26:05 -0700 Patch for landing. wk2-inspector-url.diff text/plain 6134 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxODVjY2VmLi43YTA4ZWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTYtMDMtMjIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFdlYkluc3BlY3RvciBicm9rZW4gYWZ0ZXIgcjE5NzYyMAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NDk3CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yNTE3MTkxMD4KKworICAgICAgICBSZXZpZXdlZCBieSBQaGls aXBwZSBOb3JtYW5kLgorCisgICAgICAgIEFkZCByZXNvdXJjZSBzY2hlbWUgdG8gdGhlIGxpc3Qg b2Ygc2VjdXJlIHByb3RvY29scy4KKworICAgICAgICAqIHBsYXRmb3JtL1NjaGVtZVJlZ2lzdHJ5 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNlY3VyZVNjaGVtZXMpOgorCiAyMDE2LTAzLTIyICBa YW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbVGV4dHVyZU1h cHBlcl0gRGVzdHJ1Y3RpbmcgVGV4dHVyZU1hcHBlckxheWVyIHNob3VsZCBjbGVhbiB1cCBpdHMg ZWZmZWN0IHRhcmdldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2NoZW1l UmVnaXN0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2NoZW1lUmVnaXN0cnkuY3Bw CmluZGV4IGU1ZjczYjIuLjRlMWQ1ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1NjaGVtZVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY2hl bWVSZWdpc3RyeS5jcHAKQEAgLTY2LDYgKzY2LDkgQEAgc3RhdGljIFVSTFNjaGVtZXNNYXAmIHNl Y3VyZVNjaGVtZXMoKQogI2lmIFVTRShRVUlDS19MT09LKQogICAgICAgICBzZWN1cmVTY2hlbWVz LmdldCgpLmFkZChRTFByZXZpZXdQcm90b2NvbCgpKTsKICNlbmRpZgorI2lmIFBMQVRGT1JNKEdU SykKKyAgICAgICAgc2VjdXJlU2NoZW1lcy5nZXQoKS5hZGQoInJlc291cmNlIik7CisjZW5kaWYK ICAgICB9CiAKICAgICByZXR1cm4gc2VjdXJlU2NoZW1lczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA2OGQyNzI0 Li41ZWQ1MDZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE2LTAzLTIyICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBX ZWJJbnNwZWN0b3IgYnJva2VuIGFmdGVyIHIxOTc2MjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTQ5NworICAgICAgICA8cmRhcjovL3Byb2JsZW0v MjUxNzE5MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUGhpbGlwcGUgTm9ybWFuZC4KKworICAg ICAgICBTdG9wIHJlZ2lzdGVyaW5nIHJlc291cmNlOi8vIFVSTHMgYXMgbG9jYWwsIGJlY2F1c2Ug dGhleSBhcmUgbm90CisgICAgICAgIGxpa2UgYSBsb2NhbCBmaWxlIGF0IGFsbC4gQ29tcGFyZSBh bHNvIHRoZSBVUkwgcHJvdG9jb2xzIHdoZW4KKyAgICAgICAgY2hlY2tpbmcgd2hldGhlciByZXF1 ZXN0ZWQgVVJMIGlzIG1haW4gb3IgdGVzdCBpbnNwZWN0b3IgcGFnZQorICAgICAgICBpbnN0ZWFk IG9mIGNoZWNraW5nIHRoYXQgdGhlIHByb3RvY29sIGlzIHJlZ2lzdGVyZWQgYXMgbG9jYWwuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0Ojppc01haW5PclRlc3RJbnNwZWN0b3JQYWdlKTogQ29tcGFyZSBhbHNvIHRoZSBVUkwgcHJv dG9jb2xzLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKTogRG8g bm90CisgICAgICAgIHNldCBzZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgc2V0dGluZyB0 byB0cnVlLgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViUHJvY2Vzc1Bvb2xHdGsuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJv Y2Vzcyk6IERvIG5vdAorICAgICAgICByZWdpc3RlciByZXNvdXJjZTovLyBVUkxTIGFzIGxvY2Fs LgorCiAyMDE2LTAzLTIyICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbQ29vcmRpbmF0ZWRHcmFwaGljc10gUG9saXNoIHN0ZDo6ZnVuY3Rpb248PiB1c2Fn ZSBpbiBUaHJlYWRlZENvbXBvc2l0b3IsIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKaW5kZXggNmRmY2Rl OC4uZmE4NGFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3Bl Y3RvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9y UHJveHkuY3BwCkBAIC00Myw3ICs0Myw2IEBACiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2wuaCIK ICNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxl bWVudGVkLmg+Ci0jaW5jbHVkZSA8V2ViQ29yZS9TY2hlbWVSZWdpc3RyeS5oPgogI2luY2x1ZGUg PHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCkBA IC0zMzIsMTQgKzMzMSwxMCBAQCBib29sIFdlYkluc3BlY3RvclByb3h5Ojppc0luc3BlY3RvclBh Z2UoV2ViUGFnZVByb3h5JiB3ZWJQYWdlKQogCiBzdGF0aWMgYm9vbCBpc01haW5PclRlc3RJbnNw ZWN0b3JQYWdlKFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0UmVmKQogewotICAgIFVSTCByZXF1ZXN0 VVJMKFVSTCgpLCB0b0ltcGwocmVxdWVzdFJlZiktPnJlc291cmNlUmVxdWVzdCgpLnVybCgpKTsK LSAgICBpZiAoIVdlYkNvcmU6OlNjaGVtZVJlZ2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFz TG9jYWwocmVxdWVzdFVSTC5wcm90b2NvbCgpKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0g ICAgLy8gVXNlIFVSTCBzbyB3ZSBjYW4gY29tcGFyZSBqdXN0IHRoZSBwYXRocy4KKyAgICAvLyBV c2UgVVJMIHNvIHdlIGNhbiBjb21wYXJlIHRoZSBwYXRocyBhbmQgcHJvdG9jb2xzLgorICAgIGNv bnN0IFVSTCYgcmVxdWVzdFVSTCA9IHRvSW1wbChyZXF1ZXN0UmVmKS0+cmVzb3VyY2VSZXF1ZXN0 KCkudXJsKCk7CiAgICAgVVJMIG1haW5QYWdlVVJMKFVSTCgpLCBXZWJJbnNwZWN0b3JQcm94eTo6 aW5zcGVjdG9yUGFnZVVSTCgpKTsKLSAgICBBU1NFUlQoV2ViQ29yZTo6U2NoZW1lUmVnaXN0cnk6 OnNob3VsZFRyZWF0VVJMU2NoZW1lQXNMb2NhbChtYWluUGFnZVVSTC5wcm90b2NvbCgpKSk7Ci0g ICAgaWYgKGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyhyZXF1ZXN0VVJMLnBhdGgoKSkgPT0gZGVj b2RlVVJMRXNjYXBlU2VxdWVuY2VzKG1haW5QYWdlVVJMLnBhdGgoKSkpCisgICAgaWYgKHJlcXVl c3RVUkwucHJvdG9jb2woKSA9PSBtYWluUGFnZVVSTC5wcm90b2NvbCgpICYmIGRlY29kZVVSTEVz Y2FwZVNlcXVlbmNlcyhyZXF1ZXN0VVJMLnBhdGgoKSkgPT0gZGVjb2RlVVJMRXNjYXBlU2VxdWVu Y2VzKG1haW5QYWdlVVJMLnBhdGgoKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8g V2UgbWlnaHQgbm90IGhhdmUgYSBUZXN0IFVSTCBpbiBQcm9kdWN0aW9uIGJ1aWxkcy4KQEAgLTM0 OCw4ICszNDMsNyBAQCBzdGF0aWMgYm9vbCBpc01haW5PclRlc3RJbnNwZWN0b3JQYWdlKFdLVVJM UmVxdWVzdFJlZiByZXF1ZXN0UmVmKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBVUkwg dGVzdFBhZ2VVUkwoVVJMKCksIHRlc3RQYWdlVVJMU3RyaW5nKTsKLSAgICBBU1NFUlQoV2ViQ29y ZTo6U2NoZW1lUmVnaXN0cnk6OnNob3VsZFRyZWF0VVJMU2NoZW1lQXNMb2NhbCh0ZXN0UGFnZVVS TC5wcm90b2NvbCgpKSk7Ci0gICAgcmV0dXJuIGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyhyZXF1 ZXN0VVJMLnBhdGgoKSkgPT0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHRlc3RQYWdlVVJMLnBh dGgoKSk7CisgICAgcmV0dXJuIHJlcXVlc3RVUkwucHJvdG9jb2woKSA9PSB0ZXN0UGFnZVVSTC5w cm90b2NvbCgpICYmIGRlY29kZVVSTEVzY2FwZVNlcXVlbmNlcyhyZXF1ZXN0VVJMLnBhdGgoKSkg PT0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHRlc3RQYWdlVVJMLnBhdGgoKSk7CiB9CiAKIHN0 YXRpYyB2b2lkIHByb2Nlc3NEaWRDcmFzaChXS1BhZ2VSZWYsIGNvbnN0IHZvaWQqIGNsaWVudElu Zm8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3Rv clByb3h5R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9y UHJveHlHdGsuY3BwCmluZGV4IDJjMGUxNDUuLjc3NjAwOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwCkBAIC03NCw3 ICs3NCw2IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRl SW5zcGVjdG9yUGFnZSgpCiAgICAgcHJlZmVyZW5jZXMtPnNldERldmVsb3BlckV4dHJhc0VuYWJs ZWQodHJ1ZSk7CiAgICAgcHJlZmVyZW5jZXMtPnNldExvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNv bnNvbGVFbmFibGVkKHRydWUpOwogI2VuZGlmCi0gICAgcHJlZmVyZW5jZXMtPnNldEFsbG93Rmls ZUFjY2Vzc0Zyb21GaWxlVVJMcyh0cnVlKTsKICAgICBwcmVmZXJlbmNlcy0+c2V0SmF2YVNjcmlw dFJ1bnRpbWVGbGFncyh7CiAgICAgfSk7CiAgICAgUmVmUHRyPFdlYlBhZ2VHcm91cD4gcGFnZUdy b3VwID0gV2ViUGFnZUdyb3VwOjpjcmVhdGUoaW5zcGVjdG9yUGFnZUdyb3VwSWRlbnRpZmllcigp LCBmYWxzZSwgZmFsc2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0 ay9XZWJQcm9jZXNzUG9vbEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dl YlByb2Nlc3NQb29sR3RrLmNwcAppbmRleCBkODI2YTAxOC4uNGVmY2UzOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0ay5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0ay5jcHAKQEAgLTg5 LDEyICs4OSw2IEBAIFdURjo6U3RyaW5nIFdlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURl ZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBs YXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYg cGFyYW1ldGVycykKIHsKICAgICBpbml0SW5zcGVjdG9yU2VydmVyKCk7Ci0KLSAgICBpZiAoIXBh cmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZWRBc0xvY2FsLmNvbnRhaW5zKCJyZXNvdXJjZSIp KSB7Ci0gICAgICAgIFdlYkNvcmU6OlNjaGVtZVJlZ2lzdHJ5OjpyZWdpc3RlclVSTFNjaGVtZUFz TG9jYWwoInJlc291cmNlIik7Ci0gICAgICAgIHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVy ZWRBc0xvY2FsLmFwcGVuZCgicmVzb3VyY2UiKTsKLSAgICB9Ci0KICAgICBwYXJhbWV0ZXJzLm1l bW9yeUNhY2hlRGlzYWJsZWQgPSBtX21lbW9yeUNhY2hlRGlzYWJsZWQgfHwgY2FjaGVNb2RlbCgp ID09IENhY2hlTW9kZWxEb2N1bWVudFZpZXdlcjsKIH0KIAo=