165241 2016-11-30 21:40:24 -0800 Stop using WebCore::Dictionary in bindings for Fetch 2019-01-15 17:10:35 -0800 1 1 1 Unclassified WebKit Bindings WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 darin darin cdumez commit-queue esprehn+autocc kondapallykalyan sam oldest_to_newest 1255146 0 darin 2016-11-30 21:40:24 -0800 Stop using WebCore::Dictionary in bindings for Fetch 1255160 1 295822 darin 2016-11-30 22:49:15 -0800 Created attachment 295822 Patch 1255263 2 295822 cdumez 2016-12-01 09:11:04 -0800 Comment on attachment 295822 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=295822&action=review r=me > Source/WebCore/Modules/fetch/FetchRequest.idl:37 > +dictionary RequestInit { Should be add a FIXME comment to indicate we are missing: HeadersInit headers; BodyInit? body; > Source/WebCore/Modules/fetch/FetchRequest.idl:46 > + any window; The spec has the following comment: // can only be set to null which I think would be useful to have. 1255607 3 295822 darin 2016-12-01 20:14:49 -0800 Comment on attachment 295822 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=295822&action=review >> Source/WebCore/Modules/fetch/FetchRequest.idl:37 >> +dictionary RequestInit { > > Should be add a FIXME comment to indicate we are missing: > HeadersInit headers; > BodyInit? body; Heh, I had that in an earlier version of this patch. >> Source/WebCore/Modules/fetch/FetchRequest.idl:46 >> + any window; > > The spec has the following comment: > // can only be set to null > > which I think would be useful to have. Also had this, and decided to remove it. I will add it back. 1255619 4 darin 2016-12-01 21:31:30 -0800 Committed r209231: <http://trac.webkit.org/changeset/209231> 295822 2016-11-30 22:49:15 -0800 2019-01-15 17:10:35 -0800 Patch bug-165241-20161130224847.patch text/plain 18527 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5MTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDBlNTM2ZDRiNWI0NjJh MGUxZWJmZGEwZTdjZjFlM2UzNDUwZmI4My4uOWFiOGFmOTMxMGM3NTgwNTQ0ZDQ2MDUyOWNiMzll ODc5OTMwYmVhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE2LTExLTMwICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBTdG9wIHVzaW5nIFdlYkNvcmU6 OkRpY3Rpb25hcnkgaW4gYmluZGluZ3MgZm9yIEZldGNoCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjUyNDEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvZmV0Y2gvRE9NV2luZG93RmV0Y2gu aWRsOiBVc2UgUmVxdWVzdEluaXQgaW5zdGVhZCBvZiBEaWN0aW9uYXJ5LgorICAgICAgICBObyBl ZmZlY3Qgb24gY29kZSBnZW5lcmF0ZWQgc2luY2UgdGhpcyBpcyBhIEpTQnVpbHRpbi4KKworICAg ICAgICAqIE1vZHVsZXMvZmV0Y2gvRmV0Y2hSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnNldFJlZmVycmVyUG9saWN5KTogRGVsZXRlZC4gQmluZGluZ3MgaGFuZGxlIHRoaXMgbm93Lgor ICAgICAgICAoV2ViQ29yZTo6c2V0TW9kZSk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6c2V0 Q3JlZGVudGlhbHMpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OnNldENhY2hlKTogRGl0dG8u CisgICAgICAgIChXZWJDb3JlOjpzZXRSZWRpcmVjdCk6IERpdHRvLgorICAgICAgICAoV2ViQ29y ZTo6c2V0UmVmZXJyZXIpOiBDaGFuZ2VkIGFyZ3VtZW50IGZyb20gRGljdGlvbmFyeSB0byBTdHJp bmcuCisgICAgICAgIChXZWJDb3JlOjpidWlsZE9wdGlvbnMpOiBDaGFuZ2VkIGFyZ3VtZW50IGZy b20gRGljdGlvbmFyeSB0byBGZXRjaFJlcXVlc3Q6OkluaXQsCisgICAgICAgIGFuZCBzaW1wbGlm aWVkIHRoZSBjb2RlIGFjY29yZGluZ2x5LgorICAgICAgICAoV2ViQ29yZTo6RmV0Y2hSZXF1ZXN0 Ojppbml0aWFsaXplT3B0aW9ucyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RmV0Y2hSZXF1 ZXN0Ojppbml0aWFsaXplV2l0aCk6IERpdHRvLgorICAgICAgICAqIE1vZHVsZXMvZmV0Y2gvRmV0 Y2hSZXF1ZXN0Lmg6IFVwZGF0ZWQgZm9yIGFib3ZlIGNoYW5nZXMuIEFsc28gYWRkZWQgdGhlIElu aXQgc3RydWN0LgorCisgICAgICAgICogTW9kdWxlcy9mZXRjaC9GZXRjaFJlcXVlc3QuaWRsOiBB ZGRlZCBtaXNzaW5nICJvbmx5LWlmLWNhY2hlZCIgdmFsdWUgdG8gUmVxdWVzdENhY2hlLgorICAg ICAgICBBZGRlZCBSZXF1ZXN0SW5pdCBkaWN0aW9uYXJ5IGFuZCB1c2VkIGl0IGluc3RlYWQgb2Yg RGljdGlvbmFyeS4gVXNlZCBtb3JlLXNwZWNpZmljIHN0cmluZworICAgICAgICB0eXBlcyBmb3Ig dGhlIG1ldGhvZCBhbmQgcmVmZXJyZXIgYXR0cmlidXRlczsgbm8gZWZmZWN0IGF0IHJ1bnRpbWUs IHNpbmNlIHRoZSBjb2RlIGZvcgorICAgICAgICBnZXR0ZXJzIGlzIHRoZSBzYW1lIGZvciBCeXRl U3RyaW5nLCBVU1ZTdHJpbmcsIGFuZCBET01TdHJpbmcgYW5kIHRoZXNlIGFyZSByZWFkLW9ubHku CisKKyAgICAgICAgKiBNb2R1bGVzL2ZldGNoL1dvcmtlckdsb2JhbFNjb3BlRmV0Y2guaWRsOiBV c2UgUmVxdWVzdEluaXQgaW5zdGVhZCBvZiBEaWN0aW9uYXJ5LgorICAgICAgICBObyBlZmZlY3Qg b24gY29kZSBnZW5lcmF0ZWQgc2luY2UgdGhpcyBpcyBhIEpTQnVpbHRpbi4KKwogMjAxNi0xMS0z MCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFtNb2Rlcm4g TWVkaWEgQ29udHJvbHNdIEFkZCBzdXBwb3J0IGZvciByaWdodC10by1sZWZ0IGxheW91dHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRE9NV2luZG93RmV0Y2guaWRs IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9ET01XaW5kb3dGZXRjaC5pZGwKaW5kZXgg NzI1MTNlYjgwZGM0ZTI3N2I5NTg2ZmNlM2QxMDI5YmRlNzU2Zjk0MC4uMmM5NGVkMzkzYzYwZjVi YTFhZWUzN2VhNWU1N2FjYWQzNDEyMjZiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9mZXRjaC9ET01XaW5kb3dGZXRjaC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9mZXRjaC9ET01XaW5kb3dGZXRjaC5pZGwKQEAgLTMwLDcgKzMwLDYgQEAKICAgICBDb25kaXRp b25hbD1GRVRDSF9BUEksCiAgICAgRW5hYmxlZEF0UnVudGltZT1GZXRjaEFQSSwKIF0gcGFydGlh bCBpbnRlcmZhY2UgRE9NV2luZG93IHsKLSAgICBbSlNCdWlsdGluXSBQcm9taXNlPFJlc3BvbnNl PiBmZXRjaChhbnkgaW5wdXQsIG9wdGlvbmFsIERpY3Rpb25hcnkgaW5pdCk7Ci0KKyAgICBbSlNC dWlsdGluXSBQcm9taXNlPFJlc3BvbnNlPiBmZXRjaChhbnkgaW5wdXQsIG9wdGlvbmFsIFJlcXVl c3RJbml0IGluaXQpOwogICAgIFtQcml2YXRlSWRlbnRpZmllciwgSW1wbGVtZW50ZWRBcz1mZXRj aF0gUHJvbWlzZTxSZXNwb25zZT4gZmV0Y2hSZXF1ZXN0KEZldGNoUmVxdWVzdCByZXF1ZXN0KTsK IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoUmVxdWVz dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoUmVxdWVzdC5jcHAKaW5k ZXggYWQxOTgwNWRjYjk5OGQzOWRhNDhmZTU3YmZiZTYzOTA0OTlmZjc3Mi4uNTMyNjgzM2IwZTNm NmQ3Y2QwMzhlYjUwZjNkYzMwYzRmM2NlOTdlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9mZXRjaC9GZXRjaFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvZmV0Y2gvRmV0Y2hSZXF1ZXN0LmNwcApAQCAtMzEsNyArMzEsNiBAQAogCiAjaWYgRU5BQkxF KEZFVENIX0FQSSkKIAotI2luY2x1ZGUgIkRpY3Rpb25hcnkuaCIKICNpbmNsdWRlICJFeGNlcHRp b25Db2RlLmgiCiAjaW5jbHVkZSAiSFRUUFBhcnNlcnMuaCIKICNpbmNsdWRlICJTY3JpcHRFeGVj dXRpb25Db250ZXh0LmgiCkBAIC0zOSw4NSArMzgsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKLXN0YXRpYyBzdGQ6Om9wdGlvbmFsPEV4Y2VwdGlvbj4gc2V0UmVmZXJyZXJQb2xpY3koRmV0 Y2hPcHRpb25zJiBvcHRpb25zLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyUG9saWN5KQotewotICAg IGlmIChyZWZlcnJlclBvbGljeS5pc0VtcHR5KCkpCi0gICAgICAgIG9wdGlvbnMucmVmZXJyZXJQ b2xpY3kgPSBGZXRjaE9wdGlvbnM6OlJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZzsKLSAgICBl bHNlIGlmIChyZWZlcnJlclBvbGljeSA9PSAibm8tcmVmZXJyZXIiKQotICAgICAgICBvcHRpb25z LnJlZmVycmVyUG9saWN5ID0gRmV0Y2hPcHRpb25zOjpSZWZlcnJlclBvbGljeTo6Tm9SZWZlcnJl cjsKLSAgICBlbHNlIGlmIChyZWZlcnJlclBvbGljeSA9PSAibm8tcmVmZXJyZXItd2hlbi1kb3du Z3JhZGUiKQotICAgICAgICBvcHRpb25zLnJlZmVycmVyUG9saWN5ID0gRmV0Y2hPcHRpb25zOjpS ZWZlcnJlclBvbGljeTo6Tm9SZWZlcnJlcldoZW5Eb3duZ3JhZGU7Ci0gICAgZWxzZSBpZiAocmVm ZXJyZXJQb2xpY3kgPT0gIm9yaWdpbiIpCi0gICAgICAgIG9wdGlvbnMucmVmZXJyZXJQb2xpY3kg PSBGZXRjaE9wdGlvbnM6OlJlZmVycmVyUG9saWN5OjpPcmlnaW47Ci0gICAgZWxzZSBpZiAocmVm ZXJyZXJQb2xpY3kgPT0gIm9yaWdpbi13aGVuLWNyb3NzLW9yaWdpbiIpCi0gICAgICAgIG9wdGlv bnMucmVmZXJyZXJQb2xpY3kgPSBGZXRjaE9wdGlvbnM6OlJlZmVycmVyUG9saWN5OjpPcmlnaW5X aGVuQ3Jvc3NPcmlnaW47Ci0gICAgZWxzZSBpZiAocmVmZXJyZXJQb2xpY3kgPT0gInVuc2FmZS11 cmwiKQotICAgICAgICBvcHRpb25zLnJlZmVycmVyUG9saWN5ID0gRmV0Y2hPcHRpb25zOjpSZWZl cnJlclBvbGljeTo6VW5zYWZlVXJsOwotICAgIGVsc2UKLSAgICAgICAgcmV0dXJuIEV4Y2VwdGlv biB7IFR5cGVFcnJvciwgQVNDSUlMaXRlcmFsKCJCYWQgcmVmZXJyZXIgcG9saWN5IHZhbHVlLiIp IH07Ci0gICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLX0KLQotc3RhdGljIHN0ZDo6b3B0aW9uYWw8 RXhjZXB0aW9uPiBzZXRNb2RlKEZldGNoT3B0aW9ucyYgb3B0aW9ucywgY29uc3QgU3RyaW5nJiBt b2RlKQotewotICAgIGlmIChtb2RlID09ICJuYXZpZ2F0ZSIpCi0gICAgICAgIG9wdGlvbnMubW9k ZSA9IEZldGNoT3B0aW9uczo6TW9kZTo6TmF2aWdhdGU7Ci0gICAgZWxzZSBpZiAobW9kZSA9PSAi c2FtZS1vcmlnaW4iKQotICAgICAgICBvcHRpb25zLm1vZGUgPSBGZXRjaE9wdGlvbnM6Ok1vZGU6 OlNhbWVPcmlnaW47Ci0gICAgZWxzZSBpZiAobW9kZSA9PSAibm8tY29ycyIpCi0gICAgICAgIG9w dGlvbnMubW9kZSA9IEZldGNoT3B0aW9uczo6TW9kZTo6Tm9Db3JzOwotICAgIGVsc2UgaWYgKG1v ZGUgPT0gImNvcnMiKQotICAgICAgICBvcHRpb25zLm1vZGUgPSBGZXRjaE9wdGlvbnM6Ok1vZGU6 OkNvcnM7Ci0gICAgZWxzZQotICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgVHlwZUVycm9yLCBB U0NJSUxpdGVyYWwoIkJhZCBmZXRjaCBtb2RlIHZhbHVlLiIpIH07Ci0gICAgcmV0dXJuIHN0ZDo6 bnVsbG9wdDsKLX0KLQotc3RhdGljIHN0ZDo6b3B0aW9uYWw8RXhjZXB0aW9uPiBzZXRDcmVkZW50 aWFscyhGZXRjaE9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IFN0cmluZyYgY3JlZGVudGlhbHMpCi17 Ci0gICAgaWYgKGNyZWRlbnRpYWxzID09ICJvbWl0IikKLSAgICAgICAgb3B0aW9ucy5jcmVkZW50 aWFscyA9IEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6Ok9taXQ7Ci0gICAgZWxzZSBpZiAoY3Jl ZGVudGlhbHMgPT0gInNhbWUtb3JpZ2luIikKLSAgICAgICAgb3B0aW9ucy5jcmVkZW50aWFscyA9 IEZldGNoT3B0aW9uczo6Q3JlZGVudGlhbHM6OlNhbWVPcmlnaW47Ci0gICAgZWxzZSBpZiAoY3Jl ZGVudGlhbHMgPT0gImluY2x1ZGUiKQotICAgICAgICBvcHRpb25zLmNyZWRlbnRpYWxzID0gRmV0 Y2hPcHRpb25zOjpDcmVkZW50aWFsczo6SW5jbHVkZTsKLSAgICBlbHNlCi0gICAgICAgIHJldHVy biBFeGNlcHRpb24geyBUeXBlRXJyb3IsIEFTQ0lJTGl0ZXJhbCgiQmFkIGNyZWRlbnRpYWxzIG1v ZGUgdmFsdWUuIikgfTsKLSAgICByZXR1cm4gc3RkOjpudWxsb3B0OwotfQotCi1zdGF0aWMgc3Rk OjpvcHRpb25hbDxFeGNlcHRpb24+IHNldENhY2hlKEZldGNoT3B0aW9ucyYgb3B0aW9ucywgY29u c3QgU3RyaW5nJiBjYWNoZSkKLXsKLSAgICBpZiAoY2FjaGUgPT0gImRlZmF1bHQiKQotICAgICAg ICBvcHRpb25zLmNhY2hlID0gRmV0Y2hPcHRpb25zOjpDYWNoZTo6RGVmYXVsdDsKLSAgICBlbHNl IGlmIChjYWNoZSA9PSAibm8tc3RvcmUiKQotICAgICAgICBvcHRpb25zLmNhY2hlID0gRmV0Y2hP cHRpb25zOjpDYWNoZTo6Tm9TdG9yZTsKLSAgICBlbHNlIGlmIChjYWNoZSA9PSAicmVsb2FkIikK LSAgICAgICAgb3B0aW9ucy5jYWNoZSA9IEZldGNoT3B0aW9uczo6Q2FjaGU6OlJlbG9hZDsKLSAg ICBlbHNlIGlmIChjYWNoZSA9PSAibm8tY2FjaGUiKQotICAgICAgICBvcHRpb25zLmNhY2hlID0g RmV0Y2hPcHRpb25zOjpDYWNoZTo6Tm9DYWNoZTsKLSAgICBlbHNlIGlmIChjYWNoZSA9PSAiZm9y Y2UtY2FjaGUiKQotICAgICAgICBvcHRpb25zLmNhY2hlID0gRmV0Y2hPcHRpb25zOjpDYWNoZTo6 Rm9yY2VDYWNoZTsKLSAgICBlbHNlIGlmIChjYWNoZSA9PSAib25seS1pZi1jYWNoZWQiKQotICAg ICAgICBvcHRpb25zLmNhY2hlID0gRmV0Y2hPcHRpb25zOjpDYWNoZTo6T25seUlmQ2FjaGVkOwot ICAgIGVsc2UKLSAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwgQVNDSUlMaXRl cmFsKCJCYWQgY2FjaGUgbW9kZSB2YWx1ZS4iKSB9OwotICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7 Ci19Ci0KLXN0YXRpYyBzdGQ6Om9wdGlvbmFsPEV4Y2VwdGlvbj4gc2V0UmVkaXJlY3QoRmV0Y2hP cHRpb25zJiBvcHRpb25zLCBjb25zdCBTdHJpbmcmIHJlZGlyZWN0KQotewotICAgIGlmIChyZWRp cmVjdCA9PSAiZm9sbG93IikKLSAgICAgICAgb3B0aW9ucy5yZWRpcmVjdCA9IEZldGNoT3B0aW9u czo6UmVkaXJlY3Q6OkZvbGxvdzsKLSAgICBlbHNlIGlmIChyZWRpcmVjdCA9PSAiZXJyb3IiKQot ICAgICAgICBvcHRpb25zLnJlZGlyZWN0ID0gRmV0Y2hPcHRpb25zOjpSZWRpcmVjdDo6RXJyb3I7 Ci0gICAgZWxzZSBpZiAocmVkaXJlY3QgPT0gIm1hbnVhbCIpCi0gICAgICAgIG9wdGlvbnMucmVk aXJlY3QgPSBGZXRjaE9wdGlvbnM6OlJlZGlyZWN0OjpNYW51YWw7Ci0gICAgZWxzZQotICAgICAg ICByZXR1cm4gRXhjZXB0aW9uIHsgVHlwZUVycm9yLCBBU0NJSUxpdGVyYWwoIkJhZCByZWRpcmVj dCBtb2RlIHZhbHVlLiIpIH07Ci0gICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLX0KLQogc3RhdGlj IHN0ZDo6b3B0aW9uYWw8RXhjZXB0aW9uPiBzZXRNZXRob2QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBjb25zdCBTdHJpbmcmIGluaXRNZXRob2QpCiB7CiAgICAgaWYgKCFpc1ZhbGlkSFRUUFRv a2VuKGluaXRNZXRob2QpKQpAQCAtMTMyLDExICs1Miw4IEBAIHN0YXRpYyBzdGQ6Om9wdGlvbmFs PEV4Y2VwdGlvbj4gc2V0TWV0aG9kKFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU3Ry aW5nCiAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIH0KIAotc3RhdGljIHN0ZDo6b3B0aW9uYWw8 RXhjZXB0aW9uPiBzZXRSZWZlcnJlcihGZXRjaFJlcXVlc3Q6OkludGVybmFsUmVxdWVzdCYgcmVx dWVzdCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgY29uc3QgRGljdGlvbmFyeSYg aW5pdCkKK3N0YXRpYyBzdGQ6Om9wdGlvbmFsPEV4Y2VwdGlvbj4gc2V0UmVmZXJyZXIoRmV0Y2hS ZXF1ZXN0OjpJbnRlcm5hbFJlcXVlc3QmIHJlcXVlc3QsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQm IGNvbnRleHQsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIpCiB7Ci0gICAgU3RyaW5nIHJlZmVycmVy OwotICAgIGlmICghaW5pdC5nZXQoInJlZmVycmVyIiwgcmVmZXJyZXIpKQotICAgICAgICByZXR1 cm4gc3RkOjpudWxsb3B0OwogICAgIGlmIChyZWZlcnJlci5pc0VtcHR5KCkpIHsKICAgICAgICAg cmVxdWVzdC5yZWZlcnJlciA9IEFTQ0lJTGl0ZXJhbCgibm8tcmVmZXJyZXIiKTsKICAgICAgICAg cmV0dXJuIHN0ZDo6bnVsbG9wdDsKQEAgLTE1OCw2MSArNzUsNDMgQEAgc3RhdGljIHN0ZDo6b3B0 aW9uYWw8RXhjZXB0aW9uPiBzZXRSZWZlcnJlcihGZXRjaFJlcXVlc3Q6OkludGVybmFsUmVxdWVz dCYgcmVxdWUKICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogfQogCi1zdGF0aWMgc3RkOjpvcHRp b25hbDxFeGNlcHRpb24+IGJ1aWxkT3B0aW9ucyhGZXRjaFJlcXVlc3Q6OkludGVybmFsUmVxdWVz dCYgcmVxdWVzdCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgY29uc3QgRGljdGlv bmFyeSYgaW5pdCkKK3N0YXRpYyBzdGQ6Om9wdGlvbmFsPEV4Y2VwdGlvbj4gYnVpbGRPcHRpb25z KEZldGNoUmVxdWVzdDo6SW50ZXJuYWxSZXF1ZXN0JiByZXF1ZXN0LCBTY3JpcHRFeGVjdXRpb25D b250ZXh0JiBjb250ZXh0LCBjb25zdCBGZXRjaFJlcXVlc3Q6OkluaXQmIGluaXQpCiB7Ci0gICAg SlNDOjpKU1ZhbHVlIHdpbmRvdzsKLSAgICBpZiAoaW5pdC5nZXQoIndpbmRvdyIsIHdpbmRvdykp IHsKLSAgICAgICAgaWYgKCF3aW5kb3cuaXNOdWxsKCkpCi0gICAgICAgICAgICByZXR1cm4gRXhj ZXB0aW9uIHsgVHlwZUVycm9yLCBBU0NJSUxpdGVyYWwoIldpbmRvdyBjYW4gb25seSBiZSBudWxs LiIpIH07Ci0gICAgfQorICAgIGlmICghaW5pdC53aW5kb3cuaXNVbmRlZmluZWRPck51bGwoKSkK KyAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwgQVNDSUlMaXRlcmFsKCJXaW5k b3cgY2FuIG9ubHkgYmUgbnVsbC4iKSB9OwogCi0gICAgYXV0byBleGNlcHRpb24gPSBzZXRSZWZl cnJlcihyZXF1ZXN0LCBjb250ZXh0LCBpbml0KTsKLSAgICBpZiAoZXhjZXB0aW9uKQotICAgICAg ICByZXR1cm4gZXhjZXB0aW9uOwotCi0gICAgU3RyaW5nIHZhbHVlOwotICAgIGlmIChpbml0Lmdl dCgicmVmZXJyZXJQb2xpY3kiLCB2YWx1ZSkpIHsKLSAgICAgICAgZXhjZXB0aW9uID0gc2V0UmVm ZXJyZXJQb2xpY3kocmVxdWVzdC5vcHRpb25zLCB2YWx1ZSk7Ci0gICAgICAgIGlmIChleGNlcHRp b24pCisgICAgaWYgKCFpbml0LnJlZmVycmVyLmlzTnVsbCgpKSB7CisgICAgICAgIGlmIChhdXRv IGV4Y2VwdGlvbiA9IHNldFJlZmVycmVyKHJlcXVlc3QsIGNvbnRleHQsIGluaXQucmVmZXJyZXIp KQogICAgICAgICAgICAgcmV0dXJuIGV4Y2VwdGlvbjsKICAgICB9CiAKLSAgICBpZiAoaW5pdC5n ZXQoIm1vZGUiLCB2YWx1ZSkpIHsKLSAgICAgICAgZXhjZXB0aW9uID0gc2V0TW9kZShyZXF1ZXN0 Lm9wdGlvbnMsIHZhbHVlKTsKLSAgICAgICAgaWYgKGV4Y2VwdGlvbikKLSAgICAgICAgICAgIHJl dHVybiBleGNlcHRpb247Ci0gICAgfQorICAgIGlmIChpbml0LnJlZmVycmVyUG9saWN5KQorICAg ICAgICByZXF1ZXN0Lm9wdGlvbnMucmVmZXJyZXJQb2xpY3kgPSBpbml0LnJlZmVycmVyUG9saWN5 LnZhbHVlKCk7CisKKyAgICBpZiAoaW5pdC5tb2RlKQorICAgICAgICByZXF1ZXN0Lm9wdGlvbnMu bW9kZSA9IGluaXQubW9kZS52YWx1ZSgpOwogICAgIGlmIChyZXF1ZXN0Lm9wdGlvbnMubW9kZSA9 PSBGZXRjaE9wdGlvbnM6Ok1vZGU6Ok5hdmlnYXRlKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9u IHsgVHlwZUVycm9yLCBBU0NJSUxpdGVyYWwoIlJlcXVlc3QgY29uc3RydWN0b3IgZG9lcyBub3Qg YWNjZXB0IG5hdmlnYXRlIGZldGNoIG1vZGUuIikgfTsKIAotICAgIGlmIChpbml0LmdldCgiY3Jl ZGVudGlhbHMiLCB2YWx1ZSkpIHsKLSAgICAgICAgZXhjZXB0aW9uID0gc2V0Q3JlZGVudGlhbHMo cmVxdWVzdC5vcHRpb25zLCB2YWx1ZSk7Ci0gICAgICAgIGlmIChleGNlcHRpb24pCi0gICAgICAg ICAgICByZXR1cm4gZXhjZXB0aW9uOwotICAgIH0KLQotICAgIGlmIChpbml0LmdldCgiY2FjaGUi LCB2YWx1ZSkpIHsKLSAgICAgICAgZXhjZXB0aW9uID0gc2V0Q2FjaGUocmVxdWVzdC5vcHRpb25z LCB2YWx1ZSk7Ci0gICAgICAgIGlmIChleGNlcHRpb24pCi0gICAgICAgICAgICByZXR1cm4gZXhj ZXB0aW9uOwotICAgIH0KKyAgICBpZiAoaW5pdC5jcmVkZW50aWFscykKKyAgICAgICAgcmVxdWVz dC5vcHRpb25zLmNyZWRlbnRpYWxzID0gaW5pdC5jcmVkZW50aWFscy52YWx1ZSgpOwogCisgICAg aWYgKGluaXQuY2FjaGUpCisgICAgICAgIHJlcXVlc3Qub3B0aW9ucy5jYWNoZSA9IGluaXQuY2Fj aGUudmFsdWUoKTsKICAgICBpZiAocmVxdWVzdC5vcHRpb25zLmNhY2hlID09IEZldGNoT3B0aW9u czo6Q2FjaGU6Ok9ubHlJZkNhY2hlZCAmJiByZXF1ZXN0Lm9wdGlvbnMubW9kZSAhPSBGZXRjaE9w dGlvbnM6Ok1vZGU6OlNhbWVPcmlnaW4pCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBUeXBl RXJyb3IsIEFTQ0lJTGl0ZXJhbCgib25seS1pZi1jYWNoZWQgY2FjaGUgb3B0aW9uIHJlcXVpcmVz IGZldGNoIG1vZGUgdG8gYmUgc2FtZS1vcmlnaW4uIikgIH07CiAKLSAgICBpZiAoaW5pdC5nZXQo InJlZGlyZWN0IiwgdmFsdWUpKSB7Ci0gICAgICAgIGV4Y2VwdGlvbiA9IHNldFJlZGlyZWN0KHJl cXVlc3Qub3B0aW9ucywgdmFsdWUpOwotICAgICAgICBpZiAoZXhjZXB0aW9uKQotICAgICAgICAg ICAgcmV0dXJuIGV4Y2VwdGlvbjsKLSAgICB9CisgICAgaWYgKGluaXQucmVkaXJlY3QpCisgICAg ICAgIHJlcXVlc3Qub3B0aW9ucy5yZWRpcmVjdCA9IGluaXQucmVkaXJlY3QudmFsdWUoKTsKIAot ICAgIGluaXQuZ2V0KCJpbnRlZ3JpdHkiLCByZXF1ZXN0LmludGVncml0eSk7CisgICAgaWYgKCFp bml0LmludGVncml0eS5pc051bGwoKSkKKyAgICAgICAgcmVxdWVzdC5pbnRlZ3JpdHkgPSBpbml0 LmludGVncml0eTsKIAotICAgIGlmIChpbml0LmdldCgibWV0aG9kIiwgdmFsdWUpKSB7Ci0gICAg ICAgIGV4Y2VwdGlvbiA9IHNldE1ldGhvZChyZXF1ZXN0LnJlcXVlc3QsIHZhbHVlKTsKLSAgICAg ICAgaWYgKGV4Y2VwdGlvbikKKyAgICBpZiAoIWluaXQubWV0aG9kLmlzTnVsbCgpKSB7CisgICAg ICAgIGlmIChhdXRvIGV4Y2VwdGlvbiA9IHNldE1ldGhvZChyZXF1ZXN0LnJlcXVlc3QsIGluaXQu bWV0aG9kKSkKICAgICAgICAgICAgIHJldHVybiBleGNlcHRpb247CiAgICAgfQorCiAgICAgcmV0 dXJuIHN0ZDo6bnVsbG9wdDsKIH0KIApAQCAtMjIxLDcgKzEyMCw3IEBAIHN0YXRpYyBib29sIG1l dGhvZENhbkhhdmVCb2R5KGNvbnN0IEZldGNoUmVxdWVzdDo6SW50ZXJuYWxSZXF1ZXN0JiBpbnRl cm5hbFJlcXVlCiAgICAgcmV0dXJuIGludGVybmFsUmVxdWVzdC5yZXF1ZXN0Lmh0dHBNZXRob2Qo KSAhPSAiR0VUIiAmJiBpbnRlcm5hbFJlcXVlc3QucmVxdWVzdC5odHRwTWV0aG9kKCkgIT0gIkhF QUQiOwogfQogCi1FeGNlcHRpb25PcjxGZXRjaEhlYWRlcnMmPiBGZXRjaFJlcXVlc3Q6OmluaXRp YWxpemVPcHRpb25zKGNvbnN0IERpY3Rpb25hcnkmIGluaXQpCitFeGNlcHRpb25PcjxGZXRjaEhl YWRlcnMmPiBGZXRjaFJlcXVlc3Q6OmluaXRpYWxpemVPcHRpb25zKGNvbnN0IEluaXQmIGluaXQp CiB7CiAgICAgQVNTRVJUKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSk7CiAKQEAgLTI0MCw3ICsx MzksNyBAQCBFeGNlcHRpb25PcjxGZXRjaEhlYWRlcnMmPiBGZXRjaFJlcXVlc3Q6OmluaXRpYWxp emVPcHRpb25zKGNvbnN0IERpY3Rpb25hcnkmIGluaQogICAgIHJldHVybiBtX2hlYWRlcnMuZ2V0 KCk7CiB9CiAKLUV4Y2VwdGlvbk9yPEZldGNoSGVhZGVycyY+IEZldGNoUmVxdWVzdDo6aW5pdGlh bGl6ZVdpdGgoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IERpY3Rpb25hcnkmIGluaXQpCitFeGNl cHRpb25PcjxGZXRjaEhlYWRlcnMmPiBGZXRjaFJlcXVlc3Q6OmluaXRpYWxpemVXaXRoKGNvbnN0 IFN0cmluZyYgdXJsLCBjb25zdCBJbml0JiBpbml0KQogewogICAgIEFTU0VSVChzY3JpcHRFeGVj dXRpb25Db250ZXh0KCkpOwogICAgIC8vIEZJWE1FOiBUaWdodGVuIHRoZSBVUkwgcGFyc2luZyBh bGdvcml0aG0gYWNjb3JkaW5nIGh0dHBzOi8vdXJsLnNwZWMud2hhdHdnLm9yZy8jY29uY2VwdC11 cmwtcGFyc2VyLgpAQCAtMjU3LDcgKzE1Niw3IEBAIEV4Y2VwdGlvbk9yPEZldGNoSGVhZGVycyY+ IEZldGNoUmVxdWVzdDo6aW5pdGlhbGl6ZVdpdGgoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0CiAg ICAgcmV0dXJuIGluaXRpYWxpemVPcHRpb25zKGluaXQpOwogfQogCi1FeGNlcHRpb25PcjxGZXRj aEhlYWRlcnMmPiBGZXRjaFJlcXVlc3Q6OmluaXRpYWxpemVXaXRoKEZldGNoUmVxdWVzdCYgaW5w dXQsIGNvbnN0IERpY3Rpb25hcnkmIGluaXQpCitFeGNlcHRpb25PcjxGZXRjaEhlYWRlcnMmPiBG ZXRjaFJlcXVlc3Q6OmluaXRpYWxpemVXaXRoKEZldGNoUmVxdWVzdCYgaW5wdXQsIGNvbnN0IElu aXQmIGluaXQpCiB7CiAgICAgaWYgKGlucHV0LmlzRGlzdHVyYmVkT3JMb2NrZWQoKSkKICAgICAg ICAgcmV0dXJuIEV4Y2VwdGlvbiB7VHlwZUVycm9yLCBBU0NJSUxpdGVyYWwoIlJlcXVlc3QgaW5w dXQgaXMgZGlzdHVyYmVkIG9yIGxvY2tlZC4iKSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv ZmV0Y2gvRmV0Y2hSZXF1ZXN0LmgKaW5kZXggOTZmYTk1MWYyM2VmODQwNjJiNTg1NGY3OGM5ZThj NDlmZDExNjRkMC4uNDFmMDIzYjcxYzMxYzNiNGQwNjZhNWI2MjI0Yzc0MDZlMDNmMDRkYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlcXVlc3QuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoUmVxdWVzdC5oCkBAIC0zOCw0MiAr MzgsNDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBEaWN0aW9uYXJ5OworY2xh c3MgQmxvYjsKIGNsYXNzIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7CitjbGFzcyBVUkxTZWFyY2hQ YXJhbXM7CiAKIGNsYXNzIEZldGNoUmVxdWVzdCBmaW5hbCA6IHB1YmxpYyBGZXRjaEJvZHlPd25l ciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxGZXRjaFJlcXVlc3Q+IGNyZWF0ZShTY3JpcHRF eGVjdXRpb25Db250ZXh0JiBjb250ZXh0KSB7IHJldHVybiBhZG9wdFJlZigqbmV3IEZldGNoUmVx dWVzdChjb250ZXh0LCBzdGQ6Om51bGxvcHQsIEZldGNoSGVhZGVyczo6Y3JlYXRlKEZldGNoSGVh ZGVyczo6R3VhcmQ6OlJlcXVlc3QpLCB7IH0pKTsgfQogCi0gICAgRXhjZXB0aW9uT3I8RmV0Y2hI ZWFkZXJzJj4gaW5pdGlhbGl6ZVdpdGgoRmV0Y2hSZXF1ZXN0JiwgY29uc3QgRGljdGlvbmFyeSYp OwotICAgIEV4Y2VwdGlvbk9yPEZldGNoSGVhZGVycyY+IGluaXRpYWxpemVXaXRoKGNvbnN0IFN0 cmluZyYsIGNvbnN0IERpY3Rpb25hcnkmKTsKKyAgICB1c2luZyBDYWNoZSA9IEZldGNoT3B0aW9u czo6Q2FjaGU7CisgICAgdXNpbmcgQ3JlZGVudGlhbHMgPSBGZXRjaE9wdGlvbnM6OkNyZWRlbnRp YWxzOworICAgIHVzaW5nIERlc3RpbmF0aW9uID0gRmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjsK KyAgICB1c2luZyBNb2RlID0gRmV0Y2hPcHRpb25zOjpNb2RlOworICAgIHVzaW5nIFJlZGlyZWN0 ID0gRmV0Y2hPcHRpb25zOjpSZWRpcmVjdDsKKyAgICB1c2luZyBSZWZlcnJlclBvbGljeSA9IEZl dGNoT3B0aW9uczo6UmVmZXJyZXJQb2xpY3k7CisgICAgdXNpbmcgVHlwZSA9IEZldGNoT3B0aW9u czo6VHlwZTsKKworICAgIHN0cnVjdCBJbml0IHsKKyAgICAgICAgU3RyaW5nIG1ldGhvZDsKKyAg ICAgICAgU3RyaW5nIHJlZmVycmVyOworICAgICAgICBzdGQ6Om9wdGlvbmFsPFJlZmVycmVyUG9s aWN5PiByZWZlcnJlclBvbGljeTsKKyAgICAgICAgc3RkOjpvcHRpb25hbDxNb2RlPiBtb2RlOwor ICAgICAgICBzdGQ6Om9wdGlvbmFsPENyZWRlbnRpYWxzPiBjcmVkZW50aWFsczsKKyAgICAgICAg c3RkOjpvcHRpb25hbDxDYWNoZT4gY2FjaGU7CisgICAgICAgIHN0ZDo6b3B0aW9uYWw8UmVkaXJl Y3Q+IHJlZGlyZWN0OworICAgICAgICBTdHJpbmcgaW50ZWdyaXR5OworICAgICAgICBKU0M6OkpT VmFsdWUgd2luZG93OworICAgIH07CisKKyAgICBFeGNlcHRpb25PcjxGZXRjaEhlYWRlcnMmPiBp bml0aWFsaXplV2l0aChGZXRjaFJlcXVlc3QmLCBjb25zdCBJbml0Jik7CisgICAgRXhjZXB0aW9u T3I8RmV0Y2hIZWFkZXJzJj4gaW5pdGlhbGl6ZVdpdGgoY29uc3QgU3RyaW5nJiwgY29uc3QgSW5p dCYpOwogICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldEJvZHkoSlNDOjpFeGVjU3RhdGUmLCBKU0M6 OkpTVmFsdWUsIEZldGNoUmVxdWVzdCopOwogCiAgICAgY29uc3QgU3RyaW5nJiBtZXRob2QoKSBj b25zdCB7IHJldHVybiBtX2ludGVybmFsUmVxdWVzdC5yZXF1ZXN0Lmh0dHBNZXRob2QoKTsgfQog ICAgIGNvbnN0IFN0cmluZyYgdXJsKCkgY29uc3Q7CiAgICAgRmV0Y2hIZWFkZXJzJiBoZWFkZXJz KCkgeyByZXR1cm4gbV9oZWFkZXJzLmdldCgpOyB9CiAKLSAgICB1c2luZyBUeXBlID0gRmV0Y2hP cHRpb25zOjpUeXBlOwogICAgIFR5cGUgdHlwZSgpIGNvbnN0OwotCi0gICAgdXNpbmcgRGVzdGlu YXRpb24gPSBGZXRjaE9wdGlvbnM6OkRlc3RpbmF0aW9uOwogICAgIERlc3RpbmF0aW9uIGRlc3Rp bmF0aW9uKCkgY29uc3Q7Ci0KICAgICBTdHJpbmcgcmVmZXJyZXIoKSBjb25zdDsKLQotICAgIHVz aW5nIFJlZmVycmVyUG9saWN5ID0gRmV0Y2hPcHRpb25zOjpSZWZlcnJlclBvbGljeTsKICAgICBS ZWZlcnJlclBvbGljeSByZWZlcnJlclBvbGljeSgpIGNvbnN0OwotCi0gICAgdXNpbmcgTW9kZSA9 IEZldGNoT3B0aW9uczo6TW9kZTsKICAgICBNb2RlIG1vZGUoKSBjb25zdDsKLQotICAgIHVzaW5n IENyZWRlbnRpYWxzID0gRmV0Y2hPcHRpb25zOjpDcmVkZW50aWFsczsKICAgICBDcmVkZW50aWFs cyBjcmVkZW50aWFscygpIGNvbnN0OwotCi0gICAgdXNpbmcgQ2FjaGUgPSBGZXRjaE9wdGlvbnM6 OkNhY2hlOwogICAgIENhY2hlIGNhY2hlKCkgY29uc3Q7Ci0KLSAgICB1c2luZyBSZWRpcmVjdCA9 IEZldGNoT3B0aW9uczo6UmVkaXJlY3Q7CiAgICAgUmVkaXJlY3QgcmVkaXJlY3QoKSBjb25zdDsK IAogICAgIGNvbnN0IFN0cmluZyYgaW50ZWdyaXR5KCkgY29uc3QgeyByZXR1cm4gbV9pbnRlcm5h bFJlcXVlc3QuaW50ZWdyaXR5OyB9CkBAIC05NSw3ICsxMDIsNyBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIEZldGNoUmVxdWVzdChTY3JpcHRFeGVjdXRpb25Db250ZXh0Jiwgc3RkOjpvcHRpb25h bDxGZXRjaEJvZHk+JiYsIFJlZjxGZXRjaEhlYWRlcnM+JiYsIEludGVybmFsUmVxdWVzdCYmKTsK IAotICAgIEV4Y2VwdGlvbk9yPEZldGNoSGVhZGVycyY+IGluaXRpYWxpemVPcHRpb25zKGNvbnN0 IERpY3Rpb25hcnkmKTsKKyAgICBFeGNlcHRpb25PcjxGZXRjaEhlYWRlcnMmPiBpbml0aWFsaXpl T3B0aW9ucyhjb25zdCBJbml0Jik7CiAKICAgICBjb25zdCBjaGFyKiBhY3RpdmVET01PYmplY3RO YW1lKCkgY29uc3QgZmluYWw7CiAgICAgYm9vbCBjYW5TdXNwZW5kRm9yRG9jdW1lbnRTdXNwZW5z aW9uKCkgY29uc3QgZmluYWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Zl dGNoL0ZldGNoUmVxdWVzdC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNo UmVxdWVzdC5pZGwKaW5kZXggMTFkYmI0MjA2MzZkNzY4M2YxMjNmZTcwNGMxZTI5NjM2NWQ2N2Zm ZS4uNGJmNjhiZDI1MGJmNmY0ZmQ2ODU2ZDFjZjIwY2UzMzEyMWQyY2EyMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlcXVlc3QuaWRsCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hSZXF1ZXN0LmlkbApAQCAtMzAsMTQgKzMwLDI2 IEBAIGVudW0gUmVxdWVzdFR5cGUgeyAiIiwgImF1ZGlvIiwgImZvbnQiLCAiaW1hZ2UiLCAic2Ny aXB0IiwgInN0eWxlIiwgInRyYWNrIiwgInZpCiBlbnVtIFJlcXVlc3REZXN0aW5hdGlvbiB7ICIi LCAiZG9jdW1lbnQiLCAic2hhcmVkd29ya2VyIiwgInN1YnJlc291cmNlIiwgInVua25vd24iLCAi d29ya2VyIiB9OwogZW51bSBSZXF1ZXN0TW9kZSB7ICJuYXZpZ2F0ZSIsICJzYW1lLW9yaWdpbiIs ICJuby1jb3JzIiwgImNvcnMiIH07CiBlbnVtIFJlcXVlc3RDcmVkZW50aWFscyB7ICJvbWl0Iiwg InNhbWUtb3JpZ2luIiwgImluY2x1ZGUiIH07Ci1lbnVtIFJlcXVlc3RDYWNoZSB7ICJkZWZhdWx0 IiwgIm5vLXN0b3JlIiwgInJlbG9hZCIsICJuby1jYWNoZSIsICJmb3JjZS1jYWNoZSIgfTsKK2Vu dW0gUmVxdWVzdENhY2hlIHsgImRlZmF1bHQiLCAibm8tc3RvcmUiLCAicmVsb2FkIiwgIm5vLWNh Y2hlIiwgImZvcmNlLWNhY2hlIiwgIm9ubHktaWYtY2FjaGVkIiB9OwogZW51bSBSZXF1ZXN0UmVk aXJlY3QgeyAiZm9sbG93IiwgImVycm9yIiwgIm1hbnVhbCIgfTsKIGVudW0gUmVmZXJyZXJQb2xp Y3kgeyAiIiwgIm5vLXJlZmVycmVyIiwgICJuby1yZWZlcnJlci13aGVuLWRvd25ncmFkZSIsICJv cmlnaW4iLCAib3JpZ2luLXdoZW4tY3Jvc3Mtb3JpZ2luIiwgInVuc2FmZS11cmwiIH07CiAKK2Rp Y3Rpb25hcnkgUmVxdWVzdEluaXQgeworICAgIEJ5dGVTdHJpbmcgbWV0aG9kOworICAgIFVTVlN0 cmluZyByZWZlcnJlcjsKKyAgICBSZWZlcnJlclBvbGljeSByZWZlcnJlclBvbGljeTsKKyAgICBS ZXF1ZXN0TW9kZSBtb2RlOworICAgIFJlcXVlc3RDcmVkZW50aWFscyBjcmVkZW50aWFsczsKKyAg ICBSZXF1ZXN0Q2FjaGUgY2FjaGU7CisgICAgUmVxdWVzdFJlZGlyZWN0IHJlZGlyZWN0OworICAg IERPTVN0cmluZyBpbnRlZ3JpdHk7CisgICAgYW55IHdpbmRvdzsKK307CisKIFsKICAgICBBY3Rp dmVET01PYmplY3QsCiAgICAgQ29uZGl0aW9uYWw9RkVUQ0hfQVBJLAotICAgIENvbnN0cnVjdG9y KGFueSBpbnB1dCwgb3B0aW9uYWwgRGljdGlvbmFyeSBpbml0KSwKKyAgICBDb25zdHJ1Y3Rvcihh bnkgaW5wdXQsIG9wdGlvbmFsIFJlcXVlc3RJbml0IGluaXQpLAogICAgIEVuYWJsZWRBdFJ1bnRp bWU9RmV0Y2hBUEksCiAgICAgRXhwb3NlZD0oV2luZG93LFdvcmtlciksCiAgICAgSW50ZXJmYWNl TmFtZT1SZXF1ZXN0LApAQCAtNDUsMTMgKzU3LDEzIEBAIGVudW0gUmVmZXJyZXJQb2xpY3kgeyAi IiwgIm5vLXJlZmVycmVyIiwgICJuby1yZWZlcnJlci13aGVuLWRvd25ncmFkZSIsICJvcmlnaW4i CiAgICAgUHJpdmF0ZUlkZW50aWZpZXIsCiAgICAgUHVibGljSWRlbnRpZmllciwKIF0gaW50ZXJm YWNlIEZldGNoUmVxdWVzdCB7Ci0gICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0cmluZyBtZXRo b2Q7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIEJ5dGVTdHJpbmcgbWV0aG9kOwogICAgIHJlYWRv bmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgdXJsOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBGZXRj aEhlYWRlcnMgaGVhZGVyczsKIAogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBSZXF1ZXN0VHlwZSB0 eXBlOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBSZXF1ZXN0RGVzdGluYXRpb24gZGVzdGluYXRp b247Ci0gICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0cmluZyByZWZlcnJlcjsKKyAgICByZWFk b25seSBhdHRyaWJ1dGUgVVNWU3RyaW5nIHJlZmVycmVyOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0 ZSBSZWZlcnJlclBvbGljeSByZWZlcnJlclBvbGljeTsKICAgICByZWFkb25seSBhdHRyaWJ1dGUg UmVxdWVzdE1vZGUgbW9kZTsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgUmVxdWVzdENyZWRlbnRp YWxzIGNyZWRlbnRpYWxzOwpAQCAtNjEsOCArNzMsOCBAQCBlbnVtIFJlZmVycmVyUG9saWN5IHsg IiIsICJuby1yZWZlcnJlciIsICAibm8tcmVmZXJyZXItd2hlbi1kb3duZ3JhZGUiLCAib3JpZ2lu IgogCiAgICAgW0NhbGxXaXRoPVNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIE1heVRocm93RXhjZXB0 aW9uLCBOZXdPYmplY3RdIEZldGNoUmVxdWVzdCBjbG9uZSgpOwogCi0gICAgW01heVRocm93RXhj ZXB0aW9uLCBOZXdPYmplY3QsIFByaXZhdGVJZGVudGlmaWVyXSBGZXRjaEhlYWRlcnMgaW5pdGlh bGl6ZVdpdGgoRmV0Y2hSZXF1ZXN0IGlucHV0LCBEaWN0aW9uYXJ5IGluaXQpOwotICAgIFtNYXlU aHJvd0V4Y2VwdGlvbiwgTmV3T2JqZWN0LCBQcml2YXRlSWRlbnRpZmllcl0gRmV0Y2hIZWFkZXJz IGluaXRpYWxpemVXaXRoKERPTVN0cmluZyBpbnB1dCwgRGljdGlvbmFyeSBpbml0KTsKKyAgICBb TWF5VGhyb3dFeGNlcHRpb24sIE5ld09iamVjdCwgUHJpdmF0ZUlkZW50aWZpZXJdIEZldGNoSGVh ZGVycyBpbml0aWFsaXplV2l0aChGZXRjaFJlcXVlc3QgaW5wdXQsIFJlcXVlc3RJbml0IGluaXQp OworICAgIFtNYXlUaHJvd0V4Y2VwdGlvbiwgTmV3T2JqZWN0LCBQcml2YXRlSWRlbnRpZmllcl0g RmV0Y2hIZWFkZXJzIGluaXRpYWxpemVXaXRoKERPTVN0cmluZyBpbnB1dCwgUmVxdWVzdEluaXQg aW5pdCk7CiAgICAgW0NhbGxXaXRoPVNjcmlwdFN0YXRlLCBNYXlUaHJvd0V4Y2VwdGlvbiwgUHJp dmF0ZUlkZW50aWZpZXJdIHZvaWQgc2V0Qm9keShhbnkgYm9keSwgRmV0Y2hSZXF1ZXN0PyByZXF1 ZXN0KTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvV29y a2VyR2xvYmFsU2NvcGVGZXRjaC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL1dv cmtlckdsb2JhbFNjb3BlRmV0Y2guaWRsCmluZGV4IDA5MzJhNmZmNjBjMmU1YzI4MjNiYzVkY2U1 ZjdjZTAxMTAyYmI3YWYuLmM1M2U3MmRlOWU2ODNlNWIxMzMxOWQ4YzIwOGExOTg1NWU5NjdmYjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvV29ya2VyR2xvYmFsU2Nv cGVGZXRjaC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9Xb3JrZXJHbG9i YWxTY29wZUZldGNoLmlkbApAQCAtMzAsNyArMzAsNiBAQAogICAgIENvbmRpdGlvbmFsPUZFVENI X0FQSSwKICAgICBFbmFibGVkQXRSdW50aW1lPUZldGNoQVBJLAogXSBwYXJ0aWFsIGludGVyZmFj ZSBXb3JrZXJHbG9iYWxTY29wZSB7Ci0gICAgW0pTQnVpbHRpbl0gUHJvbWlzZTxSZXNwb25zZT4g ZmV0Y2goYW55IGlucHV0LCBvcHRpb25hbCBEaWN0aW9uYXJ5IGluaXQpOwotCisgICAgW0pTQnVp bHRpbl0gUHJvbWlzZTxSZXNwb25zZT4gZmV0Y2goYW55IGlucHV0LCBvcHRpb25hbCBSZXF1ZXN0 SW5pdCBpbml0KTsKICAgICBbUHJpdmF0ZUlkZW50aWZpZXIsIEltcGxlbWVudGVkQXM9ZmV0Y2hd IFByb21pc2U8UmVzcG9uc2U+IGZldGNoUmVxdWVzdChGZXRjaFJlcXVlc3QgcmVxdWVzdCk7CiB9 Owo=