224581 2021-04-14 15:54:33 -0700 Move WKURLSchemeTask redirect API to SPI for now. 2021-04-15 11:51:19 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson achristensen beidson webkit-bug-importer oldest_to_newest 1750385 0 beidson 2021-04-14 15:54:33 -0700 Move WKURLSchemeTask redirect API to SPI for now. Some kinks to work out still. 1750388 1 426055 beidson 2021-04-14 15:59:16 -0700 Created attachment 426055 Patch 1750672 2 beidson 2021-04-15 10:53:14 -0700 cq+ - Those failures weren't from this patch. 1750698 3 ews-feeder 2021-04-15 11:50:14 -0700 Committed r276037 (236581@main): <https://commits.webkit.org/236581@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426055. 1750699 4 webkit-bug-importer 2021-04-15 11:51:19 -0700 <rdar://problem/76715430> 426055 2021-04-14 15:59:16 -0700 2021-04-15 11:50:15 -0700 Patch patch text/plain 14074 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNjM1ZDRlNzUxYWVmLi42MzRjNWEyMzRiNDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjIgQEAKKzIwMjEtMDQtMTQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgor CisgICAgICAgIE1vdmUgV0tVUkxTY2hlbWVUYXNrIHJlZGlyZWN0IEFQSSB0byBTUEkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDU4MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5lZWQgdG8gd29yayBv dXQgc29tZSBkZXNpZ24ga2lua3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL VVJMU2NoZW1lVGFzay5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hl bWVUYXNrLm1tOgorICAgICAgICAoLVtXS1VSTFNjaGVtZVRhc2tJbXBsIF93aWxsUGVyZm9ybVJl ZGlyZWN0aW9uOm5ld1JlcXVlc3Q6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgtW1dL VVJMU2NoZW1lVGFza0ltcGwgd2lsbFBlcmZvcm1SZWRpcmVjdGlvbjpuZXdSZXF1ZXN0OmNvbXBs ZXRpb25IYW5kbGVyOl0pOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tVUkxTY2hlbWVUYXNrUHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3Q29uZmlndXJh dGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmZvclVSTFNjaGVtZTpdKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpz ZXRVUkxTY2hlbWVIYW5kbGVyRm9yU2NoZW1lKToKKwogMjAyMS0wNC0xNCAgQ2hyaXMgRHVtZXog IDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFdLTW91c2VEZXZpY2VPYnNlcnZl ciBpcyBjYWxsaW5nIFdlYlByb2Nlc3NQcm94eTo6c2VuZCgpIG9uIGEgbm9uLW1haW4gdGhyZWFk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hl bWVUYXNrLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVU YXNrLmgKaW5kZXggNmFkOGQ4Njk2MTBkLi4yOGI5OTg0MzAxZGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VSTFNjaGVtZVRhc2suaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVUYXNrLmgKQEAgLTM2LDIx ICszNiw2IEBAIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTMpLCBpb3MoMTEuMCkpCiAgKi8K IEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSwgY29weSkgTlNVUkxSZXF1ZXN0ICpyZXF1 ZXN0OwogCi0vKiEgQGFic3RyYWN0IEluZGljYXRlIHRoZSB0YXNrIHdhcyByZWRpcmVjdGVkLgot IEBwYXJhbSByZXNwb25zZSBUaGUgcmVzcG9uc2UgY2F1c2luZyBhIHJlZGlyZWN0IHRvIGEgbmV3 IFVSTC4KLSBAcGFyYW0gbmV3UmVxdWVzdCBUaGUgbmV3IHByb3Bvc2VkIHJlcXVlc3QgdG8gaGFu ZGxlIHRoZSByZWRpcmVjdGlvbi4KLSBAcGFyYW0gY29tcGxldGlvbkhhbmRsZXIgQSBjb21wbGV0 aW9uIGhhbmRsZXIgY2FsbGVkIHdpdGggdGhlIHJlcXVlc3QgeW91IHNob3VsZCB1c2UgdG8gY29t bWl0IHRvIHRoZSByZWRpcmVjdGlvbi4KLSBAZGlzY3Vzc2lvbiBXaGVuIHBlcmZvcm1pbmcgYSBs b2FkIG9mIGEgVVJMIG92ZXIgYSBuZXR3b3JrLCB0aGUgc2VydmVyIG1pZ2h0IGRlY2lkZSBhIGRp ZmZlcmVudCBVUkwgc2hvdWxkIGJlIGxvYWRlZCBpbnN0ZWFkLgotIEEgY29tbW9uIGV4YW1wbGUg aXMgYW4gSFRUUCByZWRpcmVjdC4KLSBXaGVuIHRoaXMgaGFwcGVucywgeW91IHNob3VsZCBub3Rp ZnkgV2ViS2l0IGJ5IHNlbmRpbmcgdGhlIHNlcnZlcnMgcmVzcG9uc2UgYW5kIGEgcHJvcG9zZWQg bmV3IHJlcXVlc3QgdG8gdGhlIFdLVVJMU2NoZW1lVGFzay4KLSBXZWJLaXQgbWlnaHQgZGVjaWRl IHRoYXQgY2hhbmdlcyBuZWVkIHRvIGJlIG1ha2UgdG8gdGhlIHByb3Bvc2VkIHJlcXVlc3QuCi0g VGhpcyBpcyBjb21tdW5pY2F0ZWQgdGhyb3VnaCB0aGUgY29tcGxldGlvbkhhbmRsZXIgd2hpY2gg dGVsbHMgeW91IHRoZSByZXF1ZXN0IHlvdSBzaG91bGQgbWFrZSB0byBjb21taXQgdG8gdGhlIHJl ZGlyZWN0aW9uLgotCi0gQW4gZXhjZXB0aW9uIHdpbGwgYmUgdGhyb3duIGlmIHlvdSBtYWtlIGFu eSBvdGhlciBjYWxsYmFja3MgdG8gdGhlIFdLVVJMU2NoZW1lVGFzayB3aGlsZSB0aGlzIGNvbXBs ZXRpb25IYW5kbGVyIGlzIHBlbmRpbmcsIG90aGVyIHRoYW4gZGlkRmFpbFdpdGhFcnJvcjouCi0g QW4gZXhjZXB0aW9uIHdpbGwgYmUgdGhyb3duIGlmIHlvdXIgYXBwIGhhcyBiZWVuIHRvbGQgdG8g c3RvcCBsb2FkaW5nIHRoaXMgdGFzayB2aWEgdGhlIHJlZ2lzdGVyZWQgV0tVUkxTY2hlbWVIYW5k bGVyIG9iamVjdC4KLSAqLwotLSAodm9pZCl3aWxsUGVyZm9ybVJlZGlyZWN0aW9uOihOU1VSTFJl c3BvbnNlICopcmVzcG9uc2UgbmV3UmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdCBjb21w bGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNVUkxSZXF1ZXN0ICogX051bGxhYmxlKSljb21wbGV0 aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9T X1RCQSkpOwotCiAvKiEgQGFic3RyYWN0IFNldCB0aGUgY3VycmVudCByZXNwb25zZSBvYmplY3Qg Zm9yIHRoZSB0YXNrLgogIEBwYXJhbSByZXNwb25zZSBUaGUgcmVzcG9uc2UgdG8gdXNlLgogIEBk aXNjdXNzaW9uIFRoaXMgbWV0aG9kIG11c3QgYmUgY2FsbGVkIGF0IGxlYXN0IG9uY2UgZm9yIGVh Y2ggVVJMIHNjaGVtZSBoYW5kbGVyIHRhc2suCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hlbWVUYXNrLm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLVVJMU2NoZW1lVGFzay5tbQppbmRleCA3MjZmOTEzMDdhYmEuLjZm OGE4MWNhYjJlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLVVJMU2NoZW1lVGFzay5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tVUkxTY2hlbWVUYXNrLm1tCkBAIC05Niw3ICs5Niw3IEBAIC0gKEJPT0wpX3JlcXVlc3RP bmx5SWZDYWNoZWQKICAgICByZXR1cm4gX3VybFNjaGVtZVRhc2stPnRhc2soKS5uc1JlcXVlc3Qo KS5jYWNoZVBvbGljeSA9PSBOU1VSTFJlcXVlc3RSZXR1cm5DYWNoZURhdGFEb250TG9hZDsKIH0K IAotLSAodm9pZCl3aWxsUGVyZm9ybVJlZGlyZWN0aW9uOihOU1VSTFJlc3BvbnNlICopcmVzcG9u c2UgbmV3UmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdCBjb21wbGV0aW9uSGFuZGxlcjoo dm9pZCAoXikoTlNVUkxSZXF1ZXN0ICopKWNvbXBsZXRpb25IYW5kbGVyCistICh2b2lkKV93aWxs UGVyZm9ybVJlZGlyZWN0aW9uOihOU1VSTFJlc3BvbnNlICopcmVzcG9uc2UgbmV3UmVxdWVzdDoo TlNVUkxSZXF1ZXN0ICopcmVxdWVzdCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNVUkxS ZXF1ZXN0ICopKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAgYXV0byBmdW5jdGlvbiA9IFtwcm90 ZWN0ZWRTZWxmID0gcmV0YWluUHRyKHNlbGYpLCBzZWxmLCBwcm90ZWN0ZWRSZXNwb25zZSA9IHJl dGFpblB0cihyZXNwb25zZSksIHJlc3BvbnNlLCBwcm90ZWN0ZWRSZXF1ZXN0ID0gcmV0YWluUHRy KHJlcXVlc3QpLCByZXF1ZXN0LCBoYW5kbGVyID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5k bGVyKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgIHJldHVybiBfdXJsU2NoZW1lVGFzay0+dGFzaygp LndpbGxQZXJmb3JtUmVkaXJlY3Rpb24ocmVzcG9uc2UsIHJlcXVlc3QsIFtoYW5kbGVyID0gV1RG TW92ZShoYW5kbGVyKV0gKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIGFjdHVhbE5ld1JlcXVl c3QpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VS TFNjaGVtZVRhc2tQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tVUkxTY2hlbWVUYXNrUHJpdmF0ZS5oCmluZGV4IGQ1OWMyYjIyMTZmNy4uNmQ1YTU4MTM3OGMz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVUkxTY2hl bWVUYXNrUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1VSTFNjaGVtZVRhc2tQcml2YXRlLmgKQEAgLTMwLDYgKzMwLDIwIEBACiBXS19BUElfQVZBSUxB QkxFKG1hY29zKDEwLjEzKSwgaW9zKDExLjApKQogQHByb3RvY29sIFdLVVJMU2NoZW1lVGFza1By aXZhdGUgPFdLVVJMU2NoZW1lVGFzaz4KIAorLyohIEBhYnN0cmFjdCBJbmRpY2F0ZSB0aGUgdGFz ayB3YXMgcmVkaXJlY3RlZC4KKyBAcGFyYW0gcmVzcG9uc2UgVGhlIHJlc3BvbnNlIGNhdXNpbmcg YSByZWRpcmVjdCB0byBhIG5ldyBVUkwuCisgQHBhcmFtIG5ld1JlcXVlc3QgVGhlIG5ldyBwcm9w b3NlZCByZXF1ZXN0IHRvIGhhbmRsZSB0aGUgcmVkaXJlY3Rpb24uCisgQHBhcmFtIGNvbXBsZXRp b25IYW5kbGVyIEEgY29tcGxldGlvbiBoYW5kbGVyIGNhbGxlZCB3aXRoIHRoZSByZXF1ZXN0IHlv dSBzaG91bGQgdXNlIHRvIGNvbW1pdCB0byB0aGUgcmVkaXJlY3Rpb24uCisgQGRpc2N1c3Npb24g V2hlbiBwZXJmb3JtaW5nIGEgbG9hZCBvZiBhIFVSTCBvdmVyIGEgbmV0d29yaywgdGhlIHNlcnZl ciBtaWdodCBkZWNpZGUgYSBkaWZmZXJlbnQgVVJMIHNob3VsZCBiZSBsb2FkZWQgaW5zdGVhZC4K KyBBIGNvbW1vbiBleGFtcGxlIGlzIGFuIEhUVFAgcmVkaXJlY3QuCisgV2hlbiB0aGlzIGhhcHBl bnMsIHlvdSBzaG91bGQgbm90aWZ5IFdlYktpdCBieSBzZW5kaW5nIHRoZSBzZXJ2ZXJzIHJlc3Bv bnNlIGFuZCBhIHByb3Bvc2VkIG5ldyByZXF1ZXN0IHRvIHRoZSBXS1VSTFNjaGVtZVRhc2suCisg V2ViS2l0IG1pZ2h0IGRlY2lkZSB0aGF0IGNoYW5nZXMgbmVlZCB0byBiZSBtYWtlIHRvIHRoZSBw cm9wb3NlZCByZXF1ZXN0LgorIFRoaXMgaXMgY29tbXVuaWNhdGVkIHRocm91Z2ggdGhlIGNvbXBs ZXRpb25IYW5kbGVyIHdoaWNoIHRlbGxzIHlvdSB0aGUgcmVxdWVzdCB5b3Ugc2hvdWxkIG1ha2Ug dG8gY29tbWl0IHRvIHRoZSByZWRpcmVjdGlvbi4KKworIEFuIGV4Y2VwdGlvbiB3aWxsIGJlIHRo cm93biBpZiB5b3UgbWFrZSBhbnkgb3RoZXIgY2FsbGJhY2tzIHRvIHRoZSBXS1VSTFNjaGVtZVRh c2sgd2hpbGUgdGhpcyBjb21wbGV0aW9uSGFuZGxlciBpcyBwZW5kaW5nLCBvdGhlciB0aGFuIGRp ZEZhaWxXaXRoRXJyb3I6LgorIEFuIGV4Y2VwdGlvbiB3aWxsIGJlIHRocm93biBpZiB5b3VyIGFw cCBoYXMgYmVlbiB0b2xkIHRvIHN0b3AgbG9hZGluZyB0aGlzIHRhc2sgdmlhIHRoZSByZWdpc3Rl cmVkIFdLVVJMU2NoZW1lSGFuZGxlciBvYmplY3QuCisgKi8KKy0gKHZvaWQpX3dpbGxQZXJmb3Jt UmVkaXJlY3Rpb246KE5TVVJMUmVzcG9uc2UgKilyZXNwb25zZSBuZXdSZXF1ZXN0OihOU1VSTFJl cXVlc3QgKilyZXF1ZXN0IGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU1VSTFJlcXVlc3Qg KikpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpKTsKIC0gKHZvaWQpX2RpZFBlcmZvcm1SZWRpcmVjdGlvbjooTlNVUkxS ZXNwb25zZSAqKXJlc3BvbnNlIG5ld1JlcXVlc3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3Q7CiAK IEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgQk9PTCBfcmVxdWVzdE9ubHlJZkNhY2hl ZCBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjE1KSwgaW9zKDEzLjApKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9u Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24ubW0KaW5kZXggMjgzZjIwMmNjNTEwLi5jNTAwOWI2ODg2ZjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1 cmF0aW9uLm1tCkBAIC01NTQsNyArNTU0LDcgQEAgLSAodm9pZClfc2V0VmlzaXRlZExpbmtTdG9y ZTooX1dLVmlzaXRlZExpbmtTdG9yZSAqKXZpc2l0ZWRMaW5rU3RvcmUKIAogLSAodm9pZClzZXRV UkxTY2hlbWVIYW5kbGVyOihpZCA8V0tVUkxTY2hlbWVIYW5kbGVyPil1cmxTY2hlbWVIYW5kbGVy IGZvclVSTFNjaGVtZTooTlNTdHJpbmcgKil1cmxTY2hlbWUKIHsKLSAgICBpZiAoW1dLV2ViVmll dyBoYW5kbGVzVVJMU2NoZW1lOnVybFNjaGVtZV0gJiYgW3VybFNjaGVtZSBjYXNlSW5zZW5zaXRp dmVDb21wYXJlOkAiaHR0cCJdICE9IE5TT3JkZXJlZFNhbWUgJiYgW3VybFNjaGVtZSBjYXNlSW5z ZW5zaXRpdmVDb21wYXJlOkAiaHR0cHMiXSAhPSBOU09yZGVyZWRTYW1lKQorICAgIGlmIChbV0tX ZWJWaWV3IGhhbmRsZXNVUkxTY2hlbWU6dXJsU2NoZW1lXSkKICAgICAgICAgW05TRXhjZXB0aW9u IHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIiclQCcgaXMgYSBVUkwg c2NoZW1lIHRoYXQgV0tXZWJWaWV3IGhhbmRsZXMgbmF0aXZlbHkiLCB1cmxTY2hlbWVdOwogCiAg ICAgYXV0byBjYW5vbmljYWxTY2hlbWUgPSBXVEY6OlVSTFBhcnNlcjo6bWF5YmVDYW5vbmljYWxp emVTY2hlbWUodXJsU2NoZW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCmluZGV4IGEyZjM5Yzk1ZTNiYy4uZmJhYjZlNjEwOTEzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTk2MTQsOSArOTYxNCw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpzZXRVUkxTY2hlbWVIYW5kbGVyRm9yU2NoZW1lKFJlZjxXZWJVUkxTY2hlbWVIYW5k bGVyPiYmIGhhbmRsCiB7CiAgICAgYXV0byBjYW5vbmljYWxpemVkU2NoZW1lID0gV1RGOjpVUkxQ YXJzZXI6Om1heWJlQ2Fub25pY2FsaXplU2NoZW1lKHNjaGVtZSk7CiAgICAgQVNTRVJUKGNhbm9u aWNhbGl6ZWRTY2hlbWUpOwotCi0gICAgYm9vbCBzY2hlbWVJc0luSFRUUEZhbWlseSA9ICpjYW5v bmljYWxpemVkU2NoZW1lID09ICJodHRwIiB8fCAqY2Fub25pY2FsaXplZFNjaGVtZSA9PSAiaHR0 cHMiOwotICAgIEFTU0VSVF9VTlVTRUQoc2NoZW1lSXNJbkhUVFBGYW1pbHksIHNjaGVtZUlzSW5I VFRQRmFtaWx5IHx8ICFXVEY6OlVSTFBhcnNlcjo6aXNTcGVjaWFsU2NoZW1lKGNhbm9uaWNhbGl6 ZWRTY2hlbWUudmFsdWUoKSkpOworICAgIEFTU0VSVCghV1RGOjpVUkxQYXJzZXI6OmlzU3BlY2lh bFNjaGVtZShjYW5vbmljYWxpemVkU2NoZW1lLnZhbHVlKCkpKTsKIAogICAgIGF1dG8gc2NoZW1l UmVzdWx0ID0gbV91cmxTY2hlbWVIYW5kbGVyc0J5U2NoZW1lLmFkZChjYW5vbmljYWxpemVkU2No ZW1lLnZhbHVlKCksIGhhbmRsZXIuZ2V0KCkpOwogICAgIEFTU0VSVF9VTlVTRUQoc2NoZW1lUmVz dWx0LCBzY2hlbWVSZXN1bHQuaXNOZXdFbnRyeSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmE3MjRkYzg4NjNmLi44ZjkyZGFkYmI0NjAgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNSBAQAorMjAyMS0wNC0xNCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisK KyAgICAgICAgTW92ZSBXS1VSTFNjaGVtZVRhc2sgcmVkaXJlY3QgQVBJIHRvIFNQSQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTgxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1dLVVJMU2NoZW1lSGFuZGxlci0xLm1tOgorICAgICAgICAoLVtU YXNrU2NoZW1lSGFuZGxlciB3ZWJWaWV3OnN0YXJ0VVJMU2NoZW1lVGFzazpdKToKKyAgICAgICAg KC1bSFRUUFJlZGlyZWN0VGVzdCB3ZWJWaWV3OnN0YXJ0VVJMU2NoZW1lVGFzazpdKTogRGVsZXRl ZC4KKyAgICAgICAgKC1bSFRUUFJlZGlyZWN0VGVzdCB3ZWJWaWV3OnN0b3BVUkxTY2hlbWVUYXNr Ol0pOiBEZWxldGVkLgorCiAyMDIxLTA0LTE0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFw cGxlLmNvbT4KIAogICAgICAgICBDb21taXQgcXVldWUgaXNuJ3Qgc2tpcHBpbmcgYnVpbGRzIGFu ZCB0ZXN0IG9uIHJldmVydCBwYXRjaGVzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1dLVVJMU2NoZW1lSGFuZGxlci0xLm1tIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNjaGVtZUhhbmRsZXItMS5tbQppbmRleCAz ZmVmOGZmMzllMzguLmVmYjdkOGFhYmZiNSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNjaGVtZUhhbmRsZXItMS5tbQorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLVVJMU2NoZW1lSGFuZGxlci0xLm1tCkBA IC0yMjQsNiArMjI0LDggQEAgc3RhdGljIE5TU3RyaW5nICpoYW5kbGVkU2NoZW1lc1tdID0gewog ICAgIEAiZGF0YSIsCiAgICAgQCJmaWxlIiwKICAgICBAImZ0cCIsCisgICAgQCJodHRwIiwKKyAg ICBAImh0dHBzIiwKICAgICBAImphdmFzY3JpcHQiLAogICAgIEAid2Via2l0LWZha2UtdXJsIiwK ICAgICBAIndzIiwKQEAgLTM4Miw3ICszODQsNyBAQCAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcgc3RhcnRVUkxTY2hlbWVUYXNrOihpZCA8V0tVUkxTY2hlbWVUYXNrPil0YQog ICAgICAgICAgICAgICAgIFsoaWQ8V0tVUkxTY2hlbWVUYXNrUHJpdmF0ZT4pdGFzayBfZGlkUGVy Zm9ybVJlZGlyZWN0aW9uOmFkb3B0TlMoW1tOU1VSTFJlc3BvbnNlIGFsbG9jXSBpbml0XSkuZ2V0 KCkgbmV3UmVxdWVzdDphZG9wdE5TKFtbTlNVUkxSZXF1ZXN0IGFsbG9jXSBpbml0XSkuZ2V0KCld OwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBDb21tYW5kOjpBUElS ZWRpcmVjdDoKLSAgICAgICAgICAgICAgICBbKGlkPFdLVVJMU2NoZW1lVGFza1ByaXZhdGU+KXRh c2sgd2lsbFBlcmZvcm1SZWRpcmVjdGlvbjphZG9wdE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10g aW5pdF0pLmdldCgpIG5ld1JlcXVlc3Q6YWRvcHROUyhbW05TVVJMUmVxdWVzdCBhbGxvY10gaW5p dF0pLmdldCgpIGNvbXBsZXRpb25IYW5kbGVyOl4oTlNVUkxSZXF1ZXN0KikgeyB9XTsKKyAgICAg ICAgICAgICAgICBbKGlkPFdLVVJMU2NoZW1lVGFza1ByaXZhdGU+KXRhc2sgX3dpbGxQZXJmb3Jt UmVkaXJlY3Rpb246YWRvcHROUyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRdKS5nZXQoKSBu ZXdSZXF1ZXN0OmFkb3B0TlMoW1tOU1VSTFJlcXVlc3QgYWxsb2NdIGluaXRdKS5nZXQoKSBjb21w bGV0aW9uSGFuZGxlcjpeKE5TVVJMUmVxdWVzdCopIHsgfV07CiAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICBjYXNlIENvbW1hbmQ6OlJlc3BvbnNlOgogICAgICAgICAgICAgICAg IFt0YXNrIGRpZFJlY2VpdmVSZXNwb25zZTphZG9wdE5TKFtbTlNVUkxSZXNwb25zZSBhbGxvY10g aW5pdF0pLmdldCgpXTsKQEAgLTE0NDEsNDIgKzE0NDMsMTUgQEAgVEVTVChVUkxTY2hlbWVIYW5k bGVyLCBpc1NlY3VyZUNvbnRleHQpCiAgICAgRVhQRUNUX1dLX1NUUkVRKEAic2VjdXJlIiwgW2xh c3RTY3JpcHRNZXNzYWdlIGJvZHldKTsKIH0KIAotQGludGVyZmFjZSBIVFRQUmVkaXJlY3RUZXN0 IDogTlNPYmplY3QgPFdLVVJMU2NoZW1lSGFuZGxlcj4gewotfQotQGVuZAotCi1AaW1wbGVtZW50 YXRpb24gSFRUUFJlZGlyZWN0VGVzdAotCi0tICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdl YlZpZXcgc3RhcnRVUkxTY2hlbWVUYXNrOihpZCA8V0tVUkxTY2hlbWVUYXNrPil0YXNrCi17Ci0g ICAgYXV0byByZWRpcmVjdFJlc3BvbnNlID0gYWRvcHROUyhbW05TVVJMUmVzcG9uc2UgYWxsb2Nd IGluaXRXaXRoVVJMOnRhc2sucmVxdWVzdC5VUkwgTUlNRVR5cGU6bmlsIGV4cGVjdGVkQ29udGVu dExlbmd0aDowIHRleHRFbmNvZGluZ05hbWU6bmlsXSk7Ci0gICAgYXV0byByZWRpcmVjdFJlcXVl c3QgPSBhZG9wdE5TKFtbTlNVUkxSZXF1ZXN0IGFsbG9jXSBpbml0V2l0aFVSTDpbTlNVUkwgVVJM V2l0aFN0cmluZzpAImh0dHBzOi8vYmFyLmNvbS9hbm90aGVydGVzdC5odG1sIl1dKTsKLQotICAg IFt0YXNrIHdpbGxQZXJmb3JtUmVkaXJlY3Rpb246cmVkaXJlY3RSZXNwb25zZS5nZXQoKSBuZXdS ZXF1ZXN0OnJlZGlyZWN0UmVxdWVzdC5nZXQoKSBjb21wbGV0aW9uSGFuZGxlcjpeKE5TVVJMUmVx dWVzdCAqcHJvcG9zZWRSZXF1ZXN0KSB7Ci0gICAgICAgIE5TU3RyaW5nICpodG1sID0gQCI8c2Ny aXB0PndpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdl KCdEb2N1bWVudCBVUkw6ICcgKyBkb2N1bWVudC5VUkwpOzwvc2NyaXB0PiI7Ci0gICAgICAgIGF1 dG8gZmluYWxSZXNwb25zZSA9IGFkb3B0TlMoW1tOU1VSTFJlc3BvbnNlIGFsbG9jXSBpbml0V2l0 aFVSTDpwcm9wb3NlZFJlcXVlc3QuVVJMIE1JTUVUeXBlOkAidGV4dC9odG1sIiBleHBlY3RlZENv bnRlbnRMZW5ndGg6aHRtbC5sZW5ndGggdGV4dEVuY29kaW5nTmFtZTpuaWxdKTsKLQotICAgICAg ICBbdGFzayBkaWRSZWNlaXZlUmVzcG9uc2U6ZmluYWxSZXNwb25zZS5nZXQoKV07Ci0gICAgICAg IFt0YXNrIGRpZFJlY2VpdmVEYXRhOltodG1sIGRhdGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0cmlu Z0VuY29kaW5nXV07Ci0gICAgICAgIFt0YXNrIGRpZEZpbmlzaF07Ci0gICAgfV07Ci19Ci0KLS0g KHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBzdG9wVVJMU2NoZW1lVGFzazooaWQg PFdLVVJMU2NoZW1lVGFzaz4pdGFzawotewotfQotCi1AZW5kCi0KLVRFU1QoVVJMU2NoZW1lSGFu ZGxlciwgSFRUUFdpdGhSZWRpcmVjdCkKK1RFU1QoVVJMU2NoZW1lSGFuZGxlciwgQVBJUmVkaXJl Y3QpCiB7CiAgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZp Z3VyYXRpb24gYWxsb2NdIGluaXRdKTsKICAgICBhdXRvIHNjaGVtZUhhbmRsZXIgPSBhZG9wdE5T KFtUZXN0VVJMU2NoZW1lSGFuZGxlciBuZXddKTsKICAgICBbc2NoZW1lSGFuZGxlciBzZXRTdGFy dFVSTFNjaGVtZVRhc2tIYW5kbGVyOl4oV0tXZWJWaWV3ICosIGlkPFdLVVJMU2NoZW1lVGFzaz4g dGFzaykgewogICAgICAgICBhdXRvIHJlZGlyZWN0UmVzcG9uc2UgPSBhZG9wdE5TKFtbTlNVUkxS ZXNwb25zZSBhbGxvY10gaW5pdFdpdGhVUkw6dGFzay5yZXF1ZXN0LlVSTCBNSU1FVHlwZTpuaWwg ZXhwZWN0ZWRDb250ZW50TGVuZ3RoOjAgdGV4dEVuY29kaW5nTmFtZTpuaWxdKTsKLSAgICAgICAg YXV0byByZWRpcmVjdFJlcXVlc3QgPSBhZG9wdE5TKFtbTlNVUkxSZXF1ZXN0IGFsbG9jXSBpbml0 V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHBzOi8vYmFyLmNvbS9hbm90aGVydGVz dC5odG1sIl1dKTsKKyAgICAgICAgYXV0byByZWRpcmVjdFJlcXVlc3QgPSBhZG9wdE5TKFtbTlNV UkxSZXF1ZXN0IGFsbG9jXSBpbml0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInJlZGly ZWN0b25lOi8vYmFyLmNvbS9hbm90aGVydGVzdC5odG1sIl1dKTsKIAotICAgICAgICBbdGFzayB3 aWxsUGVyZm9ybVJlZGlyZWN0aW9uOnJlZGlyZWN0UmVzcG9uc2UuZ2V0KCkgbmV3UmVxdWVzdDpy ZWRpcmVjdFJlcXVlc3QuZ2V0KCkgY29tcGxldGlvbkhhbmRsZXI6XihOU1VSTFJlcXVlc3QgKnBy b3Bvc2VkUmVxdWVzdCkgeworICAgICAgICBbKGlkPFdLVVJMU2NoZW1lVGFza1ByaXZhdGU+KXRh c2sgX3dpbGxQZXJmb3JtUmVkaXJlY3Rpb246cmVkaXJlY3RSZXNwb25zZS5nZXQoKSBuZXdSZXF1 ZXN0OnJlZGlyZWN0UmVxdWVzdC5nZXQoKSBjb21wbGV0aW9uSGFuZGxlcjpeKE5TVVJMUmVxdWVz dCAqcHJvcG9zZWRSZXF1ZXN0KSB7CiAgICAgICAgICAgICBOU1N0cmluZyAqaHRtbCA9IEAiPHNj cmlwdD53aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2Fn ZSgnRG9jdW1lbnQgVVJMOiAnICsgZG9jdW1lbnQuVVJMKTs8L3NjcmlwdD4iOwogICAgICAgICAg ICAgYXV0byBmaW5hbFJlc3BvbnNlID0gYWRvcHROUyhbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGlu aXRXaXRoVVJMOnByb3Bvc2VkUmVxdWVzdC5VUkwgTUlNRVR5cGU6QCJ0ZXh0L2h0bWwiIGV4cGVj dGVkQ29udGVudExlbmd0aDpodG1sLmxlbmd0aCB0ZXh0RW5jb2RpbmdOYW1lOm5pbF0pOwogCkBA IC0xNDg2LDggKzE0NjEsNyBAQCBURVNUKFVSTFNjaGVtZUhhbmRsZXIsIEhUVFBXaXRoUmVkaXJl Y3QpCiAgICAgICAgIH1dOwogICAgIH1dOwogCi0gICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2No ZW1lSGFuZGxlcjpzY2hlbWVIYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAImh0dHAiXTsKLSAg ICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOnNjaGVtZUhhbmRsZXIuZ2V0KCkg Zm9yVVJMU2NoZW1lOkAiaHR0cHMiXTsKKyAgICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVI YW5kbGVyOnNjaGVtZUhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicmVkaXJlY3RvbmUiXTsK IAogICAgIGF1dG8gbWVzc2FnZUhhbmRsZXIgPSBhZG9wdE5TKFtbVVJMU2NoZW1lSGFuZGxlck1l c3NhZ2VIYW5kbGVyIGFsbG9jXSBpbml0XSk7CiAgICAgW1tjb25maWd1cmF0aW9uIHVzZXJDb250 ZW50Q29udHJvbGxlcl0gYWRkU2NyaXB0TWVzc2FnZUhhbmRsZXI6bWVzc2FnZUhhbmRsZXIuZ2V0 KCkgbmFtZTpAInRlc3RIYW5kbGVyIl07CkBAIC0xNDk1LDcgKzE0NjksNyBAQCBURVNUKFVSTFNj aGVtZUhhbmRsZXIsIEhUVFBXaXRoUmVkaXJlY3QpCiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHRO UyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwg NjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKIAogICAgIHJlY2VpdmVk U2NyaXB0TWVzc2FnZSA9IGZhbHNlOwotICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJl cXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwOi8vZm9vLmNv bS90ZXN0Lmh0bWwiXV1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3Qg cmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJyZWRpcmVjdG9uZTovL2Zvby5j b20vdGVzdC5odG1sIl1dXTsKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVk U2NyaXB0TWVzc2FnZSk7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKEAiRG9jdW1lbnQgVVJMOiBodHRw czovL2Jhci5jb20vYW5vdGhlcnRlc3QuaHRtbCIsIFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7 CisgICAgRVhQRUNUX1dLX1NUUkVRKEAiRG9jdW1lbnQgVVJMOiByZWRpcmVjdG9uZTovL2Jhci5j b20vYW5vdGhlcnRlc3QuaHRtbCIsIFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7CiB9Cg==