128435 2014-02-07 19:09:14 -0800 CTTE: ApplicationCacheHost always has a DocumentLoader. 2014-07-04 17:17:49 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling andersca commit-queue japhet kling sam oldest_to_newest 978257 0 kling 2014-02-07 19:09:14 -0800 CTTE: ApplicationCacheHost always has a DocumentLoader. 978258 1 223540 kling 2014-02-07 19:09:41 -0800 Created attachment 223540 Patch 1020512 2 223540 commit-queue 2014-07-04 10:30:17 -0700 Comment on attachment 223540 Patch Rejecting attachment 223540 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 223540, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: of 17 hunks FAILED -- saving rejects to file Source/WebCore/loader/appcache/ApplicationCacheHost.cpp.rej patching file Source/WebCore/loader/appcache/ApplicationCacheHost.h Hunk #2 FAILED at 155. Hunk #3 succeeded at 165 (offset 1 line). 1 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/loader/appcache/ApplicationCacheHost.h.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Sam Weinig']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/4862202292994048 1020550 3 kling 2014-07-04 17:17:42 -0700 Landed in http://trac.webkit.org/changeset/170807 223540 2014-02-07 19:09:41 -0800 2014-07-04 10:30:16 -0700 Patch bug-128435.diff text/plain 14482 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ZmVmZTk1Li5kNmQ4ZGM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDEg QEAKIDIwMTQtMDItMDcgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIENUVEU6IEFwcGxpY2F0aW9uQ2FjaGVIb3N0IGFsd2F5cyBoYXMgYSBEb2N1bWVudExvYWRl ci4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyODQzNT4KKworICAgICAgICBIYXZl IEFwcGxpY2F0aW9uQ2FjaGVIb3N0IHN0b3JlIHRoZSBiYWNrcG9pbnRlciB0byBpdHMgb3duaW5n CisgICAgICAgIERvY3VtZW50TG9hZGVyIGFzIGEgcmVmZXJlbmNlLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpEb2N1bWVudExvYWRlcik6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291 cmNlKToKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUhvc3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUhvc3Q6OkFwcGxpY2F0aW9uQ2Fj aGVIb3N0KToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVIb3N0Ojp+QXBwbGlj YXRpb25DYWNoZUhvc3QpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUhvc3Q6 OnNlbGVjdENhY2hlV2l0aG91dE1hbmlmZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0 aW9uQ2FjaGVIb3N0OjpzZWxlY3RDYWNoZVdpdGhNYW5pZmVzdCk6CisgICAgICAgIChXZWJDb3Jl OjpBcHBsaWNhdGlvbkNhY2hlSG9zdDo6bWF5YmVMb2FkTWFpblJlc291cmNlKToKKyAgICAgICAg KFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVIb3N0OjptYXliZUxvYWRGYWxsYmFja0Zvck1haW5S ZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlSG9zdDo6bWF5YmVM b2FkRmFsbGJhY2tGb3JNYWluRXJyb3IpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25D YWNoZUhvc3Q6OmZhaWxlZExvYWRpbmdNYWluUmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6 QXBwbGljYXRpb25DYWNoZUhvc3Q6OmZpbmlzaGVkTG9hZGluZ01haW5SZXNvdXJjZSk6CisgICAg ICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlSG9zdDo6bWF5YmVMb2FkUmVzb3VyY2UpOgor ICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUhvc3Q6Om1heWJlTG9hZEZhbGxiYWNr Rm9yRXJyb3IpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUhvc3Q6Om1heWJl TG9hZFN5bmNocm9ub3VzbHkpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUhv c3Q6Om5vdGlmeURPTUFwcGxpY2F0aW9uQ2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGlj YXRpb25DYWNoZUhvc3Q6OnN0b3BEZWZlcnJpbmdFdmVudHMpOgorICAgICAgICAoV2ViQ29yZTo6 QXBwbGljYXRpb25DYWNoZUhvc3Q6OnNjaGVkdWxlTG9hZEZhbGxiYWNrUmVzb3VyY2VGcm9tQXBw bGljYXRpb25DYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlSG9zdDo6 dXBkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVIb3N0Ojpzd2FwQ2Fj aGUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUhvc3Q6OmFib3J0KToKKyAg ICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVIb3N0Ojppc0FwcGxpY2F0aW9uQ2FjaGVF bmFibGVkKToKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUhvc3Qu aDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVIb3N0Ojpkb2N1bWVudExvYWRl cik6CisKKzIwMTQtMDItMDcgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCiAg ICAgICAgIENUVEU6IFNWR1RSZWZUYXJnZXRFdmVudExpc3RlbmVyIGlzIGFsd2F5cyBvd25lZCBi eSBTVkdUUmVmRWxlbWVudC4KICAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyODQzMj4K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXggYjA0YTRlNy4u YzU5YTdhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC0x NDEsNyArMTQxLDcgQEAgRG9jdW1lbnRMb2FkZXI6OkRvY3VtZW50TG9hZGVyKGNvbnN0IFJlc291 cmNlUmVxdWVzdCYgcmVxLCBjb25zdCBTdWJzdGl0dXRlRGF0YSYKICAgICAsIG1fZGF0YUxvYWRU aW1lcih0aGlzLCAmRG9jdW1lbnRMb2FkZXI6OmhhbmRsZVN1YnN0aXR1dGVEYXRhTG9hZE5vdykK ICAgICAsIG1fd2FpdGluZ0ZvckNvbnRlbnRQb2xpY3koZmFsc2UpCiAgICAgLCBtX3N1YnJlc291 cmNlTG9hZGVyc0FyZVBhZ2VDYWNoZUFjY2VwdGFibGUoZmFsc2UpCi0gICAgLCBtX2FwcGxpY2F0 aW9uQ2FjaGVIb3N0KGFkb3B0UHRyKG5ldyBBcHBsaWNhdGlvbkNhY2hlSG9zdCh0aGlzKSkpCisg ICAgLCBtX2FwcGxpY2F0aW9uQ2FjaGVIb3N0KGFkb3B0UHRyKG5ldyBBcHBsaWNhdGlvbkNhY2hl SG9zdCgqdGhpcykpKQogewogfQogCkBAIC0xNDQwLDcgKzE0NDAsNyBAQCB2b2lkIERvY3VtZW50 TG9hZGVyOjpzdGFydExvYWRpbmdNYWluUmVzb3VyY2UoKQogICAgICAgICAvLyBJZiB0aGUgbG9h ZCB3YXMgYWJvcnRlZCBieSBjbGVhcmluZyBtX3JlcXVlc3QsIGl0J3MgcG9zc2libGUgdGhlIEFw cGxpY2F0aW9uQ2FjaGVIb3N0CiAgICAgICAgIC8vIGlzIG5vdyBpbiBhIHN0YXRlIHdoZXJlIHN0 YXJ0aW5nIGFuIGVtcHR5IGxvYWQgd2lsbCBiZSBpbmNvbnNpc3RlbnQuIFJlcGxhY2UgaXQgd2l0 aAogICAgICAgICAvLyBhIG5ldyBBcHBsaWNhdGlvbkNhY2hlSG9zdC4KLSAgICAgICAgbV9hcHBs aWNhdGlvbkNhY2hlSG9zdCA9IGFkb3B0UHRyKG5ldyBBcHBsaWNhdGlvbkNhY2hlSG9zdCh0aGlz KSk7CisgICAgICAgIG1fYXBwbGljYXRpb25DYWNoZUhvc3QgPSBhZG9wdFB0cihuZXcgQXBwbGlj YXRpb25DYWNoZUhvc3QoKnRoaXMpKTsKICAgICAgICAgbWF5YmVMb2FkRW1wdHkoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBj YWNoZS9BcHBsaWNhdGlvbkNhY2hlSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBw Y2FjaGUvQXBwbGljYXRpb25DYWNoZUhvc3QuY3BwCmluZGV4IDljYzNmOGQuLjk5MGZlZTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hl SG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9u Q2FjaGVIb3N0LmNwcApAQCAtNDMsMTMgKzQzLDEyIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAotQXBwbGljYXRpb25DYWNoZUhvc3Q6OkFwcGxpY2F0aW9uQ2FjaGVIb3N0KERvY3VtZW50TG9h ZGVyKiBkb2N1bWVudExvYWRlcikKK0FwcGxpY2F0aW9uQ2FjaGVIb3N0OjpBcHBsaWNhdGlvbkNh Y2hlSG9zdChEb2N1bWVudExvYWRlciYgZG9jdW1lbnRMb2FkZXIpCiAgICAgOiBtX2RvbUFwcGxp Y2F0aW9uQ2FjaGUoMCkKICAgICAsIG1fZG9jdW1lbnRMb2FkZXIoZG9jdW1lbnRMb2FkZXIpCiAg ICAgLCBtX2RlZmVyc0V2ZW50cyh0cnVlKQogICAgICwgbV9jYW5kaWRhdGVBcHBsaWNhdGlvbkNh Y2hlR3JvdXAoMCkKIHsKLSAgICBBU1NFUlQobV9kb2N1bWVudExvYWRlcik7CiB9CiAKIEFwcGxp Y2F0aW9uQ2FjaGVIb3N0Ojp+QXBwbGljYXRpb25DYWNoZUhvc3QoKQpAQCAtNTcsMTkgKzU2LDE5 IEBAIEFwcGxpY2F0aW9uQ2FjaGVIb3N0Ojp+QXBwbGljYXRpb25DYWNoZUhvc3QoKQogICAgIEFT U0VSVCghbV9hcHBsaWNhdGlvbkNhY2hlIHx8ICFtX2NhbmRpZGF0ZUFwcGxpY2F0aW9uQ2FjaGVH cm91cCB8fCBtX2FwcGxpY2F0aW9uQ2FjaGUtPmdyb3VwKCkgPT0gbV9jYW5kaWRhdGVBcHBsaWNh dGlvbkNhY2hlR3JvdXApOwogCiAgICAgaWYgKG1fYXBwbGljYXRpb25DYWNoZSkKLSAgICAgICAg bV9hcHBsaWNhdGlvbkNhY2hlLT5ncm91cCgpLT5kaXNhc3NvY2lhdGVEb2N1bWVudExvYWRlciht X2RvY3VtZW50TG9hZGVyKTsKKyAgICAgICAgbV9hcHBsaWNhdGlvbkNhY2hlLT5ncm91cCgpLT5k aXNhc3NvY2lhdGVEb2N1bWVudExvYWRlcigmbV9kb2N1bWVudExvYWRlcik7CiAgICAgZWxzZSBp ZiAobV9jYW5kaWRhdGVBcHBsaWNhdGlvbkNhY2hlR3JvdXApCi0gICAgICAgIG1fY2FuZGlkYXRl QXBwbGljYXRpb25DYWNoZUdyb3VwLT5kaXNhc3NvY2lhdGVEb2N1bWVudExvYWRlcihtX2RvY3Vt ZW50TG9hZGVyKTsKKyAgICAgICAgbV9jYW5kaWRhdGVBcHBsaWNhdGlvbkNhY2hlR3JvdXAtPmRp c2Fzc29jaWF0ZURvY3VtZW50TG9hZGVyKCZtX2RvY3VtZW50TG9hZGVyKTsKIH0KIAogdm9pZCBB cHBsaWNhdGlvbkNhY2hlSG9zdDo6c2VsZWN0Q2FjaGVXaXRob3V0TWFuaWZlc3QoKQogewotICAg IEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2VsZWN0Q2FjaGVXaXRob3V0TWFuaWZlc3RVUkwobV9k b2N1bWVudExvYWRlci0+ZnJhbWUoKSk7CisgICAgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpzZWxl Y3RDYWNoZVdpdGhvdXRNYW5pZmVzdFVSTChtX2RvY3VtZW50TG9hZGVyLmZyYW1lKCkpOwogfQog CiB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpzZWxlY3RDYWNoZVdpdGhNYW5pZmVzdChjb25z dCBVUkwmIG1hbmlmZXN0VVJMKQogewotICAgIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2VsZWN0 Q2FjaGUobV9kb2N1bWVudExvYWRlci0+ZnJhbWUoKSwgbWFuaWZlc3RVUkwpOworICAgIEFwcGxp Y2F0aW9uQ2FjaGVHcm91cDo6c2VsZWN0Q2FjaGUobV9kb2N1bWVudExvYWRlci5mcmFtZSgpLCBt YW5pZmVzdFVSTCk7CiB9CiAKIHZvaWQgQXBwbGljYXRpb25DYWNoZUhvc3Q6Om1heWJlTG9hZE1h aW5SZXNvdXJjZShSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFN1YnN0aXR1dGVEYXRhJiBzdWJz dGl0dXRlRGF0YSkKQEAgLTc4LDcgKzc3LDcgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6 bWF5YmVMb2FkTWFpblJlc291cmNlKFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgU3Vic3QKICAg ICBpZiAoIXN1YnN0aXR1dGVEYXRhLmlzVmFsaWQoKSAmJiBpc0FwcGxpY2F0aW9uQ2FjaGVFbmFi bGVkKCkpIHsKICAgICAgICAgQVNTRVJUKCFtX21haW5SZXNvdXJjZUFwcGxpY2F0aW9uQ2FjaGUp OwogCi0gICAgICAgIG1fbWFpblJlc291cmNlQXBwbGljYXRpb25DYWNoZSA9IEFwcGxpY2F0aW9u Q2FjaGVHcm91cDo6Y2FjaGVGb3JNYWluUmVxdWVzdChyZXF1ZXN0LCBtX2RvY3VtZW50TG9hZGVy KTsKKyAgICAgICAgbV9tYWluUmVzb3VyY2VBcHBsaWNhdGlvbkNhY2hlID0gQXBwbGljYXRpb25D YWNoZUdyb3VwOjpjYWNoZUZvck1haW5SZXF1ZXN0KHJlcXVlc3QsICZtX2RvY3VtZW50TG9hZGVy KTsKIAogICAgICAgICBpZiAobV9tYWluUmVzb3VyY2VBcHBsaWNhdGlvbkNhY2hlKSB7CiAgICAg ICAgICAgICAvLyBHZXQgdGhlIHJlc291cmNlIGZyb20gdGhlIGFwcGxpY2F0aW9uIGNhY2hlLiBC eSBkZWZpbml0aW9uLCBjYWNoZUZvck1haW5SZXF1ZXN0KCkgcmV0dXJucyBhIGNhY2hlIHRoYXQg Y29udGFpbnMgdGhlIHJlc291cmNlLgpAQCAtMTA0LDkgKzEwMyw5IEBAIGJvb2wgQXBwbGljYXRp b25DYWNoZUhvc3Q6Om1heWJlTG9hZEZhbGxiYWNrRm9yTWFpblJlc3BvbnNlKGNvbnN0IFJlc291 cmNlUmVxdWVzCiAgICAgaWYgKHIuaHR0cFN0YXR1c0NvZGUoKSAvIDEwMCA9PSA0IHx8IHIuaHR0 cFN0YXR1c0NvZGUoKSAvIDEwMCA9PSA1KSB7CiAgICAgICAgIEFTU0VSVCghbV9tYWluUmVzb3Vy Y2VBcHBsaWNhdGlvbkNhY2hlKTsKICAgICAgICAgaWYgKGlzQXBwbGljYXRpb25DYWNoZUVuYWJs ZWQoKSkgewotICAgICAgICAgICAgbV9tYWluUmVzb3VyY2VBcHBsaWNhdGlvbkNhY2hlID0gQXBw bGljYXRpb25DYWNoZUdyb3VwOjpmYWxsYmFja0NhY2hlRm9yTWFpblJlcXVlc3QocmVxdWVzdCwg ZG9jdW1lbnRMb2FkZXIoKSk7CisgICAgICAgICAgICBtX21haW5SZXNvdXJjZUFwcGxpY2F0aW9u Q2FjaGUgPSBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmZhbGxiYWNrQ2FjaGVGb3JNYWluUmVxdWVz dChyZXF1ZXN0LCAmbV9kb2N1bWVudExvYWRlcik7CiAKLSAgICAgICAgICAgIGlmIChzY2hlZHVs ZUxvYWRGYWxsYmFja1Jlc291cmNlRnJvbUFwcGxpY2F0aW9uQ2FjaGUoZG9jdW1lbnRMb2FkZXIo KS0+bWFpblJlc291cmNlTG9hZGVyKCksIG1fbWFpblJlc291cmNlQXBwbGljYXRpb25DYWNoZS5n ZXQoKSkpCisgICAgICAgICAgICBpZiAoc2NoZWR1bGVMb2FkRmFsbGJhY2tSZXNvdXJjZUZyb21B cHBsaWNhdGlvbkNhY2hlKG1fZG9jdW1lbnRMb2FkZXIubWFpblJlc291cmNlTG9hZGVyKCksIG1f bWFpblJlc291cmNlQXBwbGljYXRpb25DYWNoZS5nZXQoKSkpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CkBAIC0xMTgsOSArMTE3LDkgQEAgYm9vbCBBcHBs aWNhdGlvbkNhY2hlSG9zdDo6bWF5YmVMb2FkRmFsbGJhY2tGb3JNYWluRXJyb3IoY29uc3QgUmVz b3VyY2VSZXF1ZXN0JgogICAgIGlmICghZXJyb3IuaXNDYW5jZWxsYXRpb24oKSkgewogICAgICAg ICBBU1NFUlQoIW1fbWFpblJlc291cmNlQXBwbGljYXRpb25DYWNoZSk7CiAgICAgICAgIGlmIChp c0FwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkpIHsKLSAgICAgICAgICAgIG1fbWFpblJlc291cmNl QXBwbGljYXRpb25DYWNoZSA9IEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6ZmFsbGJhY2tDYWNoZUZv ck1haW5SZXF1ZXN0KHJlcXVlc3QsIG1fZG9jdW1lbnRMb2FkZXIpOworICAgICAgICAgICAgbV9t YWluUmVzb3VyY2VBcHBsaWNhdGlvbkNhY2hlID0gQXBwbGljYXRpb25DYWNoZUdyb3VwOjpmYWxs YmFja0NhY2hlRm9yTWFpblJlcXVlc3QocmVxdWVzdCwgJm1fZG9jdW1lbnRMb2FkZXIpOwogCi0g ICAgICAgICAgICBpZiAoc2NoZWR1bGVMb2FkRmFsbGJhY2tSZXNvdXJjZUZyb21BcHBsaWNhdGlv bkNhY2hlKGRvY3VtZW50TG9hZGVyKCktPm1haW5SZXNvdXJjZUxvYWRlcigpLCBtX21haW5SZXNv dXJjZUFwcGxpY2F0aW9uQ2FjaGUuZ2V0KCkpKQorICAgICAgICAgICAgaWYgKHNjaGVkdWxlTG9h ZEZhbGxiYWNrUmVzb3VyY2VGcm9tQXBwbGljYXRpb25DYWNoZShtX2RvY3VtZW50TG9hZGVyLm1h aW5SZXNvdXJjZUxvYWRlcigpLCBtX21haW5SZXNvdXJjZUFwcGxpY2F0aW9uQ2FjaGUuZ2V0KCkp KQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgfQpAQCAtMTQ0 LDcgKzE0Myw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUhvc3Q6OmZhaWxlZExvYWRpbmdNYWlu UmVzb3VyY2UoKQogICAgIH0KICAgICAKICAgICBpZiAoZ3JvdXApCi0gICAgICAgIGdyb3VwLT5m YWlsZWRMb2FkaW5nTWFpblJlc291cmNlKG1fZG9jdW1lbnRMb2FkZXIpOworICAgICAgICBncm91 cC0+ZmFpbGVkTG9hZGluZ01haW5SZXNvdXJjZSgmbV9kb2N1bWVudExvYWRlcik7CiB9CiAKIHZv aWQgQXBwbGljYXRpb25DYWNoZUhvc3Q6OmZpbmlzaGVkTG9hZGluZ01haW5SZXNvdXJjZSgpCkBA IC0xNTQsOSArMTUzLDggQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6ZmluaXNoZWRMb2Fk aW5nTWFpblJlc291cmNlKCkKICAgICAgICAgZ3JvdXAgPSBhcHBsaWNhdGlvbkNhY2hlKCktPmdy b3VwKCk7CiAgICAgCiAgICAgaWYgKGdyb3VwKQotICAgICAgICBncm91cC0+ZmluaXNoZWRMb2Fk aW5nTWFpblJlc291cmNlKG1fZG9jdW1lbnRMb2FkZXIpOworICAgICAgICBncm91cC0+ZmluaXNo ZWRMb2FkaW5nTWFpblJlc291cmNlKCZtX2RvY3VtZW50TG9hZGVyKTsKIH0KLQogYm9vbCBBcHBs aWNhdGlvbkNhY2hlSG9zdDo6bWF5YmVMb2FkUmVzb3VyY2UoUmVzb3VyY2VMb2FkZXIqIGxvYWRl ciwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBVUkwmIG9yaWdpbmFsVVJMKQogewog ICAgIGlmICghaXNBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpKQpAQCAtMTY5LDggKzE2Nyw4IEBA IGJvb2wgQXBwbGljYXRpb25DYWNoZUhvc3Q6Om1heWJlTG9hZFJlc291cmNlKFJlc291cmNlTG9h ZGVyKiBsb2FkZXIsIFJlc291cmNlUmVxCiAgICAgaWYgKCFzaG91bGRMb2FkUmVzb3VyY2VGcm9t QXBwbGljYXRpb25DYWNoZShyZXF1ZXN0LCByZXNvdXJjZSkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICAKLSAgICBtX2RvY3VtZW50TG9hZGVyLT5tX3BlbmRpbmdTdWJzdGl0dXRlUmVzb3Vy Y2VzLnNldChsb2FkZXIsIHJlc291cmNlKTsKLSAgICBtX2RvY3VtZW50TG9hZGVyLT5kZWxpdmVy U3Vic3RpdHV0ZVJlc291cmNlc0FmdGVyRGVsYXkoKTsKKyAgICBtX2RvY3VtZW50TG9hZGVyLm1f cGVuZGluZ1N1YnN0aXR1dGVSZXNvdXJjZXMuc2V0KGxvYWRlciwgcmVzb3VyY2UpOworICAgIG1f ZG9jdW1lbnRMb2FkZXIuZGVsaXZlclN1YnN0aXR1dGVSZXNvdXJjZXNBZnRlckRlbGF5KCk7CiAg ICAgICAgIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMTk0LDcgKzE5Miw3IEBAIGJvb2wgQXBw bGljYXRpb25DYWNoZUhvc3Q6Om1heWJlTG9hZEZhbGxiYWNrRm9yUmVzcG9uc2UoUmVzb3VyY2VM b2FkZXIqIHJlc291cmNlCiBib29sIEFwcGxpY2F0aW9uQ2FjaGVIb3N0OjptYXliZUxvYWRGYWxs YmFja0ZvckVycm9yKFJlc291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciwgY29uc3QgUmVzb3Vy Y2VFcnJvciYgZXJyb3IpCiB7CiAgICAgaWYgKCFlcnJvci5pc0NhbmNlbGxhdGlvbigpKSB7Ci0g ICAgICAgIGlmIChyZXNvdXJjZUxvYWRlciA9PSBtX2RvY3VtZW50TG9hZGVyLT5tYWluUmVzb3Vy Y2VMb2FkZXIoKSkKKyAgICAgICAgaWYgKHJlc291cmNlTG9hZGVyID09IG1fZG9jdW1lbnRMb2Fk ZXIubWFpblJlc291cmNlTG9hZGVyKCkpCiAgICAgICAgICAgICByZXR1cm4gbWF5YmVMb2FkRmFs bGJhY2tGb3JNYWluRXJyb3IocmVzb3VyY2VMb2FkZXItPnJlcXVlc3QoKSwgZXJyb3IpOwogICAg ICAgICBpZiAoc2NoZWR1bGVMb2FkRmFsbGJhY2tSZXNvdXJjZUZyb21BcHBsaWNhdGlvbkNhY2hl KHJlc291cmNlTG9hZGVyKSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMjEwLDcgKzIw OCw3IEBAIGJvb2wgQXBwbGljYXRpb25DYWNoZUhvc3Q6Om1heWJlTG9hZFN5bmNocm9ub3VzbHko UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBSZXNvCiAgICAgICAgICAgICByZXNwb25zZSA9IHJl c291cmNlLT5yZXNwb25zZSgpOwogICAgICAgICAgICAgZGF0YS5hcHBlbmQocmVzb3VyY2UtPmRh dGEoKS0+ZGF0YSgpLCByZXNvdXJjZS0+ZGF0YSgpLT5zaXplKCkpOwogICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgZXJyb3IgPSBkb2N1bWVudExvYWRlcigpLT5mcmFtZUxvYWRlcigpLT5j bGllbnQoKS5jYW5ub3RTaG93VVJMRXJyb3IocmVxdWVzdCk7CisgICAgICAgICAgICBlcnJvciA9 IG1fZG9jdW1lbnRMb2FkZXIuZnJhbWVMb2FkZXIoKS0+Y2xpZW50KCkuY2Fubm90U2hvd1VSTEVy cm9yKHJlcXVlc3QpOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KQEAg LTI0OCw3ICsyNDYsNyBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpzZXRET01BcHBsaWNh dGlvbkNhY2hlKERPTUFwcGxpY2F0aW9uQ2FjaGUqIGRvbUFwcGxpYwogdm9pZCBBcHBsaWNhdGlv bkNhY2hlSG9zdDo6bm90aWZ5RE9NQXBwbGljYXRpb25DYWNoZShFdmVudElEIGlkLCBpbnQgdG90 YWwsIGludCBkb25lKQogewogICAgIGlmIChpZCAhPSBQUk9HUkVTU19FVkVOVCkKLSAgICAgICAg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp1cGRhdGVBcHBsaWNhdGlvbkNhY2hlU3RhdHVzKG1f ZG9jdW1lbnRMb2FkZXItPmZyYW1lKCkpOworICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OnVwZGF0ZUFwcGxpY2F0aW9uQ2FjaGVTdGF0dXMobV9kb2N1bWVudExvYWRlci5mcmFtZSgp KTsKIAogICAgIGlmIChtX2RlZmVyc0V2ZW50cykgewogICAgICAgICAvLyBFdmVudCBkaXNwYXRj aGluZyBpcyBkZWZlcnJlZCB1bnRpbCBkb2N1bWVudC5vbmxvYWQgaGFzIGZpcmVkLgpAQCAtMjcw LDcgKzI2OCw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUhvc3Q6OnN0b3BMb2FkaW5nSW5GcmFt ZShGcmFtZSogZnJhbWUpCiAKIHZvaWQgQXBwbGljYXRpb25DYWNoZUhvc3Q6OnN0b3BEZWZlcnJp bmdFdmVudHMoKQogewotICAgIFJlZlB0cjxEb2N1bWVudExvYWRlcj4gcHJvdGVjdChkb2N1bWVu dExvYWRlcigpKTsKKyAgICBSZWY8RG9jdW1lbnRMb2FkZXI+IHByb3RlY3QobV9kb2N1bWVudExv YWRlcik7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fZGVmZXJyZWRFdmVudHMuc2l6 ZSgpOyArK2kpIHsKICAgICAgICAgY29uc3QgRGVmZXJyZWRFdmVudCYgZGVmZXJyZWQgPSBtX2Rl ZmVycmVkRXZlbnRzW2ldOwogICAgICAgICBkaXNwYXRjaERPTUV2ZW50KGRlZmVycmVkLmV2ZW50 SUQsIGRlZmVycmVkLnByb2dyZXNzVG90YWwsIGRlZmVycmVkLnByb2dyZXNzRG9uZSk7CkBAIC0z OTgsOCArMzk2LDggQEAgYm9vbCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6c2NoZWR1bGVMb2FkRmFs bGJhY2tSZXNvdXJjZUZyb21BcHBsaWNhdGlvbkNhY2hlKFJlc28KICAgICBpZiAoIWdldEFwcGxp Y2F0aW9uQ2FjaGVGYWxsYmFja1Jlc291cmNlKGxvYWRlci0+cmVxdWVzdCgpLCByZXNvdXJjZSwg Y2FjaGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBtX2RvY3VtZW50TG9hZGVyLT5t X3BlbmRpbmdTdWJzdGl0dXRlUmVzb3VyY2VzLnNldChsb2FkZXIsIHJlc291cmNlKTsKLSAgICBt X2RvY3VtZW50TG9hZGVyLT5kZWxpdmVyU3Vic3RpdHV0ZVJlc291cmNlc0FmdGVyRGVsYXkoKTsK KyAgICBtX2RvY3VtZW50TG9hZGVyLm1fcGVuZGluZ1N1YnN0aXR1dGVSZXNvdXJjZXMuc2V0KGxv YWRlciwgcmVzb3VyY2UpOworICAgIG1fZG9jdW1lbnRMb2FkZXIuZGVsaXZlclN1YnN0aXR1dGVS ZXNvdXJjZXNBZnRlckRlbGF5KCk7CiAgICAgCiAgICAgbG9hZGVyLT5oYW5kbGUoKS0+Y2FuY2Vs KCk7CiAKQEAgLTQzNSw3ICs0MzMsNyBAQCBib29sIEFwcGxpY2F0aW9uQ2FjaGVIb3N0Ojp1cGRh dGUoKQogICAgIEFwcGxpY2F0aW9uQ2FjaGUqIGNhY2hlID0gYXBwbGljYXRpb25DYWNoZSgpOwog ICAgIGlmICghY2FjaGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBjYWNoZS0+Z3JvdXAo KS0+dXBkYXRlKG1fZG9jdW1lbnRMb2FkZXItPmZyYW1lKCksIEFwcGxpY2F0aW9uQ2FjaGVVcGRh dGVXaXRob3V0QnJvd3NpbmdDb250ZXh0KTsKKyAgICBjYWNoZS0+Z3JvdXAoKS0+dXBkYXRlKG1f ZG9jdW1lbnRMb2FkZXIuZnJhbWUoKSwgQXBwbGljYXRpb25DYWNoZVVwZGF0ZVdpdGhvdXRCcm93 c2luZ0NvbnRleHQpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC00NDcsNyArNDQ1LDcgQEAg Ym9vbCBBcHBsaWNhdGlvbkNhY2hlSG9zdDo6c3dhcENhY2hlKCkKIAogICAgIC8vIElmIHRoZSBn cm91cCBvZiBhcHBsaWNhdGlvbiBjYWNoZXMgdG8gd2hpY2ggY2FjaGUgYmVsb25ncyBoYXMgdGhl IGxpZmVjeWNsZSBzdGF0dXMgb2Jzb2xldGUsIHVuYXNzb2NpYXRlIGRvY3VtZW50IGZyb20gY2Fj aGUuCiAgICAgaWYgKGNhY2hlLT5ncm91cCgpLT5pc09ic29sZXRlKCkpIHsKLSAgICAgICAgY2Fj aGUtPmdyb3VwKCktPmRpc2Fzc29jaWF0ZURvY3VtZW50TG9hZGVyKG1fZG9jdW1lbnRMb2FkZXIp OworICAgICAgICBjYWNoZS0+Z3JvdXAoKS0+ZGlzYXNzb2NpYXRlRG9jdW1lbnRMb2FkZXIoJm1f ZG9jdW1lbnRMb2FkZXIpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTQ1OCw3 ICs0NTYsNyBAQCBib29sIEFwcGxpY2F0aW9uQ2FjaGVIb3N0Ojpzd2FwQ2FjaGUoKQogICAgIAog ICAgIEFTU0VSVChjYWNoZS0+Z3JvdXAoKSA9PSBuZXdlc3RDYWNoZS0+Z3JvdXAoKSk7CiAgICAg c2V0QXBwbGljYXRpb25DYWNoZShuZXdlc3RDYWNoZSk7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjp1cGRhdGVBcHBsaWNhdGlvbkNhY2hlU3RhdHVzKG1fZG9jdW1lbnRMb2FkZXItPmZy YW1lKCkpOworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6dXBkYXRlQXBwbGljYXRpb25D YWNoZVN0YXR1cyhtX2RvY3VtZW50TG9hZGVyLmZyYW1lKCkpOwogICAgIHJldHVybiB0cnVlOwog fQogCkBAIC00NjYsMTcgKzQ2NCwxNyBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVIb3N0OjphYm9y dCgpCiB7CiAgICAgQXBwbGljYXRpb25DYWNoZUdyb3VwKiBjYWNoZUdyb3VwID0gY2FuZGlkYXRl QXBwbGljYXRpb25DYWNoZUdyb3VwKCk7CiAgICAgaWYgKGNhY2hlR3JvdXApCi0gICAgICAgIGNh Y2hlR3JvdXAtPmFib3J0KG1fZG9jdW1lbnRMb2FkZXItPmZyYW1lKCkpOworICAgICAgICBjYWNo ZUdyb3VwLT5hYm9ydChtX2RvY3VtZW50TG9hZGVyLmZyYW1lKCkpOwogICAgIGVsc2UgewogICAg ICAgICBBcHBsaWNhdGlvbkNhY2hlKiBjYWNoZSA9IGFwcGxpY2F0aW9uQ2FjaGUoKTsKICAgICAg ICAgaWYgKGNhY2hlKQotICAgICAgICAgICAgY2FjaGUtPmdyb3VwKCktPmFib3J0KG1fZG9jdW1l bnRMb2FkZXItPmZyYW1lKCkpOworICAgICAgICAgICAgY2FjaGUtPmdyb3VwKCktPmFib3J0KG1f ZG9jdW1lbnRMb2FkZXIuZnJhbWUoKSk7CiAgICAgfQogfQogCiBib29sIEFwcGxpY2F0aW9uQ2Fj aGVIb3N0Ojppc0FwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkKIHsKLSAgICByZXR1cm4gbV9kb2N1 bWVudExvYWRlci0+ZnJhbWUoKSAmJiBtX2RvY3VtZW50TG9hZGVyLT5mcmFtZSgpLT5zZXR0aW5n cygpLm9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpOworICAgIHJldHVybiBtX2Rv Y3VtZW50TG9hZGVyLmZyYW1lKCkgJiYgbV9kb2N1bWVudExvYWRlci5mcmFtZSgpLT5zZXR0aW5n cygpLm9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpOwogfQogCiB9ICAvLyBuYW1l c3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hl L0FwcGxpY2F0aW9uQ2FjaGVIb3N0LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUv QXBwbGljYXRpb25DYWNoZUhvc3QuaAppbmRleCBmNmUwZDBiLi5lNTdmMzlhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUhvc3QuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUhvc3Qu aApAQCAtMTEwLDcgKzExMCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdHlwZWRl ZiBWZWN0b3I8UmVzb3VyY2VJbmZvPiBSZXNvdXJjZUluZm9MaXN0OwogI2VuZGlmCiAKLSAgICAg ICAgQXBwbGljYXRpb25DYWNoZUhvc3QoRG9jdW1lbnRMb2FkZXIqKTsKKyAgICAgICAgZXhwbGlj aXQgQXBwbGljYXRpb25DYWNoZUhvc3QoRG9jdW1lbnRMb2FkZXImKTsKICAgICAgICAgfkFwcGxp Y2F0aW9uQ2FjaGVIb3N0KCk7CiAKICAgICAgICAgdm9pZCBzZWxlY3RDYWNoZVdpdGhvdXRNYW5p ZmVzdCgpOwpAQCAtMTU1LDcgKzE1NSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIHBy aXZhdGU6CiAgICAgICAgIGJvb2wgaXNBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpOwotICAgICAg ICBEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIoKSBjb25zdCB7IHJldHVybiBtX2RvY3Vt ZW50TG9hZGVyOyB9CiAKICAgICAgICAgc3RydWN0IERlZmVycmVkRXZlbnQgewogICAgICAgICAg ICAgRXZlbnRJRCBldmVudElEOwpAQCAtMTY1LDcgKzE2NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgfTsKIAogICAgICAgICBET01BcHBsaWNhdGlvbkNhY2hlKiBtX2RvbUFwcGxp Y2F0aW9uQ2FjaGU7Ci0gICAgICAgIERvY3VtZW50TG9hZGVyKiBtX2RvY3VtZW50TG9hZGVyOwor ICAgICAgICBEb2N1bWVudExvYWRlciYgbV9kb2N1bWVudExvYWRlcjsKICAgICAgICAgYm9vbCBt X2RlZmVyc0V2ZW50czsgLy8gRXZlbnRzIGFyZSBkZWZlcnJlZCB1bnRpbCBhZnRlciBkb2N1bWVu dCBvbmxvYWQuCiAgICAgICAgIFZlY3RvcjxEZWZlcnJlZEV2ZW50PiBtX2RlZmVycmVkRXZlbnRz OwogCg==