208553 2020-03-03 18:08:31 -0800 Add response to _WKResourceLoadDelegate didCompleteWithError callback 2020-03-03 18:35:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen simon.fraser webkit-bug-importer oldest_to_newest 1625348 0 achristensen 2020-03-03 18:08:31 -0800 Add response to _WKResourceLoadDelegate didCompleteWithError callback 1625349 1 392357 achristensen 2020-03-03 18:09:42 -0800 Created attachment 392357 Patch 1625357 2 achristensen 2020-03-03 18:34:58 -0800 http://trac.webkit.org/r257818 1625358 3 webkit-bug-importer 2020-03-03 18:35:15 -0800 <rdar://problem/60023161> 392357 2020-03-03 18:09:42 -0800 2020-03-03 18:32:47 -0800 Patch bug-208553-20200303180942.patch text/plain 20620 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTc4MTYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIwLTAzLTAzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIHJlc3BvbnNl IHRvIF9XS1Jlc291cmNlTG9hZERlbGVnYXRlIGRpZENvbXBsZXRlV2l0aEVycm9yIGNhbGxiYWNr CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg1NTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZXcgZnVu Y3Rpb25hbGl0eSB2ZXJpZmllZCBieSBBUEkgdGVzdC4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtS ZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoTG9hZGluZyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtSZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbExvYWRpbmcpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQVBJUmVzb3VyY2VMb2FkQ2xpZW50Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tSZXNvdXJjZUxvYWREZWxlZ2F0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9S ZXNvdXJjZUxvYWREZWxlZ2F0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9SZXNvdXJj ZUxvYWREZWxlZ2F0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkRGVsZWdhdGU6 OnNldERlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkRGVsZWdhdGU6OlJl c291cmNlTG9hZENsaWVudDo6ZGlkQ29tcGxldGVXaXRoRXJyb3IgY29uc3QpOgorICAgICAgICAq IFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpyZXNvdXJjZUxvYWREaWRDb21wbGV0ZVdpdGhFcnJv cik6CisgICAgICAgICogVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkubWVzc2FnZXMu aW46CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCiAyMDIwLTAzLTAzICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVxdWVzdHMgc2VudCB0byBfV0tS ZXNvdXJjZUxvYWREZWxlZ2F0ZSBzaG91bGQgaW5jbHVkZSBIVFRQQm9keQpJbmRleDogU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmNwcAkocmV2aXNpb24gMjU3ODE2KQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NTMsNyArNjUzLDcg QEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYQogICAgIHRyeVN0b3Jl QXNDYWNoZUVudHJ5KCk7CiAKICAgICBpZiAobV9wYXJhbWV0ZXJzLnBhZ2VIYXNSZXNvdXJjZUxv YWRDbGllbnQpCi0gICAgICAgIG1fY29ubmVjdGlvbi0+bmV0d29ya1Byb2Nlc3MoKS5wYXJlbnRQ cm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpS ZXNvdXJjZUxvYWREaWRDb21wbGV0ZVdpdGhFcnJvcihtX3BhcmFtZXRlcnMud2ViUGFnZVByb3h5 SUQsIHJlc291cmNlTG9hZEluZm8oKSwgeyB9KSwgMCk7CisgICAgICAgIG1fY29ubmVjdGlvbi0+ bmV0d29ya1Byb2Nlc3MoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpSZXNvdXJjZUxvYWREaWRDb21wbGV0ZVdpdGhFcnJvciht X3BhcmFtZXRlcnMud2ViUGFnZVByb3h5SUQsIHJlc291cmNlTG9hZEluZm8oKSwgbV9yZXNwb25z ZSwgeyB9KSwgMCk7CiAKICAgICBjbGVhbnVwKExvYWRSZXN1bHQ6OlN1Y2Nlc3MpOwogfQpAQCAt Njg5LDcgKzY4OSw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRGYWlsTG9hZGkK ICAgICB9CiAKICAgICBpZiAobV9wYXJhbWV0ZXJzLnBhZ2VIYXNSZXNvdXJjZUxvYWRDbGllbnQp Ci0gICAgICAgIG1fY29ubmVjdGlvbi0+bmV0d29ya1Byb2Nlc3MoKS5wYXJlbnRQcm9jZXNzQ29u bmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpSZXNvdXJjZUxv YWREaWRDb21wbGV0ZVdpdGhFcnJvcihtX3BhcmFtZXRlcnMud2ViUGFnZVByb3h5SUQsIHJlc291 cmNlTG9hZEluZm8oKSwgZXJyb3IpLCAwKTsKKyAgICAgICAgbV9jb25uZWN0aW9uLT5uZXR3b3Jr UHJvY2VzcygpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdv cmtQcm9jZXNzUHJveHk6OlJlc291cmNlTG9hZERpZENvbXBsZXRlV2l0aEVycm9yKG1fcGFyYW1l dGVycy53ZWJQYWdlUHJveHlJRCwgcmVzb3VyY2VMb2FkSW5mbygpLCB7IH0sIGVycm9yKSwgMCk7 CiAKICAgICBjbGVhbnVwKExvYWRSZXN1bHQ6OkZhaWx1cmUpOwogfQpJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyNTc4MDkpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 MDg4LDEwICs2MDg4LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZXNvdXJjZUxvYWREaWRSZWNl aXYKICAgICAgICAgbV9yZXNvdXJjZUxvYWRDbGllbnQtPmRpZFJlY2VpdmVSZXNwb25zZShXVEZN b3ZlKGxvYWRJbmZvKSwgV1RGTW92ZShyZXNwb25zZSkpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94 eTo6cmVzb3VyY2VMb2FkRGlkQ29tcGxldGVXaXRoRXJyb3IoUmVzb3VyY2VMb2FkSW5mbyYmIGxv YWRJbmZvLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiYgZXJyb3IpCit2b2lkIFdlYlBhZ2VQcm94 eTo6cmVzb3VyY2VMb2FkRGlkQ29tcGxldGVXaXRoRXJyb3IoUmVzb3VyY2VMb2FkSW5mbyYmIGxv YWRJbmZvLCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVzcG9uc2UsIFdlYkNvcmU6OlJl c291cmNlRXJyb3ImJiBlcnJvcikKIHsKICAgICBpZiAobV9yZXNvdXJjZUxvYWRDbGllbnQpCi0g ICAgICAgIG1fcmVzb3VyY2VMb2FkQ2xpZW50LT5kaWRDb21wbGV0ZVdpdGhFcnJvcihXVEZNb3Zl KGxvYWRJbmZvKSwgV1RGTW92ZShlcnJvcikpOworICAgICAgICBtX3Jlc291cmNlTG9hZENsaWVu dC0+ZGlkQ29tcGxldGVXaXRoRXJyb3IoV1RGTW92ZShsb2FkSW5mbyksIFdURk1vdmUocmVzcG9u c2UpLCBXVEZNb3ZlKGVycm9yKSk7CiB9CiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMjU3ODA5 KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29w eSkKQEAgLTQ4NCw3ICs0ODQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXNvdXJjZUxvYWREaWRQ ZXJmb3JtSFRUUFJlZGlyZWN0aW9uKFJlc291cmNlTG9hZEluZm8mJiwgV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZSYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJik7CiAgICAgdm9pZCByZXNv dXJjZUxvYWREaWRSZWNlaXZlQ2hhbGxlbmdlKFJlc291cmNlTG9hZEluZm8mJiwgV2ViS2l0OjpB dXRoZW50aWNhdGlvbkNoYWxsZW5nZVByb3h5Jik7CiAgICAgdm9pZCByZXNvdXJjZUxvYWREaWRS ZWNlaXZlUmVzcG9uc2UoUmVzb3VyY2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlJiYpOwotICAgIHZvaWQgcmVzb3VyY2VMb2FkRGlkQ29tcGxldGVXaXRoRXJyb3IoUmVzb3Vy Y2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiYpOworICAgIHZvaWQgcmVzb3Vy Y2VMb2FkRGlkQ29tcGxldGVXaXRoRXJyb3IoUmVzb3VyY2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpS ZXNvdXJjZVJlc3BvbnNlJiYsIFdlYkNvcmU6OlJlc291cmNlRXJyb3ImJik7CiAKICAgICB2b2lk IGRpZENoYW5nZUluc3BlY3RvckZyb250ZW5kQ291bnQodW5zaWduZWQgY291bnQpIHsgbV9pbnNw ZWN0b3JGcm9udGVuZENvdW50ID0gY291bnQ7IH0KICAgICB1bnNpZ25lZCBpbnNwZWN0b3JGcm9u dGVuZENvdW50KCkgY29uc3QgeyByZXR1cm4gbV9pbnNwZWN0b3JGcm9udGVuZENvdW50OyB9Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUmVzb3VyY2VMb2FkQ2xpZW50LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVJlc291cmNlTG9h ZENsaWVudC5oCShyZXZpc2lvbiAyNTc4MDkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQVBJUmVzb3VyY2VMb2FkQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0LDcg QEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWRQZXJmb3JtSFRUUFJlZGlyZWN0aW9uKFdl YktpdDo6UmVzb3VyY2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYsIFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYmKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRp ZFJlY2VpdmVDaGFsbGVuZ2UoV2ViS2l0OjpSZXNvdXJjZUxvYWRJbmZvJiYsIFdlYktpdDo6QXV0 aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eSYpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQg ZGlkUmVjZWl2ZVJlc3BvbnNlKFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpS ZXNvdXJjZVJlc3BvbnNlJiYpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkQ29tcGxl dGVXaXRoRXJyb3IoV2ViS2l0OjpSZXNvdXJjZUxvYWRJbmZvJiYsIFdlYkNvcmU6OlJlc291cmNl RXJyb3ImJikgY29uc3QgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaWRDb21wbGV0ZVdpdGhFcnJv cihXZWJLaXQ6OlJlc291cmNlTG9hZEluZm8mJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYm LCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiYpIGNvbnN0ID0gMDsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIEFQSQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Jlc291 cmNlTG9hZERlbGVnYXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS1Jlc291cmNlTG9hZERlbGVnYXRlLmgJKHJldmlzaW9uIDI1NzgwOSkKKysr IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tSZXNvdXJjZUxvYWREZWxlZ2F0 ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw3ICszOCw3IEBAIFdLX0NMQVNTX0FWQUlMQUJMRSht YWNvcyhXS19NQUNfVEJBKSwgaW8KIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmll dyByZXNvdXJjZUxvYWQ6KF9XS1Jlc291cmNlTG9hZEluZm8gKilyZXNvdXJjZUxvYWQgZGlkUGVy Zm9ybUhUVFBSZWRpcmVjdGlvbjooTlNVUkxSZXNwb25zZSAqKXJlc3BvbnNlIG5ld1JlcXVlc3Q6 KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3Q7CiAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdl YlZpZXcgcmVzb3VyY2VMb2FkOihfV0tSZXNvdXJjZUxvYWRJbmZvICopcmVzb3VyY2VMb2FkIGRp ZFJlY2VpdmVDaGFsbGVuZ2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFsbGVu Z2U7CiAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcmVzb3VyY2VMb2FkOihf V0tSZXNvdXJjZUxvYWRJbmZvICopcmVzb3VyY2VMb2FkIGRpZFJlY2VpdmVSZXNwb25zZTooTlNV UkxSZXNwb25zZSAqKXJlc3BvbnNlOwotLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJW aWV3IHJlc291cmNlTG9hZDooX1dLUmVzb3VyY2VMb2FkSW5mbyAqKXJlc291cmNlTG9hZCBkaWRD b21wbGV0ZVdpdGhFcnJvcjooTlNFcnJvciAqIF9fbnVsbGFibGUpZXJyb3I7CistICh2b2lkKXdl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcmVzb3VyY2VMb2FkOihfV0tSZXNvdXJjZUxvYWRJ bmZvICopcmVzb3VyY2VMb2FkIGRpZENvbXBsZXRlV2l0aEVycm9yOihudWxsYWJsZSBOU0Vycm9y ICopZXJyb3IgcmVzcG9uc2U6KG51bGxhYmxlIE5TVVJMUmVzcG9uc2UgKilyZXNwb25zZTsKIAog QGVuZAogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9SZXNvdXJjZUxvYWRE ZWxlZ2F0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1Jl c291cmNlTG9hZERlbGVnYXRlLmgJKHJldmlzaW9uIDI1NzgwOSkKKysrIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1Jlc291cmNlTG9hZERlbGVnYXRlLmgJKHdvcmtpbmcgY29weSkKQEAg LTYzLDcgKzYzLDcgQEAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBkaWRQZXJmb3JtSFRUUFJlZGly ZWN0aW9uKFJlc291cmNlTG9hZEluZm8mJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmLCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJikgY29uc3QgZmluYWw7CiAgICAgICAgIHZvaWQgZGlk UmVjZWl2ZUNoYWxsZW5nZShSZXNvdXJjZUxvYWRJbmZvJiYsIFdlYktpdDo6QXV0aGVudGljYXRp b25DaGFsbGVuZ2VQcm94eSYpIGNvbnN0IGZpbmFsOwogICAgICAgICB2b2lkIGRpZFJlY2VpdmVS ZXNwb25zZShSZXNvdXJjZUxvYWRJbmZvJiYsIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmJikg Y29uc3QgZmluYWw7Ci0gICAgICAgIHZvaWQgZGlkQ29tcGxldGVXaXRoRXJyb3IoUmVzb3VyY2VM b2FkSW5mbyYmLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiYpIGNvbnN0IGZpbmFsOworICAgICAg ICB2b2lkIGRpZENvbXBsZXRlV2l0aEVycm9yKFJlc291cmNlTG9hZEluZm8mJiwgV2ViQ29yZTo6 UmVzb3VyY2VSZXNwb25zZSYmLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiYpIGNvbnN0IGZpbmFs OwogCiAgICAgICAgIFJlc291cmNlTG9hZERlbGVnYXRlJiBtX3Jlc291cmNlTG9hZERlbGVnYXRl OwogICAgIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9SZXNvdXJjZUxv YWREZWxlZ2F0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQkocmV2aXNpb24gMjU3ODE2KQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0JKHdvcmtpbmcgY29w eSkKQEAgLTYzLDcgKzYzLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWREZWxlZ2F0ZTo6c2V0RGVsZWdh dGUoaQogICAgIG1fZGVsZWdhdGVNZXRob2RzLmRpZFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24gPSBb ZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJWaWV3OnJlc291cmNlTG9h ZDpkaWRQZXJmb3JtSFRUUFJlZGlyZWN0aW9uOm5ld1JlcXVlc3Q6KV07CiAgICAgbV9kZWxlZ2F0 ZU1ldGhvZHMuZGlkUmVjZWl2ZUNoYWxsZW5nZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKHdlYlZpZXc6cmVzb3VyY2VMb2FkOmRpZFJlY2VpdmVDaGFsbGVuZ2U6KV07 CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMuZGlkUmVjZWl2ZVJlc3BvbnNlID0gW2RlbGVnYXRlIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlldzpyZXNvdXJjZUxvYWQ6ZGlkUmVjZWl2 ZVJlc3BvbnNlOildOwotICAgIG1fZGVsZWdhdGVNZXRob2RzLmRpZENvbXBsZXRlV2l0aEVycm9y ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlldzpyZXNvdXJj ZUxvYWQ6ZGlkQ29tcGxldGVXaXRoRXJyb3I6KV07CisgICAgbV9kZWxlZ2F0ZU1ldGhvZHMuZGlk Q29tcGxldGVXaXRoRXJyb3IgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rv cih3ZWJWaWV3OnJlc291cmNlTG9hZDpkaWRDb21wbGV0ZVdpdGhFcnJvcjpyZXNwb25zZTopXTsK IH0KIAogUmVzb3VyY2VMb2FkRGVsZWdhdGU6OlJlc291cmNlTG9hZENsaWVudDo6UmVzb3VyY2VM b2FkQ2xpZW50KFJlc291cmNlTG9hZERlbGVnYXRlJiBkZWxlZ2F0ZSkKQEAgLTEyMSw3ICsxMjEs NyBAQCB2b2lkIFJlc291cmNlTG9hZERlbGVnYXRlOjpSZXNvdXJjZUxvYWRDCiAgICAgW2RlbGVn YXRlIHdlYlZpZXc6bV9yZXNvdXJjZUxvYWREZWxlZ2F0ZS5tX3dlYlZpZXcuZ2V0KCkuZ2V0KCkg cmVzb3VyY2VMb2FkOndyYXBwZXIoQVBJOjpSZXNvdXJjZUxvYWRJbmZvOjpjcmVhdGUoV1RGTW92 ZShsb2FkSW5mbykpLmdldCgpKSBkaWRSZWNlaXZlUmVzcG9uc2U6cmVzcG9uc2UubnNVUkxSZXNw b25zZSgpXTsKIH0KIAotdm9pZCBSZXNvdXJjZUxvYWREZWxlZ2F0ZTo6UmVzb3VyY2VMb2FkQ2xp ZW50OjpkaWRDb21wbGV0ZVdpdGhFcnJvcihXZWJLaXQ6OlJlc291cmNlTG9hZEluZm8mJiBsb2Fk SW5mbywgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYmIGVycm9yKSBjb25zdAordm9pZCBSZXNvdXJj ZUxvYWREZWxlZ2F0ZTo6UmVzb3VyY2VMb2FkQ2xpZW50OjpkaWRDb21wbGV0ZVdpdGhFcnJvcihX ZWJLaXQ6OlJlc291cmNlTG9hZEluZm8mJiBsb2FkSW5mbywgV2ViQ29yZTo6UmVzb3VyY2VSZXNw b25zZSYmIHJlc3BvbnNlLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiYgZXJyb3IpIGNvbnN0CiB7 CiAgICAgaWYgKCFtX3Jlc291cmNlTG9hZERlbGVnYXRlLm1fZGVsZWdhdGVNZXRob2RzLmRpZENv bXBsZXRlV2l0aEVycm9yKQogICAgICAgICByZXR1cm47CkBAIC0xMzAsNyArMTMwLDcgQEAgdm9p ZCBSZXNvdXJjZUxvYWREZWxlZ2F0ZTo6UmVzb3VyY2VMb2FkQwogICAgIGlmICghZGVsZWdhdGUp CiAgICAgICAgIHJldHVybjsKIAotICAgIFtkZWxlZ2F0ZSB3ZWJWaWV3Om1fcmVzb3VyY2VMb2Fk RGVsZWdhdGUubV93ZWJWaWV3LmdldCgpLmdldCgpIHJlc291cmNlTG9hZDp3cmFwcGVyKEFQSTo6 UmVzb3VyY2VMb2FkSW5mbzo6Y3JlYXRlKFdURk1vdmUobG9hZEluZm8pKS5nZXQoKSkgZGlkQ29t cGxldGVXaXRoRXJyb3I6ZXJyb3IubnNFcnJvcigpXTsKKyAgICBbZGVsZWdhdGUgd2ViVmlldzpt X3Jlc291cmNlTG9hZERlbGVnYXRlLm1fd2ViVmlldy5nZXQoKS5nZXQoKSByZXNvdXJjZUxvYWQ6 d3JhcHBlcihBUEk6OlJlc291cmNlTG9hZEluZm86OmNyZWF0ZShXVEZNb3ZlKGxvYWRJbmZvKSku Z2V0KCkpIGRpZENvbXBsZXRlV2l0aEVycm9yOmVycm9yLm5zRXJyb3IoKSByZXNwb25zZTpyZXNw b25zZS5uc1VSTFJlc3BvbnNlKCldOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJv Y2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gMjU3ODE2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTE2 LDEzICs1MTYsMTMgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpyZXNvdXJjZUxvYWREaQog ICAgIHBhZ2UtPnJlc291cmNlTG9hZERpZFJlY2VpdmVSZXNwb25zZShXVEZNb3ZlKGxvYWRJbmZv KSwgV1RGTW92ZShyZXNwb25zZSkpOwogfQogCi12b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnJl c291cmNlTG9hZERpZENvbXBsZXRlV2l0aEVycm9yKFdlYlBhZ2VQcm94eUlkZW50aWZpZXIgcGFn ZUlELCBSZXNvdXJjZUxvYWRJbmZvJiYgbG9hZEluZm8sIFdlYkNvcmU6OlJlc291cmNlRXJyb3Im JiBlcnJvcikKK3ZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6cmVzb3VyY2VMb2FkRGlkQ29tcGxl dGVXaXRoRXJyb3IoV2ViUGFnZVByb3h5SWRlbnRpZmllciBwYWdlSUQsIFJlc291cmNlTG9hZElu Zm8mJiBsb2FkSW5mbywgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYmIHJlc3BvbnNlLCBXZWJD b3JlOjpSZXNvdXJjZUVycm9yJiYgZXJyb3IpCiB7CiAgICAgYXV0byogcGFnZSA9IFdlYlByb2Nl c3NQcm94eTo6d2ViUGFnZShwYWdlSUQpOwogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgcGFnZS0+cmVzb3VyY2VMb2FkRGlkQ29tcGxldGVXaXRoRXJyb3IoV1RGTW92ZShs b2FkSW5mbyksIFdURk1vdmUoZXJyb3IpKTsKKyAgICBwYWdlLT5yZXNvdXJjZUxvYWREaWRDb21w bGV0ZVdpdGhFcnJvcihXVEZNb3ZlKGxvYWRJbmZvKSwgV1RGTW92ZShyZXNwb25zZSksIFdURk1v dmUoZXJyb3IpKTsKIH0KIAogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHku aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQ cm9jZXNzUHJveHkuaAkocmV2aXNpb24gMjU3ODE2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTIxOSw3 ICsyMTksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXNvdXJjZUxvYWREaWRQZXJmb3JtSFRUUFJl ZGlyZWN0aW9uKFdlYlBhZ2VQcm94eUlkZW50aWZpZXIsIFJlc291cmNlTG9hZEluZm8mJiwgV2Vi Q29yZTo6UmVzb3VyY2VSZXNwb25zZSYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJik7CiAg ICAgdm9pZCByZXNvdXJjZUxvYWREaWRSZWNlaXZlQ2hhbGxlbmdlKFdlYlBhZ2VQcm94eUlkZW50 aWZpZXIsIFJlc291cmNlTG9hZEluZm8mJiwgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVu Z2UmJik7CiAgICAgdm9pZCByZXNvdXJjZUxvYWREaWRSZWNlaXZlUmVzcG9uc2UoV2ViUGFnZVBy b3h5SWRlbnRpZmllciwgUmVzb3VyY2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlJiYpOwotICAgIHZvaWQgcmVzb3VyY2VMb2FkRGlkQ29tcGxldGVXaXRoRXJyb3IoV2ViUGFn ZVByb3h5SWRlbnRpZmllciwgUmVzb3VyY2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpSZXNvdXJjZUVy cm9yJiYpOworICAgIHZvaWQgcmVzb3VyY2VMb2FkRGlkQ29tcGxldGVXaXRoRXJyb3IoV2ViUGFn ZVByb3h5SWRlbnRpZmllciwgUmVzb3VyY2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlJiYsIFdlYkNvcmU6OlJlc291cmNlRXJyb3ImJik7CiAKICAgICB2b2lkIGhhc0FwcEJv dW5kU2Vzc2lvbihQQUw6OlNlc3Npb25JRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4m Jik7CiAgICAgdm9pZCBzZXRJbkFwcEJyb3dzZXJQcml2YWN5RW5hYmxlZChQQUw6OlNlc3Npb25J RCwgYm9vbCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5tZXNzYWdlcy5pbgo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz UHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDI1NzgxNikKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5tZXNzYWdlcy5pbgkod29ya2luZyBj b3B5KQpAQCAtNzAsNSArNzAsNSBAQCBtZXNzYWdlcyAtPiBOZXR3b3JrUHJvY2Vzc1Byb3h5IExl Z2FjeVJlCiAgICAgUmVzb3VyY2VMb2FkRGlkUGVyZm9ybUhUVFBSZWRpcmVjdGlvbihXZWJLaXQ6 OldlYlBhZ2VQcm94eUlkZW50aWZpZXIgcGFnZUlkZW50aWZpZXIsIHN0cnVjdCBXZWJLaXQ6OlJl c291cmNlTG9hZEluZm8gcmVzb3VyY2VMb2FkSW5mbywgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25z ZSByZXNvdXJjZVJlc3BvbnNlLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCkKICAg ICBSZXNvdXJjZUxvYWREaWRSZWNlaXZlQ2hhbGxlbmdlKFdlYktpdDo6V2ViUGFnZVByb3h5SWRl bnRpZmllciBwYWdlSWRlbnRpZmllciwgc3RydWN0IFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbyBy ZXNvdXJjZUxvYWRJbmZvLCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSBjaGFsbGVu Z2UpCiAgICAgUmVzb3VyY2VMb2FkRGlkUmVjZWl2ZVJlc3BvbnNlKFdlYktpdDo6V2ViUGFnZVBy b3h5SWRlbnRpZmllciBwYWdlSWRlbnRpZmllciwgc3RydWN0IFdlYktpdDo6UmVzb3VyY2VMb2Fk SW5mbyByZXNvdXJjZUxvYWRJbmZvLCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNl KQotICAgIFJlc291cmNlTG9hZERpZENvbXBsZXRlV2l0aEVycm9yKFdlYktpdDo6V2ViUGFnZVBy b3h5SWRlbnRpZmllciBwYWdlSWRlbnRpZmllciwgc3RydWN0IFdlYktpdDo6UmVzb3VyY2VMb2Fk SW5mbyByZXNvdXJjZUxvYWRJbmZvLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIGVycm9yKQorICAg IFJlc291cmNlTG9hZERpZENvbXBsZXRlV2l0aEVycm9yKFdlYktpdDo6V2ViUGFnZVByb3h5SWRl bnRpZmllciBwYWdlSWRlbnRpZmllciwgc3RydWN0IFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbyBy ZXNvdXJjZUxvYWRJbmZvLCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlLCBXZWJD b3JlOjpSZXNvdXJjZUVycm9yIGVycm9yKQogfQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjU3ODE2KQorKysgVG9vbHMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMDMgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgcmVz cG9uc2UgdG8gX1dLUmVzb3VyY2VMb2FkRGVsZWdhdGUgZGlkQ29tcGxldGVXaXRoRXJyb3IgY2Fs bGJhY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw ODU1MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbToK KyAgICAgICAgKC1bVGVzdFJlc291cmNlTG9hZERlbGVnYXRlIHdlYlZpZXc6cmVzb3VyY2VMb2Fk OmRpZENvbXBsZXRlV2l0aEVycm9yOnJlc3BvbnNlOl0pOgorICAgICAgICAoVEVTVCk6CisgICAg ICAgICgtW1Rlc3RSZXNvdXJjZUxvYWREZWxlZ2F0ZSB3ZWJWaWV3OnJlc291cmNlTG9hZDpkaWRD b21wbGV0ZVdpdGhFcnJvcjpdKTogRGVsZXRlZC4KKwogMjAyMC0wMy0wMyAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlcXVlc3RzIHNlbnQg dG8gX1dLUmVzb3VyY2VMb2FkRGVsZWdhdGUgc2hvdWxkIGluY2x1ZGUgSFRUUEJvZHkKSW5kZXg6 IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdh dGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQkocmV2aXNpb24gMjU3ODE2KQorKysgVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQkod29y a2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCBAaW50ZXJmYWNlIFRlc3RSZXNvdXJjZUxvYWRE ZWxlZ2F0ZSA6IE5TCiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgdm9pZCAoXmRpZFBlcmZv cm1IVFRQUmVkaXJlY3Rpb24pKFdLV2ViVmlldyAqLCBfV0tSZXNvdXJjZUxvYWRJbmZvICosIE5T VVJMUmVzcG9uc2UgKiwgTlNVUkxSZXF1ZXN0ICopOwogQHByb3BlcnR5IChub25hdG9taWMsIGNv cHkpIHZvaWQgKF5kaWRSZWNlaXZlQ2hhbGxlbmdlKShXS1dlYlZpZXcgKiwgX1dLUmVzb3VyY2VM b2FkSW5mbyAqLCBOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICopOwogQHByb3BlcnR5IChu b25hdG9taWMsIGNvcHkpIHZvaWQgKF5kaWRSZWNlaXZlUmVzcG9uc2UpKFdLV2ViVmlldyAqLCBf V0tSZXNvdXJjZUxvYWRJbmZvICosIE5TVVJMUmVzcG9uc2UgKik7Ci1AcHJvcGVydHkgKG5vbmF0 b21pYywgY29weSkgdm9pZCAoXmRpZENvbXBsZXRlV2l0aEVycm9yKShXS1dlYlZpZXcgKiwgX1dL UmVzb3VyY2VMb2FkSW5mbyAqLCBOU0Vycm9yICopOworQHByb3BlcnR5IChub25hdG9taWMsIGNv cHkpIHZvaWQgKF5kaWRDb21wbGV0ZVdpdGhFcnJvcikoV0tXZWJWaWV3ICosIF9XS1Jlc291cmNl TG9hZEluZm8gKiwgTlNFcnJvciAqLCBOU1VSTFJlc3BvbnNlICopOwogCiBAZW5kCiAKQEAgLTcz LDEwICs3MywxMCBAQCAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcmVzCiAg ICAgICAgIF9kaWRSZWNlaXZlUmVzcG9uc2Uod2ViVmlldywgcmVzb3VyY2VMb2FkLCByZXNwb25z ZSk7CiB9CiAKLS0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyByZXNvdXJjZUxv YWQ6KF9XS1Jlc291cmNlTG9hZEluZm8gKilyZXNvdXJjZUxvYWQgZGlkQ29tcGxldGVXaXRoRXJy b3I6KE5TRXJyb3IgKillcnJvcgorLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3 IHJlc291cmNlTG9hZDooX1dLUmVzb3VyY2VMb2FkSW5mbyAqKXJlc291cmNlTG9hZCBkaWRDb21w bGV0ZVdpdGhFcnJvcjooTlNFcnJvciAqKWVycm9yIHJlc3BvbnNlOihOU1VSTFJlc3BvbnNlICop cmVzcG9uc2UKIHsKICAgICBpZiAoX2RpZENvbXBsZXRlV2l0aEVycm9yKQotICAgICAgICBfZGlk Q29tcGxldGVXaXRoRXJyb3Iod2ViVmlldywgcmVzb3VyY2VMb2FkLCBlcnJvcik7CisgICAgICAg IF9kaWRDb21wbGV0ZVdpdGhFcnJvcih3ZWJWaWV3LCByZXNvdXJjZUxvYWQsIGVycm9yLCByZXNw b25zZSk7CiB9CiAKIEBlbmQKQEAgLTE4Nyw3ICsxODcsNyBAQCBURVNUKFJlc291cmNlTG9hZERl bGVnYXRlLCBSZWRpcmVjdCkKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKGxvYWRJbmZvLm9yaWdp bmFsVVJMLnBhdGgsICIvIik7CiAgICAgICAgIEVYUEVDVF9XS19TVFJFUShsb2FkSW5mby5vcmln aW5hbEhUVFBNZXRob2QsICJHRVQiKTsKICAgICB9XTsKLSAgICBbcmVzb3VyY2VMb2FkRGVsZWdh dGUgc2V0RGlkQ29tcGxldGVXaXRoRXJyb3I6XihXS1dlYlZpZXcgKiwgX1dLUmVzb3VyY2VMb2Fk SW5mbyAqbG9hZEluZm8sIE5TRXJyb3IgKikgeworICAgIFtyZXNvdXJjZUxvYWREZWxlZ2F0ZSBz ZXREaWRDb21wbGV0ZVdpdGhFcnJvcjpeKFdLV2ViVmlldyAqLCBfV0tSZXNvdXJjZUxvYWRJbmZv ICpsb2FkSW5mbywgTlNFcnJvciAqLCBOU1VSTFJlc3BvbnNlICopIHsKICAgICAgICAgRVhQRUNU X1dLX1NUUkVRKGxvYWRJbmZvLm9yaWdpbmFsVVJMLnBhdGgsICIvIik7CiAgICAgICAgIEVYUEVD VF9XS19TVFJFUShsb2FkSW5mby5vcmlnaW5hbEhUVFBNZXRob2QsICJHRVQiKTsKICAgICAgICAg ZG9uZSA9IHRydWU7CkBAIC0yMzIsMTEgKzIzMiwxMiBAQCBURVNUKFJlc291cmNlTG9hZERlbGVn YXRlLCBMb2FkSW5mbykKICAgICAgICAgbG9hZEluZm9zLmFwcGVuZChsb2FkSW5mbyk7CiAgICAg ICAgIG90aGVyUGFyYW1ldGVycy5hcHBlbmQocmVzcG9uc2UpOwogICAgIH1dOwotICAgIFtkZWxl Z2F0ZSBzZXREaWRDb21wbGV0ZVdpdGhFcnJvcjpeKFdLV2ViVmlldyAqd2ViVmlldywgX1dLUmVz b3VyY2VMb2FkSW5mbyAqbG9hZEluZm8sIE5TRXJyb3IgKmVycm9yKSB7CisgICAgW2RlbGVnYXRl IHNldERpZENvbXBsZXRlV2l0aEVycm9yOl4oV0tXZWJWaWV3ICp3ZWJWaWV3LCBfV0tSZXNvdXJj ZUxvYWRJbmZvICpsb2FkSW5mbywgTlNFcnJvciAqZXJyb3IsIE5TVVJMUmVzcG9uc2UgKnJlc3Bv bnNlKSB7CiAgICAgICAgIGNhbGxiYWNrcy5hcHBlbmQoQ2FsbGJhY2s6OkRpZENvbXBsZXRlV2l0 aEVycm9yKTsKICAgICAgICAgd2ViVmlld3MuYXBwZW5kKHdlYlZpZXcpOwogICAgICAgICBsb2Fk SW5mb3MuYXBwZW5kKGxvYWRJbmZvKTsKICAgICAgICAgb3RoZXJQYXJhbWV0ZXJzLmFwcGVuZChl cnJvcik7CisgICAgICAgIG90aGVyUGFyYW1ldGVycy5hcHBlbmQocmVzcG9uc2UpOwogICAgICAg ICByZXNvdXJjZUNvbXBsZXRpb25Db3VudCsrOwogICAgIH1dOwogCkBAIC0yOTUsMjQgKzI5Niwz MiBAQCBURVNUKFJlc291cmNlTG9hZERlbGVnYXRlLCBMb2FkSW5mbykKICAgICBjaGVja0ZyYW1l cyg3LCBzdWIsIG1haW4pOwogICAgIGNoZWNrRnJhbWVzKDgsIHN1YiwgbWFpbik7CiAKLSAgICBF WFBFQ1RfRVEob3RoZXJQYXJhbWV0ZXJzLnNpemUoKSwgOXVsbCk7CisgICAgRVhQRUNUX0VRKG90 aGVyUGFyYW1ldGVycy5zaXplKCksIDEydWxsKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoTlNTdHJp bmdGcm9tQ2xhc3MoW290aGVyUGFyYW1ldGVyc1swXSBjbGFzc10pLCAiTlNNdXRhYmxlVVJMUmVx dWVzdCIpOwogICAgIEVYUEVDVF9XS19TVFJFUShbb3RoZXJQYXJhbWV0ZXJzWzBdIFVSTF0ucGF0 aCwgIi8iKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoTlNTdHJpbmdGcm9tQ2xhc3MoW290aGVyUGFy YW1ldGVyc1sxXSBjbGFzc10pLCAiTlNIVFRQVVJMUmVzcG9uc2UiKTsKICAgICBFWFBFQ1RfV0tf U1RSRVEoW290aGVyUGFyYW1ldGVyc1sxXSBVUkxdLnBhdGgsICIvIik7CiAgICAgRVhQRUNUX0VR KG90aGVyUGFyYW1ldGVyc1syXSwgbmlsKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoTlNTdHJpbmdG cm9tQ2xhc3MoW290aGVyUGFyYW1ldGVyc1szXSBjbGFzc10pLCAiTlNNdXRhYmxlVVJMUmVxdWVz dCIpOwotICAgIEVYUEVDVF9XS19TVFJFUShbb3RoZXJQYXJhbWV0ZXJzWzNdIFVSTF0ucGF0aCwg Ii9pZnJhbWVTcmMiKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoTlNTdHJpbmdGcm9tQ2xhc3MoW290 aGVyUGFyYW1ldGVyc1s0XSBjbGFzc10pLCAiTlNIVFRQVVJMUmVzcG9uc2UiKTsKKyAgICBFWFBF Q1RfV0tfU1RSRVEoTlNTdHJpbmdGcm9tQ2xhc3MoW290aGVyUGFyYW1ldGVyc1szXSBjbGFzc10p LCAiTlNIVFRQVVJMUmVzcG9uc2UiKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW290aGVyUGFyYW1l dGVyc1szXSBVUkxdLnBhdGgsICIvIik7CisKKyAgICBFWFBFQ1RfV0tfU1RSRVEoTlNTdHJpbmdG cm9tQ2xhc3MoW290aGVyUGFyYW1ldGVyc1s0XSBjbGFzc10pLCAiTlNNdXRhYmxlVVJMUmVxdWVz dCIpOwogICAgIEVYUEVDVF9XS19TVFJFUShbb3RoZXJQYXJhbWV0ZXJzWzRdIFVSTF0ucGF0aCwg Ii9pZnJhbWVTcmMiKTsKLSAgICBFWFBFQ1RfRVEob3RoZXJQYXJhbWV0ZXJzWzVdLCBuaWwpOwot ICAgIEVYUEVDVF9XS19TVFJFUShOU1N0cmluZ0Zyb21DbGFzcyhbb3RoZXJQYXJhbWV0ZXJzWzZd IGNsYXNzXSksICJOU011dGFibGVVUkxSZXF1ZXN0Iik7Ci0gICAgRVhQRUNUX1dLX1NUUkVRKFtv dGhlclBhcmFtZXRlcnNbNl0gVVJMXS5wYXRoLCAiL2ZldGNoVGFyZ2V0Iik7Ci0gICAgRVhQRUNU X1dLX1NUUkVRKFtbW05TU3RyaW5nIGFsbG9jXSBpbml0V2l0aERhdGE6W290aGVyUGFyYW1ldGVy c1s2XSBIVFRQQm9keV0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddIGF1dG9yZWxlYXNl XSwgImE9YiZjPWQiKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoTlNTdHJpbmdGcm9tQ2xhc3MoW290 aGVyUGFyYW1ldGVyc1s1XSBjbGFzc10pLCAiTlNIVFRQVVJMUmVzcG9uc2UiKTsKKyAgICBFWFBF Q1RfV0tfU1RSRVEoW290aGVyUGFyYW1ldGVyc1s1XSBVUkxdLnBhdGgsICIvaWZyYW1lU3JjIik7 CisgICAgRVhQRUNUX0VRKG90aGVyUGFyYW1ldGVyc1s2XSwgbmlsKTsKICAgICBFWFBFQ1RfV0tf U1RSRVEoTlNTdHJpbmdGcm9tQ2xhc3MoW290aGVyUGFyYW1ldGVyc1s3XSBjbGFzc10pLCAiTlNI VFRQVVJMUmVzcG9uc2UiKTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoW290aGVyUGFyYW1ldGVyc1s3 XSBVUkxdLnBhdGgsICIvZmV0Y2hUYXJnZXQiKTsKLSAgICBFWFBFQ1RfRVEob3RoZXJQYXJhbWV0 ZXJzWzhdLCBuaWwpOwotICAgIAorICAgIEVYUEVDVF9XS19TVFJFUShbb3RoZXJQYXJhbWV0ZXJz WzddIFVSTF0ucGF0aCwgIi9pZnJhbWVTcmMiKTsKKworICAgIEVYUEVDVF9XS19TVFJFUShOU1N0 cmluZ0Zyb21DbGFzcyhbb3RoZXJQYXJhbWV0ZXJzWzhdIGNsYXNzXSksICJOU011dGFibGVVUkxS ZXF1ZXN0Iik7CisgICAgRVhQRUNUX1dLX1NUUkVRKFtvdGhlclBhcmFtZXRlcnNbOF0gVVJMXS5w YXRoLCAiL2ZldGNoVGFyZ2V0Iik7CisgICAgRVhQRUNUX1dLX1NUUkVRKFtbW05TU3RyaW5nIGFs bG9jXSBpbml0V2l0aERhdGE6W290aGVyUGFyYW1ldGVyc1s4XSBIVFRQQm9keV0gZW5jb2Rpbmc6 TlNVVEY4U3RyaW5nRW5jb2RpbmddIGF1dG9yZWxlYXNlXSwgImE9YiZjPWQiKTsKKyAgICBFWFBF Q1RfV0tfU1RSRVEoTlNTdHJpbmdGcm9tQ2xhc3MoW290aGVyUGFyYW1ldGVyc1s5XSBjbGFzc10p LCAiTlNIVFRQVVJMUmVzcG9uc2UiKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW290aGVyUGFyYW1l dGVyc1s5XSBVUkxdLnBhdGgsICIvZmV0Y2hUYXJnZXQiKTsKKyAgICBFWFBFQ1RfRVEob3RoZXJQ YXJhbWV0ZXJzWzEwXSwgbmlsKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoTlNTdHJpbmdGcm9tQ2xh c3MoW290aGVyUGFyYW1ldGVyc1sxMV0gY2xhc3NdKSwgIk5TSFRUUFVSTFJlc3BvbnNlIik7Cisg ICAgRVhQRUNUX1dLX1NUUkVRKFtvdGhlclBhcmFtZXRlcnNbMTFdIFVSTF0ucGF0aCwgIi9mZXRj aFRhcmdldCIpOworCiAgICAgX1dLUmVzb3VyY2VMb2FkSW5mbyAqb3JpZ2luYWwgPSBsb2FkSW5m b3NbMF0uZ2V0KCk7CiAgICAgTlNFcnJvciAqZXJyb3IgPSBuaWw7CiAgICAgTlNEYXRhICphcmNo aXZlRGF0YSA9IFtOU0tleWVkQXJjaGl2ZXIgYXJjaGl2ZWREYXRhV2l0aFJvb3RPYmplY3Q6b3Jp Z2luYWwgcmVxdWlyaW5nU2VjdXJlQ29kaW5nOllFUyBlcnJvcjomZXJyb3JdOwpAQCAtMzUzLDcg KzM2Miw3IEBAIFRFU1QoUmVzb3VyY2VMb2FkRGVsZWdhdGUsIENoYWxsZW5nZSkKICAgICAgICAg RVhQRUNUX1dLX1NUUkVRKGNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UuYXV0aGVudGljYXRpb25N ZXRob2QsIE5TVVJMQXV0aGVudGljYXRpb25NZXRob2RTZXJ2ZXJUcnVzdCk7CiAgICAgICAgIHJl Y2VpdmVkQ2hhbGxlbmdlTm90aWZpY2lhdGlvbiA9IHRydWU7CiAgICAgfV07Ci0gICAgW3Jlc291 cmNlTG9hZERlbGVnYXRlIHNldERpZENvbXBsZXRlV2l0aEVycm9yOl4oV0tXZWJWaWV3ICosIF9X S1Jlc291cmNlTG9hZEluZm8gKiwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICBbcmVzb3VyY2VMb2Fk RGVsZWdhdGUgc2V0RGlkQ29tcGxldGVXaXRoRXJyb3I6XihXS1dlYlZpZXcgKiwgX1dLUmVzb3Vy Y2VMb2FkSW5mbyAqLCBOU0Vycm9yICplcnJvciwgTlNVUkxSZXNwb25zZSAqKSB7CiAgICAgICAg IEVYUEVDVF9FUShlcnJvci5jb2RlLCBrQ0ZVUkxFcnJvckNhbm5vdENvbm5lY3RUb0hvc3QpOwog ICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZXJyb3IuZG9tYWluLCBOU1VSTEVycm9yRG9tYWluKTsK ICAgICAgICAgcmVjZWl2ZWRFcnJvck5vdGlmaWNhdGlvbiA9IHRydWU7Cg==