102570 2012-11-16 16:21:18 -0800 Move resource loader messaging from NetworkConnectionToWebProcess directly to NetworkResourceLoader 2012-11-16 16:42:27 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 98537 1 beidson beidson ap sam oldest_to_newest 769756 0 beidson 2012-11-16 16:21:18 -0800 Move resource loader messaging from NetworkConnectionToWebProcess directly to NetworkResourceLoader This completes the 1-to-1 relationship between WebResourceLoader and NetworkResourceLoader that was started in https://bugs.webkit.org/show_bug.cgi?id=102259 and will make resource load messaging much easy to add on to going forward. 769758 1 174778 beidson 2012-11-16 16:27:22 -0800 Created attachment 174778 Patch v1 769766 2 beidson 2012-11-16 16:42:27 -0800 http://trac.webkit.org/changeset/135017 174778 2012-11-16 16:27:22 -0800 2012-11-16 16:28:56 -0800 Patch v1 patch text/plain 25026 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkYWQ5MWI2Li41ZDQ2ODQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcg QEAKKzIwMTItMTEtMTYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIE1vdmUgcmVzb3VyY2UgbG9hZGVyIG1lc3NhZ2luZyBmcm9tIE5ldHdvcmtDb25uZWN0aW9u VG9XZWJQcm9jZXNzIGRpcmVjdGx5IHRvIE5ldHdvcmtSZXNvdXJjZUxvYWRlcgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyNTcwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIHRo ZSBhYmlsaXR5IGZvciBXZWJSZXNvdXJjZUxvYWRlciB0byBtZXNzYWdlIE5ldHdvcmtSZXNvdXJj ZUxvYWRlciBkaXJlY3RseS4KKworICAgICAgICBUaGlzIGZ1cnRoZXIgY2VtZW50cyB0aGUgMS10 by0xIHJlbGF0aW9uc2hpcCBiZXR3ZWVuIHRoZSB0d28gY2xhc3NlcyBhbmQgbWFrZXMgaXQgZWFz eSB0byBhZGQvY2hhbmdlCisgICAgICAgIGxvYWRlciByZWxhdGVkIG1lc3NhZ2luZyBnb2luZyBm b3J3YXJkLgorCisgICAgICAgIEJ1aWxkL2luZnJhc3RydWN0dXJlIHN0dWZmOgorICAgICAgICAq IFBsYXRmb3JtL0NvcmVJUEMvTWVzc2FnZUlELmg6CisgICAgICAgICogV2ViS2l0Mi54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIERlcml2ZWRTb3VyY2VzLm1ha2U6CisKKyAg ICAgICAgUmVtb3ZlIHRoZSBXaWxsU2VuZFJlcXVlc3RIYW5kbGVkIG1lc3NhZ2UsIGFuZCBmb3J3 YXJkIE5ldHdvcmtSZXNvdXJjZUxvYWRlciBtZXNzYWdlcyBvbiB0byB0aGUgY29ycmVjdCBvYmpl Y3Q6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6 ZGlkUmVjZWl2ZU1lc3NhZ2UpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW46CisKKyAgICAgICAgSGFuZyBvbiB0byBh IG1hc3RlciBtYXAgb2YgaWRlbnRpZmllcnMgdG8gTmV0d29ya1Jlc291cmNlTG9hZGVyczoKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVS ZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1 bGVyOjpyZW1vdmVMb2FkSWRlbnRpZmllcik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNv dXJjZUxvYWRTY2hlZHVsZXI6Om5ldHdvcmtSZXNvdXJjZUxvYWRlckZvcklkZW50aWZpZXIpOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXIuaDoK KworICAgICAgICBDaGFuZ2UgdGhlIHdheSAid2lsbFNlbmRSZXF1ZXN0SGFuZGxlZCIgY29tZXMg aW4gdG8gYmUgYSBkaXJlY3QgbWVzc2FnZToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VM b2FkZXI6OndpbGxTZW5kUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJj ZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SGFuZGxlZCk6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Jlc291cmNlTG9hZGVyLm1lc3NhZ2VzLmluOgorCisgICAgICAgIE1ha2UgV2ViUmVzb3Vy Y2VMb2FkZXIgYSBNZXNzYWdlU2VuZGVyOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9X ZWJSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZGVy Ojpjb25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkZXI6OmRlc3Rp bmF0aW9uSUQpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRS ZXF1ZXN0KTogVXNlIE1lc3NhZ2VTZW5kZXIgYWJpbGl0aWVzIHRvIG1lc3NhZ2UgdGhlIE5ldHdv cmtSZXNvdXJjZUxvYWRlci4KKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3Vy Y2VMb2FkZXIuaDoKKwogMjAxMi0xMS0xNCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5j b20+CiAKICAgICAgICAgTW92ZSBsb2FkaW5nIHJlc3BvbnNpYmlsaXR5IG91dCBvZiBXZWJSZXNv dXJjZUxvYWRTY2hlZHVsZXIgaW50byBhIG5ldyBXZWJSZXNvdXJjZUxvYWRlcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvRGVyaXZlZFNvdXJjZXMubWFrZSBiL1NvdXJjZS9XZWJLaXQyL0Rl cml2ZWRTb3VyY2VzLm1ha2UKaW5kZXggYTkyOGM3Zi4uYWVkYTEwNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvRGVyaXZlZFNvdXJjZXMubWFrZQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9EZXJp dmVkU291cmNlcy5tYWtlCkBAIC03OSw2ICs3OSw3IEBAIE1FU1NBR0VfUkVDRUlWRVJTID0gXAog ICAgIFdlYkNvb2tpZU1hbmFnZXJQcm94eSBcCiAgICAgV2ViQ29ubmVjdGlvbiBcCiAgICAgTmV0 d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MgXAorICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRlciBc CiAgICAgUmVtb3RlTGF5ZXJUcmVlSG9zdCBcCiAgICAgV2ViQ29udGV4dCBcCiAgICAgV2ViRGF0 YWJhc2VNYW5hZ2VyIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAppbmRleCBjMzc0NjE5 Li41MGNlNzM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCkBAIC03Niw2ICs3Niwx MyBAQCB2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpkaWRSZWNlaXZlTWVzc2Fn ZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZQogICAgICAgICBkaWRSZWNlaXZlTmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3NNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwgZGVjb2Rl cik7CiAgICAgICAgIHJldHVybjsKICAgICB9CisgICAgCisgICAgaWYgKG1lc3NhZ2VJRC5pczxD b3JlSVBDOjpNZXNzYWdlQ2xhc3NOZXR3b3JrUmVzb3VyY2VMb2FkZXI+KCkpIHsKKyAgICAgICAg TmV0d29ya1Jlc291cmNlTG9hZGVyKiBsb2FkZXIgPSBOZXR3b3JrUHJvY2Vzczo6c2hhcmVkKCku bmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlcigpLm5ldHdvcmtSZXNvdXJjZUxvYWRlckZvcklk ZW50aWZpZXIoZGVjb2Rlci5kZXN0aW5hdGlvbklEKCkpOworICAgICAgICBpZiAobG9hZGVyKQor ICAgICAgICAgICAgbG9hZGVyLT5kaWRSZWNlaXZlTmV0d29ya1Jlc291cmNlTG9hZGVyTWVzc2Fn ZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRlY29kZXIpOworICAgICAgICByZXR1cm47CisgICAg fQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCkBAIC0xNDUsMTEgKzE1Miw2IEBAIHZv aWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnNldFNlcmlhbExvYWRpbmdFbmFibGVk KGJvb2wgZW5hYmxlZCkKICAgICBtX3NlcmlhbExvYWRpbmdFbmFibGVkID0gZW5hYmxlZDsKIH0K IAotdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6d2lsbFNlbmRSZXF1ZXN0SGFu ZGxlZCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYg bmV3UmVxdWVzdCkKLXsKLSAgICBkaWRSZWNlaXZlV2lsbFNlbmRSZXF1ZXN0SGFuZGxlZChyZXF1 ZXN0SUQsIG5ld1JlcXVlc3QpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlm IC8vIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oIGIvU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuaAppbmRl eCA0MWQwNDg4Li4xNzliYzJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmgKQEAgLTgyLDcg KzgyLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHN1c3BlbmRQZW5kaW5nUmVxdWVzdHMoKTsKICAg ICB2b2lkIHJlc3VtZVBlbmRpbmdSZXF1ZXN0cygpOwogICAgIHZvaWQgc2V0U2VyaWFsTG9hZGlu Z0VuYWJsZWQoYm9vbCk7Ci0gICAgdm9pZCB3aWxsU2VuZFJlcXVlc3RIYW5kbGVkKHVpbnQ2NF90 IHJlcXVlc3RJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAgCiAgICAg UmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+IG1fY29ubmVjdGlvbjsKICAgICAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQ cm9jZXNzLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KaW5kZXggNWMwMTVjNS4uOGMxM2Uz YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KQEAgLTM4 LDggKzM4LDYgQEAgbWVzc2FnZXMgLT4gTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3Mgewog ICAgIFJlc3VtZVBlbmRpbmdSZXF1ZXN0cygpIC0+ICgpCiAgICAgCiAgICAgU2V0U2VyaWFsTG9h ZGluZ0VuYWJsZWQoYm9vbCBlbmFibGVkKSAtPiAoKQotICAgIAotICAgIFdpbGxTZW5kUmVxdWVz dEhhbmRsZWQodWludDY0X3QgcmVxdWVzdElELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgbmV3 UmVxdWVzdCkKIH0KIAogI2VuZGlmIC8vIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkU2No ZWR1bGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJj ZUxvYWRTY2hlZHVsZXIuY3BwCmluZGV4IDc4ODk3MDAuLjhhNWQ3YTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxv YWRTY2hlZHVsZXIuY3BwCkBAIC00Niw2ICs0Niw4IEBAIFJlc291cmNlTG9hZElkZW50aWZpZXIg TmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVSZXNvdXJjZUxvYWQoY29uc3QK ICAgICAKICAgICBSZXNvdXJjZUxvYWRJZGVudGlmaWVyIGlkZW50aWZpZXIgPSArK3NfY3VycmVu dFJlc291cmNlTG9hZElkZW50aWZpZXI7CiAgICAgUmVmUHRyPE5ldHdvcmtSZXNvdXJjZUxvYWRl cj4gbG9hZGVyID0gTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjcmVhdGUobG9hZFBhcmFtZXRlcnMs IGlkZW50aWZpZXIsIGNvbm5lY3Rpb24pOworICAgIAorICAgIG1fcmVzb3VyY2VMb2FkZXJzLmFk ZChpZGVudGlmaWVyLCBsb2FkZXIpOwogCiAgICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5nLCAiKE5l dHdvcmtQcm9jZXNzKSBOZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzY2hlZHVsZU5ldHdv cmtSZXNvdXJjZVJlcXVlc3QgcmVzb3VyY2UgJWxsdSAnJXMnIiwgaWRlbnRpZmllciwgcmVzb3Vy Y2VSZXF1ZXN0LnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogCkBAIC0xMDgsMTAgKzEx MCwxOCBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OnJlbW92ZUxvYWRJZGVu dGlmaWVyKFJlc291cmNlTG9hZElkZW50aWZpZXIgaQogICAgIC8vIEluIHRoaXMgc2l0dWF0aW9u IHdlIG1pZ2h0IG5vdCBoYXZlIGEgSG9zdFJlY29yZCB0byBjbGVhbiB1cC4KICAgICBpZiAoaG9z dCkKICAgICAgICAgaG9zdC0+cmVtb3ZlKGlkZW50aWZpZXIpOworICAgIAorICAgIG1fcmVzb3Vy Y2VMb2FkZXJzLnJlbW92ZShpZGVudGlmaWVyKTsKIAogICAgIHNjaGVkdWxlU2VydmVQZW5kaW5n UmVxdWVzdHMoKTsKIH0KIAorTmV0d29ya1Jlc291cmNlTG9hZGVyKiBOZXR3b3JrUmVzb3VyY2VM b2FkU2NoZWR1bGVyOjpuZXR3b3JrUmVzb3VyY2VMb2FkZXJGb3JJZGVudGlmaWVyKFJlc291cmNl TG9hZElkZW50aWZpZXIgaWRlbnRpZmllcikKK3sKKyAgICBBU1NFUlQobV9yZXNvdXJjZUxvYWRl cnMuZ2V0KGlkZW50aWZpZXIpKTsKKyAgICByZXR1cm4gbV9yZXNvdXJjZUxvYWRlcnMuZ2V0KGlk ZW50aWZpZXIpLmdldCgpOworfQorCiB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXI6 OnJlY2VpdmVkUmVkaXJlY3QoUmVzb3VyY2VMb2FkSWRlbnRpZmllciBpZGVudGlmaWVyLCBjb25z dCBXZWJDb3JlOjpLVVJMJiByZWRpcmVjdFVSTCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFk KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jl c291cmNlTG9hZFNjaGVkdWxlci5oIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlci5oCmluZGV4IDVmY2MyNWIuLjg1YTE5Y2QgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRT Y2hlZHVsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkU2NoZWR1bGVyLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgTmV0d29ya1Jl c291cmNlTG9hZFNjaGVkdWxlcl9oCiAjZGVmaW5lIE5ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVs ZXJfaAogCisjaW5jbHVkZSAiTmV0d29ya1Jlc291cmNlTG9hZGVyLmgiCiAjaW5jbHVkZSA8V2Vi Q29yZS9SZXNvdXJjZUxvYWRlck9wdGlvbnMuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNl UmVxdWVzdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvVGltZXIuaD4KQEAgLTYzLDYgKzY0LDggQEAg cHVibGljOgogICAgIHZvaWQgc3VzcGVuZFBlbmRpbmdSZXF1ZXN0cygpOwogICAgIHZvaWQgcmVz dW1lUGVuZGluZ1JlcXVlc3RzKCk7CiAgICAgCisgICAgTmV0d29ya1Jlc291cmNlTG9hZGVyKiBu ZXR3b3JrUmVzb3VyY2VMb2FkZXJGb3JJZGVudGlmaWVyKFJlc291cmNlTG9hZElkZW50aWZpZXIp OworCiBwcml2YXRlOgogICAgIGVudW0gQ3JlYXRlSG9zdFBvbGljeSB7CiAgICAgICAgIENyZWF0 ZUlmTm90Rm91bmQsCkBAIC04MSw2ICs4NCw4IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQg cmVtb3ZlU2NoZWR1bGVkTG9hZElkZW50aWZpZXJzKHZvaWQqIGNvbnRleHQpOwogICAgIHZvaWQg cmVtb3ZlU2NoZWR1bGVkTG9hZElkZW50aWZpZXJzKCk7CiAKKyAgICBIYXNoTWFwPFJlc291cmNl TG9hZElkZW50aWZpZXIsIFJlZlB0cjxOZXR3b3JrUmVzb3VyY2VMb2FkZXI+ID4gbV9yZXNvdXJj ZUxvYWRlcnM7CisKICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBIb3N0UmVjb3JkKiwgU3Ry aW5nSGFzaD4gSG9zdE1hcDsKICAgICBIb3N0TWFwIG1faG9zdHM7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCmlu ZGV4IDg3M2JmMTEuLjIwODgzMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtMTkxLDExICsxOTEsNiBA QCBzdGF0aWMgdWludDY0X3QgZ2VuZXJhdGVXaWxsU2VuZFJlcXVlc3RJRCgpCiAgICAgcmV0dXJu IE9TQXRvbWljSW5jcmVtZW50NjRCYXJyaWVyKCZ1bmlxdWVXaWxsU2VuZFJlcXVlc3RJRCk7CiB9 CiAKLXZvaWQgZGlkUmVjZWl2ZVdpbGxTZW5kUmVxdWVzdEhhbmRsZWQodWludDY0X3QgcmVxdWVz dElELCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCi17Ci0gICAgcmVzcG9uc2VNYXAo KS5kaWRSZWNlaXZlUmVzcG9uc2UocmVxdWVzdElELCBhZG9wdFB0cihuZXcgUmVzb3VyY2VSZXF1 ZXN0KHJlcXVlc3QpKSk7Ci19Ci0KIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjp3aWxsU2Vu ZFJlcXVlc3QoUmVzb3VyY2VIYW5kbGUqLCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0 IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpCiB7CiAgICAgLy8gV2Ugb25seSBl eHBlY3QgdG8gZ2V0IHRoZSB3aWxsU2VuZFJlcXVlc3QgY2FsbGJhY2sgZnJvbSBSZXNvdXJjZUhh bmRsZSBhcyB0aGUgcmVzdWx0IG9mIGEgcmVkaXJlY3QKQEAgLTIxMSw2ICsyMDYsMTEgQEAgdm9p ZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJjZUhhbmRsZSos IFJlc291cmNlUmVxdWVzdCYgcmUKICAgICBSdW5Mb29wOjptYWluKCktPmRpc3BhdGNoKFdURjo6 YmluZCgmTmV0d29ya1Jlc291cmNlTG9hZFNjaGVkdWxlcjo6cmVjZWl2ZWRSZWRpcmVjdCwgJk5l dHdvcmtQcm9jZXNzOjpzaGFyZWQoKS5uZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVyKCksIG1f aWRlbnRpZmllciwgcmVxdWVzdC51cmwoKSkpOwogfQogCit2b2lkIE5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6d2lsbFNlbmRSZXF1ZXN0SGFuZGxlZCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYgbmV3UmVxdWVzdCkKK3sKKyAgICByZXNwb25zZU1hcCgp LmRpZFJlY2VpdmVSZXNwb25zZShyZXF1ZXN0SUQsIGFkb3B0UHRyKG5ldyBSZXNvdXJjZVJlcXVl c3QobmV3UmVxdWVzdCkpKTsKK30KKwogLy8gRklYTUUgKE5ldHdvcmtQcm9jZXNzKTogTWFueSBv ZiB0aGUgZm9sbG93aW5nIFJlc291cmNlSGFuZGxlQ2xpZW50IG1ldGhvZHMgZGVmaW5pdGVseSBu ZWVkIGltcGxlbWVudGF0aW9ucy4gQSBmZXcgd2lsbCBub3QuCiAvLyBPbmNlIHdlIGtub3cgd2hh dCB0aGV5IGFyZSB0aGV5IGNhbiBiZSByZW1vdmVkLgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5oCmluZGV4IDhmZjIyMzIu Ljc2Nzg3ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05l dHdvcmtSZXNvdXJjZUxvYWRlci5oCkBAIC01OCw2ICs1OCw4IEBAIHB1YmxpYzoKICAgICBDb3Jl SVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uKCkgY29uc3Q7CiAgICAgdWludDY0X3QgZGVzdGlu YXRpb25JRCgpIGNvbnN0IHsgcmV0dXJuIGlkZW50aWZpZXIoKTsgfQogICAgIAorICAgIHZvaWQg ZGlkUmVjZWl2ZU5ldHdvcmtSZXNvdXJjZUxvYWRlck1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlv biosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImKTsKKwogICAg IHZvaWQgc3RhcnQoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBjb25uZWN0aW9uVG9XZWJQcm9jZXNz RGlkQ2xvc2UoTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MqKSBPVkVSUklERTsKQEAgLTEw OCw2ICsxMTAsOCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRl cihjb25zdCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYsIFJlc291cmNlTG9hZElkZW50 aWZpZXIsIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzKik7CiAKKyAgICB2b2lkIHdpbGxT ZW5kUmVxdWVzdEhhbmRsZWQodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmKTsKKwogICAgIHZvaWQgc2NoZWR1bGVTdG9wT25NYWluVGhyZWFkKCk7CiAg ICAgc3RhdGljIHZvaWQgcGVyZm9ybVN0b3BzKHZvaWQqKTsKIApAQCAtMTIxLDggKzEyNSw2IEBA IHByaXZhdGU6CiAgICAgUmVmUHRyPE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzPiBtX2Nv bm5lY3Rpb247CiB9OwogCi12b2lkIGRpZFJlY2VpdmVXaWxsU2VuZFJlcXVlc3RIYW5kbGVkKHVp bnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Jik7Ci0KIH0g Ly8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJj ZUxvYWRlci5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRlci5tZXNzYWdlcy5pbgpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi40NDYwMGFiCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLm1lc3NhZ2VzLmluCkBAIC0wLDAgKzEsMjkg QEAKKyMgQ29weXJpZ2h0IChDKSAyMDEyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMg ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv ZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVu dGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0 aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElU UyBDT05UUklCVVRPUlMgYGBBUyBJUycnIEFORAorIyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBX QVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFS IFBVUlBPU0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4g T1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNU SVRVVEUgR09PRFMgT1IKKyMgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwKKyMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworI2lmIEVOQUJMRShO RVRXT1JLX1BST0NFU1MpCisKK21lc3NhZ2VzIC0+IE5ldHdvcmtSZXNvdXJjZUxvYWRlciB7Cisg ICAgV2lsbFNlbmRSZXF1ZXN0SGFuZGxlZCh1aW50NjRfdCByZXF1ZXN0SUQsIFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCBuZXdSZXF1ZXN0KQorfQorCisjZW5kaWYgLy8gRU5BQkxFKE5FVFdPUktf UFJPQ0VTUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvTWVz c2FnZUlELmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL01lc3NhZ2VJRC5oCmlu ZGV4IDVmMGE5ZjkuLmZhNzBkNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt L0NvcmVJUEMvTWVzc2FnZUlELmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQ Qy9NZXNzYWdlSUQuaApAQCAtMTE1LDYgKzExNSw3IEBAIGVudW0gTWVzc2FnZUNsYXNzIHsKIAog ICAgIC8vIE1lc3NhZ2VzIHNlbnQgYnkgdGhlIHdlYiBwcm9jZXNzIHRvIHRoZSBuZXR3b3JrIHBy b2Nlc3MuCiAgICAgTWVzc2FnZUNsYXNzTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MsCisg ICAgTWVzc2FnZUNsYXNzTmV0d29ya1Jlc291cmNlTG9hZGVyLAogCiAgICAgLy8gTWVzc2FnZXMg c2VudCBieSB0aGUgbmV0d29yayBwcm9jZXNzIHRvIGEgd2ViIHByb2Nlc3MuCiAgICAgTWVzc2Fn ZUNsYXNzTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktpdDIvV2Vi S2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGM1MjA4NjMuLjE4NmUxMDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK QEAgLTQ1OSw2ICs0NTksOCBAQAogCQk1MTYzMTk5NDE2Mjg5QTYwMDBFMjJGMDAgLyogTmV0d29y a1Byb2Nlc3NNZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNTFBQ0M5MzQxNjI4MDY0ODAwMzQyNTUwIC8qIE5ldHdvcmtQcm9j ZXNzTWVzc2FnZVJlY2VpdmVyLmNwcCAqLzsgfTsKIAkJNTE2MzE5OTUxNjI4OUE2MzAwRTIyRjAw IC8qIE5ldHdvcmtQcm9jZXNzTWVzc2FnZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDUxQUNDOTM1MTYyODA2NDgwMDM0MjU1MCAvKiBOZXR3b3JrUHJv Y2Vzc01lc3NhZ2VzLmggKi87IH07CiAJCTUxNkE0QTVEMTIwQTJDQ0QwMEMwNUI3RiAvKiBXZWJF cnJvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTE2 QTRBNUIxMjBBMkNDRDAwQzA1QjdGIC8qIFdlYkVycm9yLmggKi87IH07CisJCTUxNzU5NDRBMTY1 NzA4MDQwMERENzcxRCAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkZXJNZXNzYWdlUmVjZWl2ZXIuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTE3NTk0NDgx NjU3MDgwNDAwREQ3NzFEIC8qIE5ldHdvcmtSZXNvdXJjZUxvYWRlck1lc3NhZ2VSZWNlaXZlci5j cHAgKi87IH07CisJCTUxNzU5NDRCMTY1NzA4MDQwMERENzcxRCAvKiBOZXR3b3JrUmVzb3VyY2VM b2FkZXJNZXNzYWdlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNTE3NTk0NDkxNjU3MDgwNDAwREQ3NzFEIC8qIE5ldHdvcmtSZXNvdXJjZUxvYWRlck1l c3NhZ2VzLmggKi87IH07CiAJCTUxNzk1NTY1MTYyODc2QzUwMEZBNDNCNiAvKiBOZXR3b3JrUHJv Y2Vzc01haW5NYWMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSA1MTBDQzdERDE2MTM4RTI5MDBEMDNFRDMgLyogTmV0d29ya1Byb2Nlc3NNYWluTWFjLm1t ICovOyB9OwogCQk1MTc5NTU2NzE2Mjg3NkNCMDBGQTQzQjYgLyogTmV0d29ya1Byb2Nlc3NNYWMu bW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MUE4QTYx NTE2MjdGM0Y5MDAwRDkwRTkgLyogTmV0d29ya1Byb2Nlc3NNYWMubW0gKi87IH07CiAJCTUxNzk1 NTY4MTYyODc2Q0YwMEZBNDNCNiAvKiBOZXR3b3JrUHJvY2Vzcy5jcHAgaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MTBDQzdERjE2MTM4RTI5MDBEMDNFRDMg LyogTmV0d29ya1Byb2Nlc3MuY3BwICovOyB9OwpAQCAtMTQ5Niw4ICsxNDk4LDggQEAKIAkJMjk4 NEY1ODAxNjRCOUJCRDAwNEJDMEM2IC8qIEN1c3RvbVByb3RvY29sTWFuYWdlci5oICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBDdXN0b21Qcm90b2NvbE1hbmFnZXIuaDsgcGF0aCA9 IE5ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL0N1c3RvbVByb3RvY29sTWFuYWdlci5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQkyOTg0RjU4MjE2NEI5QkQ5MDA0QkMwQzYgLyogQ3VzdG9t UHJvdG9jb2xNYW5hZ2VyTWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBu YW1lID0gQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyTWFjLm1tOyBwYXRoID0gTmV0d29yay9DdXN0b21Q cm90b2NvbHMvbWFjL0N1c3RvbVByb3RvY29sTWFuYWdlck1hYy5tbTsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJMjk4NEY1ODQxNjRCOUVEOTAwNEJDMEM2IC8qIEN1c3RvbVByb3RvY29s TWFuYWdlci5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IG5hbWUgPSBDdXN0b21Qcm90b2Nv bE1hbmFnZXIubWVzc2FnZXMuaW47IHBhdGggPSBOZXR3b3JrL0N1c3RvbVByb3RvY29scy9DdXN0 b21Qcm90b2NvbE1hbmFnZXIubWVzc2FnZXMuaW47IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 Ci0JCTI5ODRGNTg2MTY0QkEwOTUwMDRCQzBDNiAvKiBDdXN0b21Qcm90b2NvbE1hbmFnZXJNZXNz YWdlUmVjZWl2ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBuYW1lID0gQ3Vz dG9tUHJvdG9jb2xNYW5hZ2VyTWVzc2FnZVJlY2VpdmVyLmNwcDsgcGF0aCA9IEN1c3RvbVByb3Rv Y29sTWFuYWdlck1lc3NhZ2VSZWNlaXZlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 Ci0JCTI5ODRGNTg3MTY0QkEwOTUwMDRCQzBDNiAvKiBDdXN0b21Qcm90b2NvbE1hbmFnZXJNZXNz YWdlcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBDdXN0b21Qcm90b2NvbE1h bmFnZXJNZXNzYWdlcy5oOyBwYXRoID0gQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyTWVzc2FnZXMuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMjk4NEY1ODYxNjRCQTA5NTAwNEJDMEM2IC8q IEN1c3RvbVByb3RvY29sTWFuYWdlck1lc3NhZ2VSZWNlaXZlci5jcHAgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBDdXN0b21Qcm90b2NvbE1hbmFnZXJNZXNzYWdlUmVjZWl2 ZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkyOTg0RjU4NzE2NEJBMDk1MDA0 QkMwQzYgLyogQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyTWVzc2FnZXMuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyTWVzc2FnZXMuaDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMjlBRDMwOTIxNjRCNEM1RDAwNzJERUE5IC8qIEN1c3Rv bVByb3RvY29sTWFuYWdlclByb3h5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9 IEN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5Lmg7IHBhdGggPSBDdXN0b21Qcm90b2NvbHMvQ3Vz dG9tUHJvdG9jb2xNYW5hZ2VyUHJveHkuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MjlBRDMwOTUxNjRCNEM5MzAwNzJERUE5IC8qIEN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5TWFj Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gQ3VzdG9tUHJvdG9j b2xNYW5hZ2VyUHJveHlNYWMubW07IHBhdGggPSBDdXN0b21Qcm90b2NvbHMvbWFjL0N1c3RvbVBy b3RvY29sTWFuYWdlclByb3h5TWFjLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQky OUFEMzA5NzE2NEI0RTIxMDA3MkRFQTkgLyogQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHkubWVz c2FnZXMuaW4gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0OyBuYW1lID0gQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJv eHkubWVzc2FnZXMuaW47IHBhdGggPSBDdXN0b21Qcm90b2NvbHMvQ3VzdG9tUHJvdG9jb2xNYW5h Z2VyUHJveHkubWVzc2FnZXMuaW47IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xNjk0 LDEwICsxNjk2LDEzIEBACiAJCTUxM0ExNjRCMTYzMEE5QkYwMDVEN0QyMiAvKiBOZXR3b3JrQ29u bmVjdGlvblRvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IG5hbWUgPSBO ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbjsgcGF0aCA9IE5ldHdvcmtQ cm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk1MTUzNTY5QTEyOTFCMUQyMDAwNzQ5REMgLyogV2ViUGFn ZUNvbnRleHRNZW51Q2xpZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IFdlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTUxNTM1NjlCMTI5MUIxRDIwMDA3NDlEQyAvKiBXZWJQYWdlQ29udGV4dE1lbnVDbGll bnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViUGFnZUNvbnRleHRNZW51 Q2xpZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTUxNTcwNTUyMTY1NzAxOEMw MDEwMUE5MCAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkZXIubWVzc2FnZXMuaW4gKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0OyBuYW1lID0gTmV0d29y a1Jlc291cmNlTG9hZGVyLm1lc3NhZ2VzLmluOyBwYXRoID0gTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Jlc291cmNlTG9hZGVyLm1lc3NhZ2VzLmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQk1MTU3OEI4MjEyMDlFQ0VGMDBBMzdDNEEgLyogV2ViRGF0YS5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBXZWJEYXRhLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTUxNjBCRkUwMTMzODFERjkwMDkxODk5OSAvKiBMb2dnaW5nLm1hYy5tbSAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IExvZ2dpbmcubWFjLm1tOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQk1MTYzMTk5MTE2Mjg5ODBBMDBFMjJGMDAgLyogTmV0d29ya1Byb2Nl c3NQcm94eU1hYy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgbmFtZSA9IE5l dHdvcmtQcm9jZXNzUHJveHlNYWMubW07IHBhdGggPSBtYWMvTmV0d29ya1Byb2Nlc3NQcm94eU1h Yy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTE2QTRBNUIxMjBBMkNDRDAwQzA1 QjdGIC8qIFdlYkVycm9yLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYkVy cm9yLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTUxNzU5NDQ4MTY1NzA4MDQwMERE NzcxRCAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkZXJNZXNzYWdlUmVjZWl2ZXIuY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTmV0d29ya1Jlc291cmNlTG9hZGVyTWVzc2Fn ZVJlY2VpdmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNTE3NTk0NDkxNjU3 MDgwNDAwREQ3NzFEIC8qIE5ldHdvcmtSZXNvdXJjZUxvYWRlck1lc3NhZ2VzLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IE5ldHdvcmtSZXNvdXJjZUxvYWRlck1lc3NhZ2VzLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUxN0EzM0IzMTMwQjMwOEMwMEY4MENCNSAv KiBXS0FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IFdLQXBwbGljYXRpb25DYWNoZU1hbmFnZXIuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQk1MTdBMzNCNDEzMEIzMDhDMDBGODBDQjUgLyogV0tBcHBsaWNhdGlv bkNhY2hlTWFuYWdlci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS0FwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUxN0NG MEUxMTYzQTQ4NkMwMEMyOTUwRSAvKiBOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb25NZXNzYWdlUmVj ZWl2ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gTmV0d29ya1By b2Nlc3NDb25uZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKQEAgLTMxMzgsNiArMzE0Myw3IEBACiAJCQkJNTEwQ0M3RTExNjEzOEUyOTAwRDAzRUQz IC8qIE5ldHdvcmtQcm9jZXNzTWFpbi5oICovLAogCQkJCTUxRkQxOEIzMTY1MUZCQUQwMERCRTFD RSAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwICovLAogCQkJCTUxRkQxOEI0MTY1MUZCQUQw MERCRTFDRSAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkZXIuaCAqLywKKwkJCQk1MTU3MDU1MjE2NTcw MThDMDAxMDFBOTAgLyogTmV0d29ya1Jlc291cmNlTG9hZGVyLm1lc3NhZ2VzLmluICovLAogCQkJ CTUxODI5REEzMTYzN0M3MEMwMDA5NTNENiAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVy LmNwcCAqLywKIAkJCQk1MTgyOURBNDE2MzdDNzBDMDAwOTUzRDYgLyogTmV0d29ya1Jlc291cmNl TG9hZFNjaGVkdWxlci5oICovLAogCQkJKTsKQEAgLTQyNTksNiArNDI2NSw4IEBACiAJCQkJNTFB Q0M5MzUxNjI4MDY0ODAwMzQyNTUwIC8qIE5ldHdvcmtQcm9jZXNzTWVzc2FnZXMuaCAqLywKIAkJ CQk1MTNBMTYzQTE2MzA4OEY2MDA1RDdEMjIgLyogTmV0d29ya1Byb2Nlc3NQcm94eU1lc3NhZ2VS ZWNlaXZlci5jcHAgKi8sCiAJCQkJNTEzQTE2M0IxNjMwODhGNjAwNUQ3RDIyIC8qIE5ldHdvcmtQ cm9jZXNzUHJveHlNZXNzYWdlcy5oICovLAorCQkJCTUxNzU5NDQ4MTY1NzA4MDQwMERENzcxRCAv KiBOZXR3b3JrUmVzb3VyY2VMb2FkZXJNZXNzYWdlUmVjZWl2ZXIuY3BwICovLAorCQkJCTUxNzU5 NDQ5MTY1NzA4MDQwMERENzcxRCAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkZXJNZXNzYWdlcy5oICov LAogCQkJCTFBMkQ4NDM3MTI3RjY1RDUwMDFFQjk2MiAvKiBOUE9iamVjdE1lc3NhZ2VSZWNlaXZl ck1lc3NhZ2VSZWNlaXZlci5jcHAgKi8sCiAJCQkJMUEyRDg0MzgxMjdGNjVENTAwMUVCOTYyIC8q IE5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyTWVzc2FnZXMuaCAqLywKIAkJCQkxQThFRjk2QzEyNTJB RjZCMDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcCAq LywKQEAgLTQ5ODgsNiArNDk5Niw3IEBACiAJCQkJMjk4NEY1ODExNjRCOUJCRDAwNEJDMEM2IC8q IEN1c3RvbVByb3RvY29sTWFuYWdlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMjk4NEY1ODkxNjRC QTA5NTAwNEJDMEM2IC8qIEN1c3RvbVByb3RvY29sTWFuYWdlck1lc3NhZ2VzLmggaW4gSGVhZGVy cyAqLywKIAkJCQk1MUYwNjBFMDE2NTQzMTdGMDBGMzI4MUIgLyogV2ViUmVzb3VyY2VMb2FkZXJN ZXNzYWdlcy5oIGluIEhlYWRlcnMgKi8sCisJCQkJNTE3NTk0NEIxNjU3MDgwNDAwREQ3NzFEIC8q IE5ldHdvcmtSZXNvdXJjZUxvYWRlck1lc3NhZ2VzLmggaW4gSGVhZGVycyAqLywKIAkJCSk7CiAJ CQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKQEAgLTU5NDAs NiArNTk0OSw3IEBACiAJCQkJMjk4NEY1ODMxNjRCOUJEOTAwNEJDMEM2IC8qIEN1c3RvbVByb3Rv Y29sTWFuYWdlck1hYy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTI5ODRGNTg4MTY0QkEwOTUwMDRC QzBDNiAvKiBDdXN0b21Qcm90b2NvbE1hbmFnZXJNZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNvdXJj ZXMgKi8sCiAJCQkJNTFGMDYwRTExNjU0MzE4NTAwRjMyODFCIC8qIFdlYlJlc291cmNlTG9hZGVy TWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTUxNzU5NDRBMTY1NzA4MDQw MERENzcxRCAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkZXJNZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNv dXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9 IDA7CiAJCX07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsv V2ViUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3Jr L1dlYlJlc291cmNlTG9hZGVyLmNwcAppbmRleCA2ZjRjM2I4Li4zZTUyM2Y4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRl ci5jcHAKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAi TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3NNZXNzYWdlcy5oIgogI2luY2x1ZGUgIk5ldHdv cmtQcm9jZXNzQ29ubmVjdGlvbi5oIgorI2luY2x1ZGUgIk5ldHdvcmtSZXNvdXJjZUxvYWRlck1l c3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgiCiAjaW5jbHVkZSAi V2ViUHJvY2Vzcy5oIgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VMb2FkZXIuaD4KQEAgLTU0 LDYgKzU1LDE2IEBAIFdlYlJlc291cmNlTG9hZGVyOjp+V2ViUmVzb3VyY2VMb2FkZXIoKQogewog fQogCitDb3JlSVBDOjpDb25uZWN0aW9uKiBXZWJSZXNvdXJjZUxvYWRlcjo6Y29ubmVjdGlvbigp IGNvbnN0Cit7CisgICAgcmV0dXJuIFdlYlByb2Nlc3M6OnNoYXJlZCgpLm5ldHdvcmtDb25uZWN0 aW9uKCktPmNvbm5lY3Rpb24oKTsKK30KKwordWludDY0X3QgV2ViUmVzb3VyY2VMb2FkZXI6OmRl c3RpbmF0aW9uSUQoKSBjb25zdAoreworICAgIHJldHVybiBtX2NvcmVMb2FkZXItPmlkZW50aWZp ZXIoKTsKK30KKwogdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KHVpbnQ2 NF90IHJlcXVlc3RJRCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBwcm9wb3NlZFJlcXVlc3QsIGNv bnN0IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpCiB7CiAgICAgTE9HKE5ldHdv cmssICIoV2ViUHJvY2VzcykgV2ViUmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdCB0byAn JXMnIiwgcHJvcG9zZWRSZXF1ZXN0LnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwpAQCAt NjEsNyArNzIsNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3QodWlu dDY0X3QgcmVxdWVzdElELCBjb25zdCBSZXNvdXJjZVJlcXVlcwogICAgIFJlc291cmNlUmVxdWVz dCBuZXdSZXF1ZXN0ID0gcHJvcG9zZWRSZXF1ZXN0OwogICAgIG1fY29yZUxvYWRlci0+d2lsbFNl bmRSZXF1ZXN0KG5ld1JlcXVlc3QsIHJlZGlyZWN0UmVzcG9uc2UpOwogCi0gICAgV2ViUHJvY2Vz czo6c2hhcmVkKCkubmV0d29ya0Nvbm5lY3Rpb24oKS0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3Nh Z2VzOjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6V2lsbFNlbmRSZXF1ZXN0SGFuZGxl ZChyZXF1ZXN0SUQsIG5ld1JlcXVlc3QpLCAwKTsKKyAgICBzZW5kKE1lc3NhZ2VzOjpOZXR3b3Jr UmVzb3VyY2VMb2FkZXI6OldpbGxTZW5kUmVxdWVzdEhhbmRsZWQocmVxdWVzdElELCBuZXdSZXF1 ZXN0KSk7CiB9CiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5oIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmgKaW5kZXgg YzQxZWUzNS4uODc0ZmJlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmgKQEAgLTI5LDYgKzI5LDcgQEAKICNpZiBFTkFC TEUoTkVUV09SS19QUk9DRVNTKQogCiAjaW5jbHVkZSAiQ29ubmVjdGlvbi5oIgorI2luY2x1ZGUg Ik1lc3NhZ2VTZW5kZXIuaCIKICNpbmNsdWRlICJTaGFyZWFibGVSZXNvdXJjZS5oIgogI2luY2x1 ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KQEAgLTUw LDEyICs1MSwxNiBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogdHlwZWRlZiB1aW50NjRfdCBSZXNv dXJjZUxvYWRJZGVudGlmaWVyOwogCi1jbGFzcyBXZWJSZXNvdXJjZUxvYWRlciA6IHB1YmxpYyBS ZWZDb3VudGVkPFdlYlJlc291cmNlTG9hZGVyPiB7CitjbGFzcyBXZWJSZXNvdXJjZUxvYWRlciA6 IHB1YmxpYyBSZWZDb3VudGVkPFdlYlJlc291cmNlTG9hZGVyPiwgcHVibGljIENvcmVJUEM6Ok1l c3NhZ2VTZW5kZXI8V2ViUmVzb3VyY2VMb2FkZXI+IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFz c1JlZlB0cjxXZWJSZXNvdXJjZUxvYWRlcj4gY3JlYXRlKFBhc3NSZWZQdHI8V2ViQ29yZTo6UmVz b3VyY2VMb2FkZXI+KTsKIAogICAgIH5XZWJSZXNvdXJjZUxvYWRlcigpOwogCisgICAgLy8gVXNl ZCBieSBNZXNzYWdlU2VuZGVyLgorICAgIENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24o KSBjb25zdDsKKyAgICB1aW50NjRfdCBkZXN0aW5hdGlvbklEKCkgY29uc3Q7CisKICAgICB2b2lk IGRpZFJlY2VpdmVXZWJSZXNvdXJjZUxvYWRlck1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbios IENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImKTsKIAogcHJpdmF0 ZToK