116325 2013-05-17 09:58:26 -0700 Add WKPageLoadData and WKPageLoadDataWithUserData SPI to support loading arbitrary data blobs 2013-05-17 10:30:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 890470 0 sam 2013-05-17 09:58:26 -0700 Add WKPageLoadData and WKPageLoadDataWithUserData SPI to support loading arbritrary data blobs 890473 1 202106 sam 2013-05-17 10:00:34 -0700 Created attachment 202106 Patch 890498 2 202106 simon.fraser 2013-05-17 10:09:10 -0700 Comment on attachment 202106 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202106&action=review > Source/WebKit2/UIProcess/API/C/WKPage.h:369 > +WK_EXPORT void WKPageLoadData(WKPageRef page, WKDataRef data, WKStringRef MIMEType, WKStringRef encoding, WKURLRef baseURL); > +WK_EXPORT void WKPageLoadDataWithUserData(WKPageRef page, WKDataRef data, WKStringRef MIMEType, WKStringRef encoding, WKURLRef baseURL, WKTypeRef userData); Do these need to be distinct? Can't we just have a userData param in LoadData? 890503 3 sam 2013-05-17 10:25:13 -0700 (In reply to comment #2) > (From update of attachment 202106 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=202106&action=review > > > Source/WebKit2/UIProcess/API/C/WKPage.h:369 > > +WK_EXPORT void WKPageLoadData(WKPageRef page, WKDataRef data, WKStringRef MIMEType, WKStringRef encoding, WKURLRef baseURL); > > +WK_EXPORT void WKPageLoadDataWithUserData(WKPageRef page, WKDataRef data, WKStringRef MIMEType, WKStringRef encoding, WKURLRef baseURL, WKTypeRef userData); > > Do these need to be distinct? Can't we just have a userData param in LoadData? I am trying to keep consistency. 890508 4 sam 2013-05-17 10:30:23 -0700 Committed r150271: <http://trac.webkit.org/changeset/150271> 202106 2013-05-17 10:00:34 -0700 2013-05-17 10:09:10 -0700 Patch bug-116325-20130517095929.patch text/plain 12104 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDI2OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA1LTE3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLUGFnZUxvYWREYXRhIGFuZCBX S1BhZ2VMb2FkRGF0YVdpdGhVc2VyRGF0YSBTUEkgdG8gc3VwcG9ydCBsb2FkaW5nIGFyYml0cmFy eSBkYXRhIGJsb2JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTYzMjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlTG9hZERh dGEpOgorICAgICAgICAoV0tQYWdlTG9hZERhdGFXaXRoVXNlckRhdGEpOgorICAgICAgICBBZGQg bmV3IFNQSS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5Ojpsb2FkRGF0YSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAg ICAgICBQaXBlIHRocm91Z2ggdG8gdGhlIFdlYlByb2Nlc3MuCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6bG9hZERhdGFJbXBsKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6bG9hZERhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpsb2Fk SFRNTFN0cmluZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRBbHRlcm5hdGVIVE1M U3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6bG9hZFBsYWluVGV4dFN0cmluZyk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRXZWJBcmNoaXZlRGF0YSk6CisgICAgICAg IFJlbmFtZSBleGlzdGluZyBsb2FkRGF0YSBmdW5jdGlvbiB0byBsb2FkRGF0YUltcGwgKEkgaGF0 ZSBpdCkgdG8gYXZvaWQgb3ZlcmxvYWQgY29uZmxpY3QKKyAgICAgICAgZnJvbSBJUEMgbWFnaWMu CisKKwogMjAxMy0wNS0xNyAgTWljaGHFgiBQYWt1xYJhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNh bXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gRml4IHN1YiBtZW51IGluaXRpYWxpemF0 aW9uIGluIGV3a19jb250ZXh0X21lbnVfaXRlbQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE1MDI0MikKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MjUsNiArNzI1 LDE2IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkRmlsZShjb25zdCBTdHJpbmcKICAgICBtX3By b2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKIH0KIAordm9pZCBXZWJQYWdl UHJveHk6OmxvYWREYXRhKFdlYkRhdGEqIGRhdGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNv bnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJT2JqZWN0KiB1 c2VyRGF0YSkKK3sKKyAgICBpZiAoIWlzVmFsaWQoKSkKKyAgICAgICAgcmVhdHRhY2hUb1dlYlBy b2Nlc3MoKTsKKworICAgIG1fcHJvY2Vzcy0+YXNzdW1lUmVhZEFjY2Vzc1RvQmFzZVVSTChiYXNl VVJMKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWREYXRhKGRh dGEtPmRhdGFSZWZlcmVuY2UoKSwgTUlNRVR5cGUsIGVuY29kaW5nLCBiYXNlVVJMLCBXZWJDb250 ZXh0VXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhKSksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nl c3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKK30KKwogdm9pZCBXZWJQYWdlUHJv eHk6OmxvYWRIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5n JiBiYXNlVVJMLCBBUElPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlmICghaXNWYWxpZCgpKQpJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTUw MjQyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5n IGNvcHkpCkBAIC0yODUsNiArMjg1LDcgQEAgcHVibGljOgogICAgIHZvaWQgbG9hZFVSTChjb25z dCBTdHJpbmcmLCBBUElPYmplY3QqIHVzZXJEYXRhID0gMCk7CiAgICAgdm9pZCBsb2FkVVJMUmVx dWVzdChXZWJVUkxSZXF1ZXN0KiwgQVBJT2JqZWN0KiB1c2VyRGF0YSA9IDApOwogICAgIHZvaWQg bG9hZEZpbGUoY29uc3QgU3RyaW5nJiBmaWxlVVJMLCBjb25zdCBTdHJpbmcmIHJlc291cmNlRGly ZWN0b3J5VVJMLCBBUElPYmplY3QqIHVzZXJEYXRhID0gMCk7CisgICAgdm9pZCBsb2FkRGF0YShX ZWJEYXRhKiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywg Y29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUElPYmplY3QqIHVzZXJEYXRhID0gMCk7CiAgICAgdm9p ZCBsb2FkSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYg YmFzZVVSTCwgQVBJT2JqZWN0KiB1c2VyRGF0YSA9IDApOwogICAgIHZvaWQgbG9hZEFsdGVybmF0 ZUhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VV UkwsIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwsIEFQSU9iamVjdCogdXNlckRhdGEgPSAw KTsKICAgICB2b2lkIGxvYWRQbGFpblRleHRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEFQ SU9iamVjdCogdXNlckRhdGEgPSAwKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS1BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS1BhZ2UuY3BwCShyZXZpc2lvbiAxNTAyNDIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTIsNiArOTIsMTYgQEAg dm9pZCBXS1BhZ2VMb2FkRmlsZVdpdGhVc2VyRGF0YShXS1BhZ2VSZQogICAgIHRvSW1wbChwYWdl UmVmKS0+bG9hZEZpbGUodG9XVEZTdHJpbmcoZmlsZVVSTCksIHRvV1RGU3RyaW5nKHJlc291cmNl RGlyZWN0b3J5VVJMKSwgdG9JbXBsKHVzZXJEYXRhUmVmKSk7CiB9CiAKK3ZvaWQgV0tQYWdlTG9h ZERhdGEoV0tQYWdlUmVmIHBhZ2VSZWYsIFdLRGF0YVJlZiBkYXRhUmVmLCBXS1N0cmluZ1JlZiBN SU1FVHlwZVJlZiwgV0tTdHJpbmdSZWYgZW5jb2RpbmdSZWYsIFdLVVJMUmVmIGJhc2VVUkxSZWYp Cit7CisgICAgdG9JbXBsKHBhZ2VSZWYpLT5sb2FkRGF0YSh0b0ltcGwoZGF0YVJlZiksIHRvV1RG U3RyaW5nKE1JTUVUeXBlUmVmKSwgdG9XVEZTdHJpbmcoZW5jb2RpbmdSZWYpLCB0b1dURlN0cmlu ZyhiYXNlVVJMUmVmKSk7Cit9CisKK3ZvaWQgV0tQYWdlTG9hZERhdGFXaXRoVXNlckRhdGEoV0tQ YWdlUmVmIHBhZ2VSZWYsIFdLRGF0YVJlZiBkYXRhUmVmLCBXS1N0cmluZ1JlZiBNSU1FVHlwZVJl ZiwgV0tTdHJpbmdSZWYgZW5jb2RpbmdSZWYsIFdLVVJMUmVmIGJhc2VVUkxSZWYsIFdLVHlwZVJl ZiB1c2VyRGF0YVJlZikKK3sKKyAgICB0b0ltcGwocGFnZVJlZiktPmxvYWREYXRhKHRvSW1wbChk YXRhUmVmKSwgdG9XVEZTdHJpbmcoTUlNRVR5cGVSZWYpLCB0b1dURlN0cmluZyhlbmNvZGluZ1Jl ZiksIHRvV1RGU3RyaW5nKGJhc2VVUkxSZWYpLCB0b0ltcGwodXNlckRhdGFSZWYpKTsKK30KKwog dm9pZCBXS1BhZ2VMb2FkSFRNTFN0cmluZyhXS1BhZ2VSZWYgcGFnZVJlZiwgV0tTdHJpbmdSZWYg aHRtbFN0cmluZ1JlZiwgV0tVUkxSZWYgYmFzZVVSTFJlZikKIHsKICAgICB0b0ltcGwocGFnZVJl ZiktPmxvYWRIVE1MU3RyaW5nKHRvV1RGU3RyaW5nKGh0bWxTdHJpbmdSZWYpLCB0b1dURlN0cmlu ZyhiYXNlVVJMUmVmKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQ YWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5oCShyZXZpc2lvbiAxNTAyNDIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2NSw2ICszNjUsOCBAQCBXS19FWFBPUlQgdm9p ZCBXS1BhZ2VMb2FkRmlsZShXS1BhZ2VSZWYgCiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VMb2FkRmls ZVdpdGhVc2VyRGF0YShXS1BhZ2VSZWYgcGFnZSwgV0tVUkxSZWYgZmlsZVVSTCwgV0tVUkxSZWYg cmVzb3VyY2VEaXJlY3RvcnlVUkwsIFdLVHlwZVJlZiB1c2VyRGF0YSk7CiAKIC8vIERhdGEgUmVx dWVzdHMKK1dLX0VYUE9SVCB2b2lkIFdLUGFnZUxvYWREYXRhKFdLUGFnZVJlZiBwYWdlLCBXS0Rh dGFSZWYgZGF0YSwgV0tTdHJpbmdSZWYgTUlNRVR5cGUsIFdLU3RyaW5nUmVmIGVuY29kaW5nLCBX S1VSTFJlZiBiYXNlVVJMKTsKK1dLX0VYUE9SVCB2b2lkIFdLUGFnZUxvYWREYXRhV2l0aFVzZXJE YXRhKFdLUGFnZVJlZiBwYWdlLCBXS0RhdGFSZWYgZGF0YSwgV0tTdHJpbmdSZWYgTUlNRVR5cGUs IFdLU3RyaW5nUmVmIGVuY29kaW5nLCBXS1VSTFJlZiBiYXNlVVJMLCBXS1R5cGVSZWYgdXNlckRh dGEpOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlTG9hZEhUTUxTdHJpbmcoV0tQYWdlUmVmIHBhZ2Us IFdLU3RyaW5nUmVmIGh0bWxTdHJpbmcsIFdLVVJMUmVmIGJhc2VVUkwpOwogV0tfRVhQT1JUIHZv aWQgV0tQYWdlTG9hZEhUTUxTdHJpbmdXaXRoVXNlckRhdGEoV0tQYWdlUmVmIHBhZ2UsIFdLU3Ry aW5nUmVmIGh0bWxTdHJpbmcsIFdLVVJMUmVmIGJhc2VVUkwsIFdLVHlwZVJlZiB1c2VyRGF0YSk7 CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhXS1BhZ2VSZWYg cGFnZSwgV0tTdHJpbmdSZWYgaHRtbFN0cmluZywgV0tVUkxSZWYgYmFzZVVSTCwgV0tVUkxSZWYg dW5yZWFjaGFibGVVUkwpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTUwMjQyKQorKysgU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MDYsNyArOTA2 LDcgQEAgdm9pZCBXZWJQYWdlOjpsb2FkVVJMUmVxdWVzdChjb25zdCBSZXNvdQogICAgIG1fbWFp bkZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPmxvYWQoRnJhbWVMb2FkUmVxdWVzdChtX21h aW5GcmFtZS0+Y29yZUZyYW1lKCksIHJlcXVlc3QpKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpsb2Fk RGF0YShQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gc2hhcmVkQnVmZmVyLCBjb25zdCBTdHJpbmcm IE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nTmFtZSwgY29uc3QgS1VSTCYgYmFzZVVS TCwgY29uc3QgS1VSTCYgdW5yZWFjaGFibGVVUkwsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBk ZWNvZGVyKQordm9pZCBXZWJQYWdlOjpsb2FkRGF0YUltcGwoUGFzc1JlZlB0cjxTaGFyZWRCdWZm ZXI+IHNoYXJlZEJ1ZmZlciwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBl bmNvZGluZ05hbWUsIGNvbnN0IEtVUkwmIGJhc2VVUkwsIGNvbnN0IEtVUkwmIHVucmVhY2hhYmxl VVJMLCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlcikKIHsKICAgICBTZW5kU3RvcFJl c3BvbnNpdmVuZXNzVGltZXIgc3RvcHBlcih0aGlzKTsKIApAQCAtOTI2LDExICs5MjYsMTggQEAg dm9pZCBXZWJQYWdlOjpsb2FkRGF0YShQYXNzUmVmUHRyPFNoYXJlZAogICAgIG1fbWFpbkZyYW1l LT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPmxvYWQoRnJhbWVMb2FkUmVxdWVzdChtX21haW5GcmFt ZS0+Y29yZUZyYW1lKCksIHJlcXVlc3QsIHN1YnN0aXR1dGVEYXRhKSk7CiB9CiAKK3ZvaWQgV2Vi UGFnZTo6bG9hZERhdGEoY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSwgY29uc3Qg U3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZ05hbWUsIGNvbnN0IFN0cmlu ZyYgYmFzZVVSTFN0cmluZywgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCit7Cisg ICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gc2hhcmVkQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVh dGUocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oZGF0YS5kYXRhKCkpLCBkYXRhLnNpemUo KSAqIHNpemVvZih1aW50OF90KSk7CisgICAgS1VSTCBiYXNlVVJMID0gYmFzZVVSTFN0cmluZy5p c0VtcHR5KCkgPyBibGFua1VSTCgpIDogS1VSTChLVVJMKCksIGJhc2VVUkxTdHJpbmcpOworICAg IGxvYWREYXRhSW1wbChzaGFyZWRCdWZmZXIsIE1JTUVUeXBlLCBlbmNvZGluZ05hbWUsIGJsYW5r VVJMKCksIEtVUkwoKSwgZGVjb2Rlcik7Cit9CisKIHZvaWQgV2ViUGFnZTo6bG9hZEhUTUxTdHJp bmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkxTdHJpbmcs IENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQogewogICAgIFJlZlB0cjxTaGFyZWRC dWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgY2hhcio+KGh0bWxTdHJpbmcuY2hhcmFjdGVycygpKSwgaHRtbFN0cmluZy5sZW5n dGgoKSAqIHNpemVvZihVQ2hhcikpOwogICAgIEtVUkwgYmFzZVVSTCA9IGJhc2VVUkxTdHJpbmcu aXNFbXB0eSgpID8gYmxhbmtVUkwoKSA6IEtVUkwoS1VSTCgpLCBiYXNlVVJMU3RyaW5nKTsKLSAg ICBsb2FkRGF0YShzaGFyZWRCdWZmZXIsICJ0ZXh0L2h0bWwiLCAidXRmLTE2IiwgYmFzZVVSTCwg S1VSTCgpLCBkZWNvZGVyKTsKKyAgICBsb2FkRGF0YUltcGwoc2hhcmVkQnVmZmVyLCAidGV4dC9o dG1sIiwgInV0Zi0xNiIsIGJhc2VVUkwsIEtVUkwoKSwgZGVjb2Rlcik7CiB9CiAKIHZvaWQgV2Vi UGFnZTo6bG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBj b25zdCBTdHJpbmcmIGJhc2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkxT dHJpbmcsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQpAQCAtOTM4LDE5ICs5NDUs MTkgQEAgdm9pZCBXZWJQYWdlOjpsb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhjbwogICAgIFJlZlB0 cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50 ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGh0bWxTdHJpbmcuY2hhcmFjdGVycygpKSwgaHRtbFN0 cmluZy5sZW5ndGgoKSAqIHNpemVvZihVQ2hhcikpOwogICAgIEtVUkwgYmFzZVVSTCA9IGJhc2VV UkxTdHJpbmcuaXNFbXB0eSgpID8gYmxhbmtVUkwoKSA6IEtVUkwoS1VSTCgpLCBiYXNlVVJMU3Ry aW5nKTsKICAgICBLVVJMIHVucmVhY2hhYmxlVVJMID0gdW5yZWFjaGFibGVVUkxTdHJpbmcuaXNF bXB0eSgpID8gS1VSTCgpIDogS1VSTChLVVJMKCksIHVucmVhY2hhYmxlVVJMU3RyaW5nKTsKLSAg ICBsb2FkRGF0YShzaGFyZWRCdWZmZXIsICJ0ZXh0L2h0bWwiLCAidXRmLTE2IiwgYmFzZVVSTCwg dW5yZWFjaGFibGVVUkwsIGRlY29kZXIpOworICAgIGxvYWREYXRhSW1wbChzaGFyZWRCdWZmZXIs ICJ0ZXh0L2h0bWwiLCAidXRmLTE2IiwgYmFzZVVSTCwgdW5yZWFjaGFibGVVUkwsIGRlY29kZXIp OwogfQogCiB2b2lkIFdlYlBhZ2U6OmxvYWRQbGFpblRleHRTdHJpbmcoY29uc3QgU3RyaW5nJiBz dHJpbmcsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQogewogICAgIFJlZlB0cjxT aGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJw cmV0X2Nhc3Q8Y29uc3QgY2hhcio+KHN0cmluZy5jaGFyYWN0ZXJzKCkpLCBzdHJpbmcubGVuZ3Ro KCkgKiBzaXplb2YoVUNoYXIpKTsKLSAgICBsb2FkRGF0YShzaGFyZWRCdWZmZXIsICJ0ZXh0L3Bs YWluIiwgInV0Zi0xNiIsIGJsYW5rVVJMKCksIEtVUkwoKSwgZGVjb2Rlcik7CisgICAgbG9hZERh dGFJbXBsKHNoYXJlZEJ1ZmZlciwgInRleHQvcGxhaW4iLCAidXRmLTE2IiwgYmxhbmtVUkwoKSwg S1VSTCgpLCBkZWNvZGVyKTsKIH0KIAogdm9pZCBXZWJQYWdlOjpsb2FkV2ViQXJjaGl2ZURhdGEo Y29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYgd2ViQXJjaGl2ZURhdGEsIENvcmVJUEM6Ok1l c3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQogewogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJl ZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hh cio+KHdlYkFyY2hpdmVEYXRhLmRhdGEoKSksIHdlYkFyY2hpdmVEYXRhLnNpemUoKSAqIHNpemVv Zih1aW50OF90KSk7Ci0gICAgbG9hZERhdGEoc2hhcmVkQnVmZmVyLCAiYXBwbGljYXRpb24veC13 ZWJhcmNoaXZlIiwgInV0Zi0xNiIsIGJsYW5rVVJMKCksIEtVUkwoKSwgZGVjb2Rlcik7CisgICAg bG9hZERhdGFJbXBsKHNoYXJlZEJ1ZmZlciwgImFwcGxpY2F0aW9uL3gtd2ViYXJjaGl2ZSIsICJ1 dGYtMTYiLCBibGFua1VSTCgpLCBLVVJMKCksIGRlY29kZXIpOwogfQogCiB2b2lkIFdlYlBhZ2U6 OmxpbmtDbGlja2VkKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBXZWJNb3VzZUV2ZW50JiBldmVu dCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAko cmV2aXNpb24gMTUwMjQyKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNjc3LDcgKzY3Nyw3IEBAIHByaXZhdGU6CiAKICAg ICBTdHJpbmcgc291cmNlRm9yRnJhbWUoV2ViRnJhbWUqKTsKIAotICAgIHZvaWQgbG9hZERhdGEo UGFzc1JlZlB0cjxXZWJDb3JlOjpTaGFyZWRCdWZmZXI+LCBjb25zdCBTdHJpbmcmIE1JTUVUeXBl LCBjb25zdCBTdHJpbmcmIGVuY29kaW5nTmFtZSwgY29uc3QgV2ViQ29yZTo6S1VSTCYgYmFzZVVS TCwgY29uc3QgV2ViQ29yZTo6S1VSTCYgZmFpbGluZ1VSTCwgQ29yZUlQQzo6TWVzc2FnZURlY29k ZXImKTsKKyAgICB2b2lkIGxvYWREYXRhSW1wbChQYXNzUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1 ZmZlcj4sIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmdOYW1l LCBjb25zdCBXZWJDb3JlOjpLVVJMJiBiYXNlVVJMLCBjb25zdCBXZWJDb3JlOjpLVVJMJiBmYWls aW5nVVJMLCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYpOwogCiAgICAgYm9vbCBwbGF0Zm9ybUhh c0xvY2FsRGF0YUZvclVSTChjb25zdCBXZWJDb3JlOjpLVVJMJik7CiAKQEAgLTY4NSw2ICs2ODUs NyBAQCBwcml2YXRlOgogICAgIHZvaWQgdHJ5Q2xvc2UoKTsKICAgICB2b2lkIGxvYWRVUkwoY29u c3QgU3RyaW5nJiwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiwgQ29yZUlQQzo6TWVz c2FnZURlY29kZXImKTsKICAgICB2b2lkIGxvYWRVUkxSZXF1ZXN0KGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYsIENvcmVJUEM6 Ok1lc3NhZ2VEZWNvZGVyJik7CisgICAgdm9pZCBsb2FkRGF0YShjb25zdCBDb3JlSVBDOjpEYXRh UmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGlu Z05hbWUsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImKTsK ICAgICB2b2lkIGxvYWRIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3Qg U3RyaW5nJiBiYXNlVVJMLCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYpOwogICAgIHZvaWQgbG9h ZEFsdGVybmF0ZUhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJp bmcmIGJhc2VVUkwsIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwsIENvcmVJUEM6Ok1lc3Nh Z2VEZWNvZGVyJik7CiAgICAgdm9pZCBsb2FkUGxhaW5UZXh0U3RyaW5nKGNvbnN0IFN0cmluZyYs IENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTUw MjQyKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTY2LDYgKzY2LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFn ZSBMZWdhY3lSZWNlaXZlciB7CiAKICAgICBMb2FkVVJMKFdURjo6U3RyaW5nIHVybCwgV2ViS2l0 OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgV2ViS2l0 OjpXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIExv YWRVUkxSZXF1ZXN0KFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0LCBXZWJLaXQ6OlNh bmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBXZWJLaXQ6Oldl YkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCisgICAgTG9hZERh dGEoQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSBkYXRhLCBXVEY6OlN0cmluZyBNSU1FVHlwZSwgV1RG OjpTdHJpbmcgZW5jb2RpbmcsIFdURjo6U3RyaW5nIGJhc2VVUkwsIFdlYktpdDo6V2ViQ29udGV4 dFVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKICAgICBMb2FkSFRNTFN0cmlu ZyhXVEY6OlN0cmluZyBodG1sU3RyaW5nLCBXVEY6OlN0cmluZyBiYXNlVVJMLCBXZWJLaXQ6Oldl YkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCiAgICAgTG9hZEFs dGVybmF0ZUhUTUxTdHJpbmcoV1RGOjpTdHJpbmcgaHRtbFN0cmluZywgV1RGOjpTdHJpbmcgYmFz ZVVSTCwgV1RGOjpTdHJpbmcgdW5yZWFjaGFibGVVUkwsIFdlYktpdDo6V2ViQ29udGV4dFVzZXJN ZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKICAgICBMb2FkUGxhaW5UZXh0U3RyaW5n KFdURjo6U3RyaW5nIHN0cmluZywgV2ViS2l0OjpXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNvZGVy IHVzZXJEYXRhKSBWYXJpYWRpYwo=