142916 2015-03-20 12:19:41 -0700 [WK2] Allow stale content when restoring the browser's session state 2016-02-04 09:17:35 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=153230 InRadar P2 Normal --- 142893 1 cdumez cdumez barraclough commit-queue koivisto webkit-bug-importer oldest_to_newest 1078915 0 cdumez 2015-03-20 12:19:41 -0700 Allow stale content when restoring the browser's session state (restoring all tabs from previous session), e.g. - Via History > Reopen All windows from previous session on Safari - Happens on startup for MobileSafari Radar: <rdar://problem/18769970> 1078922 1 249129 cdumez 2015-03-20 12:31:25 -0700 Created attachment 249129 Patch 1078936 2 webkit-bug-importer 2015-03-20 13:30:01 -0700 <rdar://problem/20243493> 1078937 3 249133 cdumez 2015-03-20 13:34:28 -0700 Created attachment 249133 Patch 1078960 4 249133 darin 2015-03-20 14:59:51 -0700 Comment on attachment 249133 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249133&action=review > Source/WebKit2/ChangeLog:12 > + Allow stale content when restoring the browser's session state > + (restoring all tabs from previous session), e.g. > + - Via History > Reopen All windows from previous session on Safari > + - Happens on startup for MobileSafari A cool idea, but seems a little risky. Might be a mix of new content and really old content depending on what’s in the cache. > Source/WebKit2/UIProcess/WebPageProxy.cpp:-2100 > - return goToBackForwardItem(item, AllowStaleContent::No); You could have made this a 1-line patch and then later removed this argument once we are sure it’s the right thing! 1078968 5 249133 commit-queue 2015-03-20 15:45:53 -0700 Comment on attachment 249133 Patch Clearing flags on attachment: 249133 Committed r181815: <http://trac.webkit.org/changeset/181815> 1078969 6 commit-queue 2015-03-20 15:45:59 -0700 All reviewed patches have been landed. Closing bug. 249129 2015-03-20 12:31:25 -0700 2015-03-20 13:34:25 -0700 Patch bug-142916-20150320123052.patch text/plain 10412 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDkwYTVjZDI5OWM4Yzdi M2Q5NmFiYWQyZWRhY2Y2ZDRlMmNjZTA4ZC4uMmNiZWMxNzdmMWU2YTU3ZmFlMjIwMTMwNTQ2ZWUw Yzk0YTVmMzk3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE1LTAzLTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gQWxsb3cgc3RhbGUg Y29udGVudCB3aGVuIHJlc3RvcmluZyB0aGUgYnJvd3NlcidzIHNlc3Npb24gc3RhdGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjkxNgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTg3Njk5NzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgc3RhbGUgY29udGVudCB3aGVuIHJlc3RvcmluZyB0 aGUgYnJvd3NlcidzIHNlc3Npb24gc3RhdGUKKyAgICAgICAgKHJlc3RvcmluZyBhbGwgdGFicyBm cm9tIHByZXZpb3VzIHNlc3Npb24pLCBlLmcuCisgICAgICAgIC0gVmlhIEhpc3RvcnkgPiBSZW9w ZW4gQWxsIHdpbmRvd3MgZnJvbSBwcmV2aW91cyBzZXNzaW9uIG9uIFNhZmFyaQorICAgICAgICAt IEhhcHBlbnMgb24gc3RhcnR1cCBmb3IgTW9iaWxlU2FmYXJpCisKKyAgICAgICAgSSBoYXZlIHZl cmlmaWVkIHRoYXQgdXNpbmcgIk9wZW4gaW4gdGFicyIgb24gYSBib29rbWFya3MgZm9sZGVyCisg ICAgICAgIHN0aWxsIGRvZXMgZnJlc2ggbG9hZHMgKHJkYXI6Ly9wcm9ibGVtLzgxMzEzNTUpIGFz IGl0IGlzIG5vdCB1c2luZworICAgICAgICB0aGUgcmVzdG9yZUZyb21TZXNzaW9uU3RhdGUoKSBj b2RlIHBhdGguCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc0ZvclJlbG9hZCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRo SXRlbSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z29Gb3J3YXJkKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpnb0JhY2spOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnb1RvQmFja0ZvcndhcmRJdGVtKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAyMDE1LTAzLTIwICBHeXV5b3VuZyBLaW0gIDxn eXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0NNYWtlXSBSZW1vdmUgZHVwbGlj YXRlZCBjbWFrZSBmdW5jdGlvbiBjYWxscyBpbiBXZWJLaXQyL0NNYWtlTGlzdHMudHh0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDRiZjI5YTc1MjY4Yjhi YzMzYzMxMjIwYmFiNzQ1ZTk1N2NiN2UwMDguLmU4NTdkN2NjYjZiOGRhOTVlZWRjNWU5ODMwMzUw OWU3NGViZGJjNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CkBAIC02NTYsMTMgKzY1NiwxMyBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJv eHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzRm9yUmVsb2FkKCkKICAgICBhdXRvIG5hdmlnYXRpb24g PSBtX25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRlUmVsb2FkTmF2aWdhdGlvbigpOwogCiAgICAgLy8g V2UgYWxsb3cgc3RhbGUgY29udGVudCB3aGVuIHJlbG9hZGluZyBhIFdlYlByb2Nlc3MgdGhhdCdz IGJlZW4ga2lsbGVkIG9yIGNyYXNoZWQuCi0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCBt X2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+aXRlbUlEKCksIHRydWUgLyogYWxsb3dT dGFsZSAqLyksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIG1fYmFj a0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtSUQoKSksIG1fcGFnZUlEKTsKICAgICBt X3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKIAogICAgIHJldHVybiBX VEY6Om1vdmUobmF2aWdhdGlvbik7CiB9CiAKLVJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBh Z2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyZExpc3RJ dGVtKiBpdGVtLCBBbGxvd1N0YWxlQ29udGVudCBhbGxvd1N0YWxlQ29udGVudCkKK1JlZlB0cjxB UEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRl bShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtKQogewogICAgIGlmIChtX2lzQ2xvc2VkKQog ICAgICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTY3OCw3ICs2NzgsNyBAQCBSZWZQdHI8QVBJOjpO YXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2Vi QmFja0ZvcndhcgogCiAgICAgYXV0byBuYXZpZ2F0aW9uID0gbV9uYXZpZ2F0aW9uU3RhdGUtPmNy ZWF0ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbigpOwogCi0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24tPm5hdmlnYXRpb25J RCgpLCBpdGVtLT5pdGVtSUQoKSwgYWxsb3dTdGFsZUNvbnRlbnQgPT0gQWxsb3dTdGFsZUNvbnRl bnQ6OlllcyksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIGl0ZW0t Pml0ZW1JRCgpKSwgbV9wYWdlSUQpOwogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1l cigpLT5zdGFydCgpOwogCiAgICAgcmV0dXJuIFdURjo6bW92ZShuYXZpZ2F0aW9uKTsKQEAgLTEw MjYsNyArMTAyNiw3IEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6Z29G b3J3YXJkKCkKICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJh bnNhY3Rpb24sIGZvcndhcmRJdGVtLT51cmwoKSk7CiAKICAgICBpZiAoIWlzVmFsaWQoKSkKLSAg ICAgICAgcmV0dXJuIHJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oZm9yd2FyZEl0ZW0sIEFs bG93U3RhbGVDb250ZW50OjpZZXMpOworICAgICAgICByZXR1cm4gcmVhdHRhY2hUb1dlYlByb2Nl c3NXaXRoSXRlbShmb3J3YXJkSXRlbSk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBu YXZpZ2F0aW9uOwogICAgIGlmICghbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0 ZW1Jc0luU2FtZURvY3VtZW50KCpmb3J3YXJkSXRlbSkpCkBAIC0xMDQ5LDcgKzEwNDksNyBAQCBS ZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmdvQmFjaygpCiAgICAgbV9wYWdl TG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCBiYWNrSXRlbS0+ dXJsKCkpOwogCiAgICAgaWYgKCFpc1ZhbGlkKCkpCi0gICAgICAgIHJldHVybiByZWF0dGFjaFRv V2ViUHJvY2Vzc1dpdGhJdGVtKGJhY2tJdGVtLCBBbGxvd1N0YWxlQ29udGVudDo6WWVzKTsKKyAg ICAgICAgcmV0dXJuIHJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oYmFja0l0ZW0pOwogCiAg ICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAgICBpZiAoIW1fYmFja0Zv cndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtSXNJblNhbWVEb2N1bWVudCgqYmFja0l0ZW0p KQpAQCAtMTA2MSwxMCArMTA2MSwxMCBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdl UHJveHk6OmdvQmFjaygpCiAgICAgcmV0dXJuIG5hdmlnYXRpb247CiB9CiAKLVJlZlB0cjxBUEk6 Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbShXZWJCYWNrRm9y d2FyZExpc3RJdGVtKiBpdGVtLCBBbGxvd1N0YWxlQ29udGVudCBhbGxvd1N0YWxlQ29udGVudCkK K1JlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRl bShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtKQogewogICAgIGlmICghaXNWYWxpZCgpKQot ICAgICAgICByZXR1cm4gcmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbShpdGVtLCBhbGxvd1N0 YWxlQ29udGVudCk7CisgICAgICAgIHJldHVybiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVt KGl0ZW0pOwogCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2Fj dGlvbigpOwogCkBAIC0xMDc0LDcgKzEwNzQsNyBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBX ZWJQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbQog ICAgIGlmICghbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1Jc0luU2FtZURv Y3VtZW50KCppdGVtKSkKICAgICAgICAgbmF2aWdhdGlvbiA9IG1fbmF2aWdhdGlvblN0YXRlLT5j cmVhdGVCYWNrRm9yd2FyZE5hdmlnYXRpb24oKTsKIAotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uID8gbmF2aWdhdGlv bi0+bmF2aWdhdGlvbklEKCkgOiAwLCBpdGVtLT5pdGVtSUQoKSwgYWxsb3dTdGFsZUNvbnRlbnQg PT0gQWxsb3dTdGFsZUNvbnRlbnQ6OlllcyksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbiA/IG5h dmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwgaXRlbS0+aXRlbUlEKCkpLCBtX3BhZ2VJRCk7 CiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiAKICAgICBy ZXR1cm4gbmF2aWdhdGlvbjsKQEAgLTIwOTUsMTAgKzIwOTUsOCBAQCBSZWZQdHI8QVBJOjpOYXZp Z2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKFNlc3Npb25TdGF0 ZSBzZXNzaQogCiAgICAgICAgIGlmIChoYXNCYWNrRm9yd2FyZExpc3QpIHsKICAgICAgICAgICAg IC8vIEZJWE1FOiBEbyB3ZSBoYXZlIHRvIG51bGwgY2hlY2sgdGhlIGJhY2sgZm9yd2FyZCBsaXN0 IGl0ZW0gaGVyZT8KLSAgICAgICAgICAgIGlmIChXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVt ID0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkpIHsKLSAgICAgICAgICAgICAgICAv LyBXZSBmb3JiaWQgc3RhbGUgY29udGVudCB3aGVuIHJlc3RvcmluZyB0aGUgc2Vzc2lvbiBzdGF0 ZSBhbmQgZG8gYSBmcmVzaCBsb2FkIChyZGFyOi8vcHJvYmxlbS84MTMxMzU1KS4KLSAgICAgICAg ICAgICAgICByZXR1cm4gZ29Ub0JhY2tGb3J3YXJkSXRlbShpdGVtLCBBbGxvd1N0YWxlQ29udGVu dDo6Tm8pOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKFdlYkJhY2tGb3J3YXJkTGlz dEl0ZW0qIGl0ZW0gPSBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gZ29Ub0JhY2tGb3J3YXJkSXRlbShpdGVtKTsKICAgICAgICAgfQogICAg IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGI3YTk1ODk3 YjRlZWQ3M2IyODM4MDlhMzViOWJjZTllMzY3NTVhMjIuLmZkMDFlMThiZjEzMGE3NjJmMjJjMWI2 MDUyOTFhYmIzODYxNTBmMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKQEAgLTM1OCw4ICszNTgsNyBAQCBwdWJsaWM6CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlv bj4gZ29Gb3J3YXJkKCk7CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gZ29CYWNrKCk7CiAK LSAgICBlbnVtIGNsYXNzIEFsbG93U3RhbGVDb250ZW50IHsgTm8sIFllcyB9OwotICAgIFJlZlB0 cjxBUEk6Ok5hdmlnYXRpb24+IGdvVG9CYWNrRm9yd2FyZEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0 SXRlbSosIEFsbG93U3RhbGVDb250ZW50ID0gQWxsb3dTdGFsZUNvbnRlbnQ6Olllcyk7CisgICAg UmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gZ29Ub0JhY2tGb3J3YXJkSXRlbShXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtKik7CiAgICAgdm9pZCB0cnlSZXN0b3JlU2Nyb2xsUG9zaXRpb24oKTsKICAgICB2 b2lkIGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdChXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBhZGRl ZEl0ZW0sIFZlY3RvcjxSZWZQdHI8V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4+IHJlbW92ZWQpOwog ICAgIHZvaWQgd2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKHVpbnQ2NF90IGl0ZW1JRCwgY29u c3QgVXNlckRhdGEmKTsKQEAgLTExNjMsNyArMTE2Miw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lk IHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVh dHRhY2hUb1dlYlByb2Nlc3NGb3JSZWxvYWQoKTsKLSAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9u PiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qLCBB bGxvd1N0YWxlQ29udGVudCk7CisgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hU b1dlYlByb2Nlc3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKik7CiAKICAgICB2b2lk IHJlcXVlc3ROb3RpZmljYXRpb25QZXJtaXNzaW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlvbklELCBj b25zdCBTdHJpbmcmIG9yaWdpblN0cmluZyk7CiAgICAgdm9pZCBzaG93Tm90aWZpY2F0aW9uKGNv bnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29u VVJMLCBjb25zdCBTdHJpbmcmIHRhZywgY29uc3QgU3RyaW5nJiBsYW5nLCBjb25zdCBTdHJpbmcm IGRpciwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklE KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRl eCBiOGJiZWJiNDhmYmE5ZjZkNTgwMTFhMTRhZjE0Mzc5YmJkM2RlODE0Li4xMDg3M2RiNGJmNDNm OTAyZjE2N2NlYjA2ZTY0ODQ3MmMzOGRkNWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xMTYxLDcgKzExNjEsNyBAQCB2b2lkIFdlYlBh Z2U6OmdvQmFjayh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRl bUlEKQogICAgIG1fcGFnZS0+Z29Ub0l0ZW0oKml0ZW0sIEZyYW1lTG9hZFR5cGU6OkJhY2spOwog fQogCi12b2lkIFdlYlBhZ2U6OmdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgbmF2aWdhdGlv bklELCB1aW50NjRfdCBiYWNrRm9yd2FyZEl0ZW1JRCwgYm9vbCBhbGxvd1N0YWxlQ29udGVudCkK K3ZvaWQgV2ViUGFnZTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlEKQogewogICAgIFNlbmRTdG9wUmVzcG9uc2l2ZW5l c3NUaW1lciBzdG9wcGVyKHRoaXMpOwogCkBAIC0xMTc0LDcgKzExNzQsNyBAQCB2b2lkIFdlYlBh Z2U6OmdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgbmF2aWdhdGlvbklELCB1aW50NjRfdCBi YWNrRm9yd2FyZEl0ZQogICAgIGlmICghaXRlbS0+aXNJblBhZ2VDYWNoZSgpKQogICAgICAgICBt X3BlbmRpbmdOYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uSUQ7CiAKLSAgICBtX3BhZ2UtPmdvVG9J dGVtKCppdGVtLCBhbGxvd1N0YWxlQ29udGVudCA/IEZyYW1lTG9hZFR5cGU6OkluZGV4ZWRCYWNr Rm9yd2FyZCA6IEZyYW1lTG9hZFR5cGU6OlN0YW5kYXJkKTsKKyAgICBtX3BhZ2UtPmdvVG9JdGVt KCppdGVtLCBGcmFtZUxvYWRUeXBlOjpJbmRleGVkQmFja0ZvcndhcmQpOwogfQogCiB2b2lkIFdl YlBhZ2U6OnRyeVJlc3RvcmVTY3JvbGxQb3NpdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCBkZjQ4NDMxMTM3MWM5MmE0MTU5MjBkNDRlYTUx ODc4NWE4NTBiYjc3Li5lNjRlNmMxNDQyMzlhOGUzMTY1MzFmOTNhODg5NzIyZTYwMWRmZjBmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTkyNiw3 ICs5MjYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVsb2FkKHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgYm9vbCByZWxvYWRGcm9tT3JpZ2luLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUm KTsKICAgICB2b2lkIGdvRm9yd2FyZCh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQ2NF90KTsK ICAgICB2b2lkIGdvQmFjayh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQ2NF90KTsKLSAgICB2 b2lkIGdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgbmF2aWdhdGlvbklELCB1aW50NjRfdCwg Ym9vbCBhbGxvd1N0YWxlQ29udGVudCk7CisgICAgdm9pZCBnb1RvQmFja0ZvcndhcmRJdGVtKHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgdWludDY0X3QpOwogICAgIHZvaWQgdHJ5UmVzdG9yZVNjcm9s bFBvc2l0aW9uKCk7CiAgICAgdm9pZCBzZXRJbml0aWFsRm9jdXMoYm9vbCBmb3J3YXJkLCBib29s IGlzS2V5Ym9hcmRFdmVudFZhbGlkLCBjb25zdCBXZWJLZXlib2FyZEV2ZW50Jik7CiAgICAgdm9p ZCBzZXRXaW5kb3dSZXNpemVyU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5p biBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmlu CmluZGV4IGIzYTUzYjRmODliZDQ5M2ZmYTY4N2M5ZDNmYjAwZjYxMDhiMjFiNzguLjdiZjk5ZmNj NTAyYjNhN2MzNjkxNjhkY2Q5ZjQ1NDE4YjEzYmNhYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC0xMTksNyAr MTE5LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAKICAgICBHb0Jh Y2sodWludDY0X3QgbmF2aWdhdGlvbklELCB1aW50NjRfdCBiYWNrRm9yd2FyZEl0ZW1JRCkKICAg ICBHb0ZvcndhcmQodWludDY0X3QgbmF2aWdhdGlvbklELCB1aW50NjRfdCBiYWNrRm9yd2FyZEl0 ZW1JRCkKLSAgICBHb1RvQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgdWlu dDY0X3QgYmFja0ZvcndhcmRJdGVtSUQsIGJvb2wgYWxsb3dTdGFsZUNvbnRlbnQpCisgICAgR29U b0JhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQ2NF90IGJhY2tGb3J3 YXJkSXRlbUlEKQogICAgIFRyeVJlc3RvcmVTY3JvbGxQb3NpdGlvbigpCiAKICAgICBMb2FkVVJM SW5GcmFtZShTdHJpbmcgdXJsLCB1aW50NjRfdCBmcmFtZUlEKQo= 249133 2015-03-20 13:34:28 -0700 2015-03-20 15:45:53 -0700 Patch bug-142916-20150320133355.patch text/plain 10412 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDkwYTVjZDI5OWM4Yzdi M2Q5NmFiYWQyZWRhY2Y2ZDRlMmNjZTA4ZC4uYTAyZjZiODM3ZGZjMzMxYzcwYjJlYjM1Nzg2Yjc5 ZjI0YTVlMTc3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE1LTAzLTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gQWxsb3cgc3RhbGUg Y29udGVudCB3aGVuIHJlc3RvcmluZyB0aGUgYnJvd3NlcidzIHNlc3Npb24gc3RhdGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjkxNgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMjAyNDM0OTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgc3RhbGUgY29udGVudCB3aGVuIHJlc3RvcmluZyB0 aGUgYnJvd3NlcidzIHNlc3Npb24gc3RhdGUKKyAgICAgICAgKHJlc3RvcmluZyBhbGwgdGFicyBm cm9tIHByZXZpb3VzIHNlc3Npb24pLCBlLmcuCisgICAgICAgIC0gVmlhIEhpc3RvcnkgPiBSZW9w ZW4gQWxsIHdpbmRvd3MgZnJvbSBwcmV2aW91cyBzZXNzaW9uIG9uIFNhZmFyaQorICAgICAgICAt IEhhcHBlbnMgb24gc3RhcnR1cCBmb3IgTW9iaWxlU2FmYXJpCisKKyAgICAgICAgSSBoYXZlIHZl cmlmaWVkIHRoYXQgdXNpbmcgIk9wZW4gaW4gdGFicyIgb24gYSBib29rbWFya3MgZm9sZGVyCisg ICAgICAgIHN0aWxsIGRvZXMgZnJlc2ggbG9hZHMgKHJkYXI6Ly9wcm9ibGVtLzgxMzEzNTUpIGFz IGl0IGlzIG5vdCB1c2luZworICAgICAgICB0aGUgcmVzdG9yZUZyb21TZXNzaW9uU3RhdGUoKSBj b2RlIHBhdGguCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc0ZvclJlbG9hZCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRo SXRlbSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z29Gb3J3YXJkKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpnb0JhY2spOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnb1RvQmFja0ZvcndhcmRJdGVtKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAyMDE1LTAzLTIwICBHeXV5b3VuZyBLaW0gIDxn eXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0NNYWtlXSBSZW1vdmUgZHVwbGlj YXRlZCBjbWFrZSBmdW5jdGlvbiBjYWxscyBpbiBXZWJLaXQyL0NNYWtlTGlzdHMudHh0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDRiZjI5YTc1MjY4Yjhi YzMzYzMxMjIwYmFiNzQ1ZTk1N2NiN2UwMDguLmU4NTdkN2NjYjZiOGRhOTVlZWRjNWU5ODMwMzUw OWU3NGViZGJjNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CkBAIC02NTYsMTMgKzY1NiwxMyBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJv eHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzRm9yUmVsb2FkKCkKICAgICBhdXRvIG5hdmlnYXRpb24g PSBtX25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRlUmVsb2FkTmF2aWdhdGlvbigpOwogCiAgICAgLy8g V2UgYWxsb3cgc3RhbGUgY29udGVudCB3aGVuIHJlbG9hZGluZyBhIFdlYlByb2Nlc3MgdGhhdCdz IGJlZW4ga2lsbGVkIG9yIGNyYXNoZWQuCi0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCBt X2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKS0+aXRlbUlEKCksIHRydWUgLyogYWxsb3dT dGFsZSAqLyksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIG1fYmFj a0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtSUQoKSksIG1fcGFnZUlEKTsKICAgICBt X3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKIAogICAgIHJldHVybiBX VEY6Om1vdmUobmF2aWdhdGlvbik7CiB9CiAKLVJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBh Z2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyZExpc3RJ dGVtKiBpdGVtLCBBbGxvd1N0YWxlQ29udGVudCBhbGxvd1N0YWxlQ29udGVudCkKK1JlZlB0cjxB UEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRl bShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtKQogewogICAgIGlmIChtX2lzQ2xvc2VkKQog ICAgICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTY3OCw3ICs2NzgsNyBAQCBSZWZQdHI8QVBJOjpO YXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oV2Vi QmFja0ZvcndhcgogCiAgICAgYXV0byBuYXZpZ2F0aW9uID0gbV9uYXZpZ2F0aW9uU3RhdGUtPmNy ZWF0ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbigpOwogCi0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5hdmlnYXRpb24tPm5hdmlnYXRpb25J RCgpLCBpdGVtLT5pdGVtSUQoKSwgYWxsb3dTdGFsZUNvbnRlbnQgPT0gQWxsb3dTdGFsZUNvbnRl bnQ6OlllcyksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIGl0ZW0t Pml0ZW1JRCgpKSwgbV9wYWdlSUQpOwogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1l cigpLT5zdGFydCgpOwogCiAgICAgcmV0dXJuIFdURjo6bW92ZShuYXZpZ2F0aW9uKTsKQEAgLTEw MjYsNyArMTAyNiw3IEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6Z29G b3J3YXJkKCkKICAgICBtX3BhZ2VMb2FkU3RhdGUuc2V0UGVuZGluZ0FQSVJlcXVlc3RVUkwodHJh bnNhY3Rpb24sIGZvcndhcmRJdGVtLT51cmwoKSk7CiAKICAgICBpZiAoIWlzVmFsaWQoKSkKLSAg ICAgICAgcmV0dXJuIHJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oZm9yd2FyZEl0ZW0sIEFs bG93U3RhbGVDb250ZW50OjpZZXMpOworICAgICAgICByZXR1cm4gcmVhdHRhY2hUb1dlYlByb2Nl c3NXaXRoSXRlbShmb3J3YXJkSXRlbSk7CiAKICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBu YXZpZ2F0aW9uOwogICAgIGlmICghbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0 ZW1Jc0luU2FtZURvY3VtZW50KCpmb3J3YXJkSXRlbSkpCkBAIC0xMDQ5LDcgKzEwNDksNyBAQCBS ZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmdvQmFjaygpCiAgICAgbV9wYWdl TG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0aW9uLCBiYWNrSXRlbS0+ dXJsKCkpOwogCiAgICAgaWYgKCFpc1ZhbGlkKCkpCi0gICAgICAgIHJldHVybiByZWF0dGFjaFRv V2ViUHJvY2Vzc1dpdGhJdGVtKGJhY2tJdGVtLCBBbGxvd1N0YWxlQ29udGVudDo6WWVzKTsKKyAg ICAgICAgcmV0dXJuIHJlYXR0YWNoVG9XZWJQcm9jZXNzV2l0aEl0ZW0oYmFja0l0ZW0pOwogCiAg ICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAgICBpZiAoIW1fYmFja0Zv cndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5pdGVtSXNJblNhbWVEb2N1bWVudCgqYmFja0l0ZW0p KQpAQCAtMTA2MSwxMCArMTA2MSwxMCBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdl UHJveHk6OmdvQmFjaygpCiAgICAgcmV0dXJuIG5hdmlnYXRpb247CiB9CiAKLVJlZlB0cjxBUEk6 Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRlbShXZWJCYWNrRm9y d2FyZExpc3RJdGVtKiBpdGVtLCBBbGxvd1N0YWxlQ29udGVudCBhbGxvd1N0YWxlQ29udGVudCkK K1JlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6Z29Ub0JhY2tGb3J3YXJkSXRl bShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtKQogewogICAgIGlmICghaXNWYWxpZCgpKQot ICAgICAgICByZXR1cm4gcmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbShpdGVtLCBhbGxvd1N0 YWxlQ29udGVudCk7CisgICAgICAgIHJldHVybiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVt KGl0ZW0pOwogCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2Fj dGlvbigpOwogCkBAIC0xMDc0LDcgKzEwNzQsNyBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBX ZWJQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbQog ICAgIGlmICghbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCktPml0ZW1Jc0luU2FtZURv Y3VtZW50KCppdGVtKSkKICAgICAgICAgbmF2aWdhdGlvbiA9IG1fbmF2aWdhdGlvblN0YXRlLT5j cmVhdGVCYWNrRm9yd2FyZE5hdmlnYXRpb24oKTsKIAotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0aW9uID8gbmF2aWdhdGlv bi0+bmF2aWdhdGlvbklEKCkgOiAwLCBpdGVtLT5pdGVtSUQoKSwgYWxsb3dTdGFsZUNvbnRlbnQg PT0gQWxsb3dTdGFsZUNvbnRlbnQ6OlllcyksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdhdGlvbiA/IG5h dmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwgaXRlbS0+aXRlbUlEKCkpLCBtX3BhZ2VJRCk7 CiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiAKICAgICBy ZXR1cm4gbmF2aWdhdGlvbjsKQEAgLTIwOTUsMTAgKzIwOTUsOCBAQCBSZWZQdHI8QVBJOjpOYXZp Z2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKFNlc3Npb25TdGF0 ZSBzZXNzaQogCiAgICAgICAgIGlmIChoYXNCYWNrRm9yd2FyZExpc3QpIHsKICAgICAgICAgICAg IC8vIEZJWE1FOiBEbyB3ZSBoYXZlIHRvIG51bGwgY2hlY2sgdGhlIGJhY2sgZm9yd2FyZCBsaXN0 IGl0ZW0gaGVyZT8KLSAgICAgICAgICAgIGlmIChXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVt ID0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkpIHsKLSAgICAgICAgICAgICAgICAv LyBXZSBmb3JiaWQgc3RhbGUgY29udGVudCB3aGVuIHJlc3RvcmluZyB0aGUgc2Vzc2lvbiBzdGF0 ZSBhbmQgZG8gYSBmcmVzaCBsb2FkIChyZGFyOi8vcHJvYmxlbS84MTMxMzU1KS4KLSAgICAgICAg ICAgICAgICByZXR1cm4gZ29Ub0JhY2tGb3J3YXJkSXRlbShpdGVtLCBBbGxvd1N0YWxlQ29udGVu dDo6Tm8pOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKFdlYkJhY2tGb3J3YXJkTGlz dEl0ZW0qIGl0ZW0gPSBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gZ29Ub0JhY2tGb3J3YXJkSXRlbShpdGVtKTsKICAgICAgICAgfQogICAg IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGI3YTk1ODk3 YjRlZWQ3M2IyODM4MDlhMzViOWJjZTllMzY3NTVhMjIuLmZkMDFlMThiZjEzMGE3NjJmMjJjMWI2 MDUyOTFhYmIzODYxNTBmMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKQEAgLTM1OCw4ICszNTgsNyBAQCBwdWJsaWM6CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlv bj4gZ29Gb3J3YXJkKCk7CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gZ29CYWNrKCk7CiAK LSAgICBlbnVtIGNsYXNzIEFsbG93U3RhbGVDb250ZW50IHsgTm8sIFllcyB9OwotICAgIFJlZlB0 cjxBUEk6Ok5hdmlnYXRpb24+IGdvVG9CYWNrRm9yd2FyZEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0 SXRlbSosIEFsbG93U3RhbGVDb250ZW50ID0gQWxsb3dTdGFsZUNvbnRlbnQ6Olllcyk7CisgICAg UmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gZ29Ub0JhY2tGb3J3YXJkSXRlbShXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtKik7CiAgICAgdm9pZCB0cnlSZXN0b3JlU2Nyb2xsUG9zaXRpb24oKTsKICAgICB2 b2lkIGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdChXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBhZGRl ZEl0ZW0sIFZlY3RvcjxSZWZQdHI8V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4+IHJlbW92ZWQpOwog ICAgIHZvaWQgd2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKHVpbnQ2NF90IGl0ZW1JRCwgY29u c3QgVXNlckRhdGEmKTsKQEAgLTExNjMsNyArMTE2Miw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lk IHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVh dHRhY2hUb1dlYlByb2Nlc3NGb3JSZWxvYWQoKTsKLSAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9u PiByZWF0dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qLCBB bGxvd1N0YWxlQ29udGVudCk7CisgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gcmVhdHRhY2hU b1dlYlByb2Nlc3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKik7CiAKICAgICB2b2lk IHJlcXVlc3ROb3RpZmljYXRpb25QZXJtaXNzaW9uKHVpbnQ2NF90IG5vdGlmaWNhdGlvbklELCBj b25zdCBTdHJpbmcmIG9yaWdpblN0cmluZyk7CiAgICAgdm9pZCBzaG93Tm90aWZpY2F0aW9uKGNv bnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29u VVJMLCBjb25zdCBTdHJpbmcmIHRhZywgY29uc3QgU3RyaW5nJiBsYW5nLCBjb25zdCBTdHJpbmcm IGRpciwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklE KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRl eCBiOGJiZWJiNDhmYmE5ZjZkNTgwMTFhMTRhZjE0Mzc5YmJkM2RlODE0Li4xMDg3M2RiNGJmNDNm OTAyZjE2N2NlYjA2ZTY0ODQ3MmMzOGRkNWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xMTYxLDcgKzExNjEsNyBAQCB2b2lkIFdlYlBh Z2U6OmdvQmFjayh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRl bUlEKQogICAgIG1fcGFnZS0+Z29Ub0l0ZW0oKml0ZW0sIEZyYW1lTG9hZFR5cGU6OkJhY2spOwog fQogCi12b2lkIFdlYlBhZ2U6OmdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgbmF2aWdhdGlv bklELCB1aW50NjRfdCBiYWNrRm9yd2FyZEl0ZW1JRCwgYm9vbCBhbGxvd1N0YWxlQ29udGVudCkK K3ZvaWQgV2ViUGFnZTo6Z29Ub0JhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IHVpbnQ2NF90IGJhY2tGb3J3YXJkSXRlbUlEKQogewogICAgIFNlbmRTdG9wUmVzcG9uc2l2ZW5l c3NUaW1lciBzdG9wcGVyKHRoaXMpOwogCkBAIC0xMTc0LDcgKzExNzQsNyBAQCB2b2lkIFdlYlBh Z2U6OmdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgbmF2aWdhdGlvbklELCB1aW50NjRfdCBi YWNrRm9yd2FyZEl0ZQogICAgIGlmICghaXRlbS0+aXNJblBhZ2VDYWNoZSgpKQogICAgICAgICBt X3BlbmRpbmdOYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uSUQ7CiAKLSAgICBtX3BhZ2UtPmdvVG9J dGVtKCppdGVtLCBhbGxvd1N0YWxlQ29udGVudCA/IEZyYW1lTG9hZFR5cGU6OkluZGV4ZWRCYWNr Rm9yd2FyZCA6IEZyYW1lTG9hZFR5cGU6OlN0YW5kYXJkKTsKKyAgICBtX3BhZ2UtPmdvVG9JdGVt KCppdGVtLCBGcmFtZUxvYWRUeXBlOjpJbmRleGVkQmFja0ZvcndhcmQpOwogfQogCiB2b2lkIFdl YlBhZ2U6OnRyeVJlc3RvcmVTY3JvbGxQb3NpdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCBkZjQ4NDMxMTM3MWM5MmE0MTU5MjBkNDRlYTUx ODc4NWE4NTBiYjc3Li5lNjRlNmMxNDQyMzlhOGUzMTY1MzFmOTNhODg5NzIyZTYwMWRmZjBmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTkyNiw3 ICs5MjYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVsb2FkKHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgYm9vbCByZWxvYWRGcm9tT3JpZ2luLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUm KTsKICAgICB2b2lkIGdvRm9yd2FyZCh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQ2NF90KTsK ICAgICB2b2lkIGdvQmFjayh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQ2NF90KTsKLSAgICB2 b2lkIGdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgbmF2aWdhdGlvbklELCB1aW50NjRfdCwg Ym9vbCBhbGxvd1N0YWxlQ29udGVudCk7CisgICAgdm9pZCBnb1RvQmFja0ZvcndhcmRJdGVtKHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgdWludDY0X3QpOwogICAgIHZvaWQgdHJ5UmVzdG9yZVNjcm9s bFBvc2l0aW9uKCk7CiAgICAgdm9pZCBzZXRJbml0aWFsRm9jdXMoYm9vbCBmb3J3YXJkLCBib29s IGlzS2V5Ym9hcmRFdmVudFZhbGlkLCBjb25zdCBXZWJLZXlib2FyZEV2ZW50Jik7CiAgICAgdm9p ZCBzZXRXaW5kb3dSZXNpemVyU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5p biBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmlu CmluZGV4IGIzYTUzYjRmODliZDQ5M2ZmYTY4N2M5ZDNmYjAwZjYxMDhiMjFiNzguLjdiZjk5ZmNj NTAyYjNhN2MzNjkxNjhkY2Q5ZjQ1NDE4YjEzYmNhYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC0xMTksNyAr MTE5LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAKICAgICBHb0Jh Y2sodWludDY0X3QgbmF2aWdhdGlvbklELCB1aW50NjRfdCBiYWNrRm9yd2FyZEl0ZW1JRCkKICAg ICBHb0ZvcndhcmQodWludDY0X3QgbmF2aWdhdGlvbklELCB1aW50NjRfdCBiYWNrRm9yd2FyZEl0 ZW1JRCkKLSAgICBHb1RvQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgdWlu dDY0X3QgYmFja0ZvcndhcmRJdGVtSUQsIGJvb2wgYWxsb3dTdGFsZUNvbnRlbnQpCisgICAgR29U b0JhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQ2NF90IGJhY2tGb3J3 YXJkSXRlbUlEKQogICAgIFRyeVJlc3RvcmVTY3JvbGxQb3NpdGlvbigpCiAKICAgICBMb2FkVVJM SW5GcmFtZShTdHJpbmcgdXJsLCB1aW50NjRfdCBmcmFtZUlEKQo=