30224 2009-10-08 11:11:58 -0700 Fragment scrolls initiated by javascript should not add a history item 2010-08-18 08:31:38 -0700 1 1 1 Unclassified WebKit History 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 phanna steveblock abarth android-webkit-unforking beidson benm darin eric mihaip mitz steveblock webkit.review.bot oldest_to_newest 153449 0 phanna 2009-10-08 11:11:58 -0700 Currently, going to m.cnn.com will trigger a javascript location change to m.cnn.com/#___1__ adding a history item for both m.cnn.com and the fragment scroll. Neither Chrome nor Firefox does this (Chrome happens to use its own history list rather than WebKit's). I believe the fix should be around FrameLoader.cpp:3484. An additional check for a user initiated click would avoid adding the extra history item. 176434 1 45757 steveblock 2010-01-03 11:31:04 -0800 Created attachment 45757 Patch 1 for Bug 30224 176435 2 webkit.review.bot 2010-01-03 11:36:15 -0800 style-queue ran check-webkit-style on attachment 45757 without any errors. 176438 3 45757 abarth 2010-01-03 11:54:30 -0800 Comment on attachment 45757 Patch 1 for Bug 30224 Behavioral changes require LayoutTests. We're especially strict about requiring tests for changes to FrameLoader because FrameLoader is super complicated and poorly tested. 177110 4 45880 steveblock 2010-01-05 04:33:10 -0800 Created attachment 45880 Patch 2 for Bug 30224 I've added a test to check that fragment scrolls initiated from script do not cause additions to the back/forward list. To add a test for the reverse - that fragment scrolls initiated by the user do cause additions to the back/forward list - would require faking a user action. Is this possible with the layout test controller? 177111 5 webkit.review.bot 2010-01-05 04:37:47 -0800 style-queue ran check-webkit-style on attachment 45880 without any errors. 177163 6 darin 2010-01-05 08:32:34 -0800 What does IE do in this case, by the way? 177393 7 eric 2010-01-05 14:21:18 -0800 Looks sane to me. But Adam or Brady are better reviewer choices. 178217 8 steveblock 2010-01-07 09:24:06 -0800 m.cnn.com no longer requires this fix and the proposed change would cause WebKit to behave differently from FF/Chrome/IE. Abandoning the change. 178354 9 beidson 2010-01-07 13:30:30 -0800 Cleared the review flag based on last comment. 195669 10 phanna 2010-03-03 11:04:53 -0800 This is still an issue. There is a new site: http://app.showtime-app.com/ that redirects to an anchor and adds a history item. Trying going there in Safari and you will not be able to back out of the page. The patch is not perfect. For a page with both a meta redirect and a javascript redirect, one of the redirects is added. I would love to hear some ideas about how best to fix the issue. 195673 11 darin 2010-03-03 11:06:44 -0800 Same question as before. How does this site work in other browsers? What’s the difference from other browsers that makes WebKit-based browsers like Safari fail? The general direction is that we want to get closer to the HTML5 standard and to other browsers, rather than further away. And we want to make changes that are unlikely to break existing sites, even ones that work for different reasons in WebKit-based browsers than in others. 245925 12 benm 2010-07-02 09:01:03 -0700 I'm seeing a very similar issue to this - a redirect is being added to the history list: - Change your user agent in Safari to Mobile Safari - Navigate to Wikipedia.org, click through to an article - Now try to navigate back - you will be unable to leave Wikipedia as back takes you to a page that performs a redirect. It seems that Firefox adds a history entry for the page that has the redirect, but seems to skip it for back navigation. Does anyone have any ideas on how to fix this? 246035 13 darin 2010-07-02 12:39:06 -0700 Similar issue, but not same. Probably needs its own bug report. 246965 14 benm 2010-07-06 02:34:14 -0700 (In reply to comment #13) > Similar issue, but not same. Probably needs its own bug report. Filed https://bugs.webkit.org/show_bug.cgi?id=41670. 257712 15 mihaip 2010-07-29 09:11:57 -0700 Darin, since you had opinions on how to fix this, you may want to look at the patch on bug 42861, since it fixes this and bug 41670. There's also comments on the bug about how other browsers handle similar scenarios (as best as I can tell, my patch brings WebKit closer to them). 266118 16 mihaip 2010-08-18 08:31:38 -0700 (In reply to comment #10) > This is still an issue. There is a new site: http://app.showtime-app.com/ that redirects to an anchor and adds a history item. Trying going there in Safari and you will not be able to back out of the page. http://trac.webkit.org/changeset/65340 from bug 42861 fixes this (verified in the most recent nightly build). 45757 2010-01-03 11:31:04 -0800 2010-01-05 04:33:10 -0800 Patch 1 for Bug 30224 fragmentScrolls.txt text/plain 4324 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjY4OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDEtMDMgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFByZXZlbnRzIGhpc3RvcnkgaXRlbXMgYmVpbmcgYWRkZWQgd2hlbiBmcmFnbWVudCBzY3JvbGxz IGFyZSBub3QKKyAgICAgICAgdXNlci1pbml0aWF0ZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDIyNAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4K KworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6IE1vZGlmaWVkLgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWRJblNhbWVEb2N1bWVudCk6IE5vdyB0YWtlcyBhZGRp dGlvbmFsIHBhcmFtZXRlciB0byBzdXBwcmVzcyBhZGRpdGlvbmFsIHRvIGhpc3RvcnkuCisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y29udGludWVGcmFnbWVudFNjcm9sbEFmdGVyTmF2 aWdhdGlvblBvbGljeSk6IFVwZGF0ZWQgY2FsbCB0byBsb2FkSW5TYW1lRG9jdW1lbnQuCisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bmF2aWdhdGVXaXRoaW5Eb2N1bWVudCk6IFVwZGF0 ZWQgY2FsbCB0byBsb2FkSW5TYW1lRG9jdW1lbnQuCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9h ZGVyLmg6IE1vZGlmaWVkLiBVcGRhdGVkIHNpZ25hdHVyZSBvZiBsb2FkSW5TYW1lRG9jdW1lbnQu CisKIDIwMTAtMDEtMDMgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCkluZGV4OiBXZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCShyZXZpc2lvbiA1MjY4OSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTcwOCw3ICsxNzA4LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c2V0 Rmlyc3RQYXJ0eUZvckNvb2tpZQogCiAvLyBUaGlzIGRvZXMgdGhlIHNhbWUga2luZCBvZiB3b3Jr IHRoYXQgZGlkT3BlblVSTCBkb2VzLCBleGNlcHQgaXQgcmVsaWVzIG9uIHRoZSBmYWN0CiAvLyB0 aGF0IGEgaGlnaGVyIGxldmVsIGFscmVhZHkgY2hlY2tlZCB0aGF0IHRoZSBVUkxzIG1hdGNoIGFu ZCB0aGUgc2Nyb2xsaW5nIGlzIHRoZSByaWdodCB0aGluZyB0byBkby4KLXZvaWQgRnJhbWVMb2Fk ZXI6OmxvYWRJblNhbWVEb2N1bWVudChjb25zdCBLVVJMJiB1cmwsIFNlcmlhbGl6ZWRTY3JpcHRW YWx1ZSogc3RhdGVPYmplY3QsIGJvb2wgaXNOZXdOYXZpZ2F0aW9uKQordm9pZCBGcmFtZUxvYWRl cjo6bG9hZEluU2FtZURvY3VtZW50KGNvbnN0IEtVUkwmIHVybCwgU2VyaWFsaXplZFNjcmlwdFZh bHVlKiBzdGF0ZU9iamVjdCwgYm9vbCBpc05ld05hdmlnYXRpb24sIGJvb2wgc3VwcHJlc3NBZGRU b0hpc3RvcnkpCiB7CiAgICAgLy8gSWYgd2UgaGF2ZSBhIHN0YXRlIG9iamVjdCwgd2UgY2Fubm90 IGFsc28gYmUgYSBuZXcgbmF2aWdhdGlvbi4KICAgICBBU1NFUlQoIXN0YXRlT2JqZWN0IHx8IChz dGF0ZU9iamVjdCAmJiAhaXNOZXdOYXZpZ2F0aW9uKSk7CkBAIC0xNzE2LDcgKzE3MTYsNyBAQCB2 b2lkIEZyYW1lTG9hZGVyOjpsb2FkSW5TYW1lRG9jdW1lbnQoY29uCiAgICAgLy8gVXBkYXRlIHRo ZSBkYXRhIHNvdXJjZSdzIHJlcXVlc3Qgd2l0aCB0aGUgbmV3IFVSTCB0byBmYWtlIHRoZSBVUkwg Y2hhbmdlCiAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2V0VVJMKHVybCk7CiAgICAgZG9jdW1l bnRMb2FkZXIoKS0+cmVwbGFjZVJlcXVlc3RVUkxGb3JTYW1lRG9jdW1lbnROYXZpZ2F0aW9uKHVy bCk7Ci0gICAgaWYgKGlzTmV3TmF2aWdhdGlvbiAmJiAhc2hvdWxkVHJlYXRVUkxBc1NhbWVBc0N1 cnJlbnQodXJsKSAmJiAhc3RhdGVPYmplY3QpIHsKKyAgICBpZiAoaXNOZXdOYXZpZ2F0aW9uICYm ICFzaG91bGRUcmVhdFVSTEFzU2FtZUFzQ3VycmVudCh1cmwpICYmICFzdGF0ZU9iamVjdCAmJiAh c3VwcHJlc3NBZGRUb0hpc3RvcnkpIHsKICAgICAgICAgLy8gTkI6IG11c3QgaGFwcGVuIGFmdGVy IHJlcGxhY2VSZXF1ZXN0VVJMRm9yU2FtZURvY3VtZW50TmF2aWdhdGlvbigpLCBzaW5jZSB3ZSBh ZGQgCiAgICAgICAgIC8vIGJhc2VkIG9uIHRoZSBjdXJyZW50IHJlcXVlc3QuIE11c3QgYWxzbyBo YXBwZW4gYmVmb3JlIHdlIG9wZW5VUkwgYW5kIGRpc3BsYWNlIHRoZSAKICAgICAgICAgLy8gc2Ny b2xsIHBvc2l0aW9uLCBzaW5jZSBhZGRpbmcgdGhlIEJGIGl0ZW0gd2lsbCBzYXZlIGF3YXkgc2Ny b2xsIHN0YXRlLgpAQCAtMzM4OSw3ICszMzg5LDkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29udGlu dWVGcmFnbWVudFNjcm9sbAogICAgICAgICByZXR1cm47CiAKICAgICBib29sIGlzUmVkaXJlY3Qg PSBtX3F1aWNrUmVkaXJlY3RDb21pbmcgfHwgcG9saWN5Q2hlY2tlcigpLT5sb2FkVHlwZSgpID09 IEZyYW1lTG9hZFR5cGVSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3Q7ICAgIAotICAg IGxvYWRJblNhbWVEb2N1bWVudChyZXF1ZXN0LnVybCgpLCAwLCAhaXNSZWRpcmVjdCk7CisgICAg Ly8gRG8gbm90IGFkZCBoaXN0b3J5IGl0ZW1zIGZvciBhIGZyYWdtZW50IHNjcm9sbCBub3QgaW5p dGlhdGVkIGJ5IHRoZSB1c2VyLgorICAgIGJvb2wgaXNVc2VySW5pdGlhdGVkID0gaXNQcm9jZXNz aW5nVXNlckdlc3R1cmUoKTsKKyAgICBsb2FkSW5TYW1lRG9jdW1lbnQocmVxdWVzdC51cmwoKSwg MCwgIWlzUmVkaXJlY3QsICFpc1VzZXJJbml0aWF0ZWQpOwogfQogCiBib29sIEZyYW1lTG9hZGVy OjpzaG91bGRTY3JvbGxUb0FuY2hvcihib29sIGlzRm9ybVN1Ym1pc3Npb24sIEZyYW1lTG9hZFR5 cGUgbG9hZFR5cGUsIGNvbnN0IEtVUkwmIHVybCkKQEAgLTM2NzcsNyArMzY3OSw3IEBAIHZvaWQg RnJhbWVMb2FkZXI6Om5hdmlnYXRlV2l0aGluRG9jdW1lbnQKICAgICBoaXN0b3J5KCktPnNldEN1 cnJlbnRJdGVtKGl0ZW0pOwogICAgICAgICAKICAgICAvLyBsb2FkSW5TYW1lRG9jdW1lbnQoKSBh Y3R1YWxseSBjaGFuZ2VzIHRoZSBVUkwgYW5kIG5vdGlmaWVzIGxvYWQgZGVsZWdhdGVzIG9mIGEg ImZha2UiIGxvYWQKLSAgICBsb2FkSW5TYW1lRG9jdW1lbnQoaXRlbS0+dXJsKCksIGl0ZW0tPnN0 YXRlT2JqZWN0KCksIGZhbHNlKTsKKyAgICBsb2FkSW5TYW1lRG9jdW1lbnQoaXRlbS0+dXJsKCks IGl0ZW0tPnN0YXRlT2JqZWN0KCksIGZhbHNlLCBmYWxzZSk7CiAKICAgICAvLyBSZXN0b3JlIHVz ZXIgdmlldyBzdGF0ZSBmcm9tIHRoZSBjdXJyZW50IGhpc3RvcnkgaXRlbSBoZXJlIHNpbmNlIHdl IGRvbid0IGRvIGEgbm9ybWFsIGxvYWQuCiAgICAgLy8gRXZlbiB0aG91Z2ggd2UganVzdCBtYW51 YWxseSBzZXQgdGhlIGN1cnJlbnQgaGlzdG9yeSBpdGVtLCB0aGlzIEFTU0VSVCB2ZXJpZmllcyBu b3RoaW5nIApJbmRleDogV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCShyZXZpc2lvbiA1MjY4OSkKKysrIFdlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyOCw3ICs0MjgsNyBA QCBwcml2YXRlOgogCiAgICAgRnJhbWUqIGxvYWRTdWJmcmFtZShIVE1MRnJhbWVPd25lckVsZW1l bnQqLCBjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHJlZmVy cmVyKTsKIAotICAgIHZvaWQgbG9hZEluU2FtZURvY3VtZW50KGNvbnN0IEtVUkwmLCBTZXJpYWxp emVkU2NyaXB0VmFsdWUqIHN0YXRlT2JqZWN0LCBib29sIGlzTmV3TmF2aWdhdGlvbik7CisgICAg dm9pZCBsb2FkSW5TYW1lRG9jdW1lbnQoY29uc3QgS1VSTCYsIFNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZSogc3RhdGVPYmplY3QsIGJvb2wgaXNOZXdOYXZpZ2F0aW9uLCBib29sIHN1cHByZXNzQWRkVG9I aXN0b3J5KTsKIAogICAgIHZvaWQgcHJvdmlzaW9uYWxMb2FkU3RhcnRlZCgpOwogCg== 45880 2010-01-05 04:33:10 -0800 2010-06-10 21:07:59 -0700 Patch 2 for Bug 30224 fragmentScrolls2.txt text/plain 6768 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1Mjc5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDEtMDUgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFByZXZlbnRzIGhpc3RvcnkgaXRlbXMgYmVpbmcgYWRkZWQgd2hlbiBmcmFnbWVudCBzY3JvbGxz IGFyZSBub3QKKyAgICAgICAgdXNlci1pbml0aWF0ZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDIyNAorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVz dHMvbmF2aWdhdGlvbi9zY3JpcHQtaW5pdGlhdGVkLWZyYWdtZW50LW5hdmlnYXRpb24uaHRtbAor CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDogTW9kaWZpZWQuCisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZEluU2FtZURvY3VtZW50KTogTm93IHRha2VzIGFkZGl0 aW9uYWwgcGFyYW1ldGVyIHRvIHN1cHByZXNzIGFkZGl0aW9uYWwgdG8gaGlzdG9yeS4KKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb250aW51ZUZyYWdtZW50U2Nyb2xsQWZ0ZXJOYXZp Z2F0aW9uUG9saWN5KTogVXBkYXRlZCBjYWxsIHRvIGxvYWRJblNhbWVEb2N1bWVudC4KKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpuYXZpZ2F0ZVdpdGhpbkRvY3VtZW50KTogVXBkYXRl ZCBjYWxsIHRvIGxvYWRJblNhbWVEb2N1bWVudC4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2Fk ZXIuaDogTW9kaWZpZWQuIFVwZGF0ZWQgc2lnbmF0dXJlIG9mIGxvYWRJblNhbWVEb2N1bWVudC4K KwogMjAxMC0wMS0wNSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCB0cml2aWFsIFN5bWJpYW4gYnVpbGQgZml4CkluZGV4OiBX ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiA1MjY4OSkKKysrIFdlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcwOCw3ICsxNzA4LDcgQEAgdm9pZCBG cmFtZUxvYWRlcjo6c2V0Rmlyc3RQYXJ0eUZvckNvb2tpZQogCiAvLyBUaGlzIGRvZXMgdGhlIHNh bWUga2luZCBvZiB3b3JrIHRoYXQgZGlkT3BlblVSTCBkb2VzLCBleGNlcHQgaXQgcmVsaWVzIG9u IHRoZSBmYWN0CiAvLyB0aGF0IGEgaGlnaGVyIGxldmVsIGFscmVhZHkgY2hlY2tlZCB0aGF0IHRo ZSBVUkxzIG1hdGNoIGFuZCB0aGUgc2Nyb2xsaW5nIGlzIHRoZSByaWdodCB0aGluZyB0byBkby4K LXZvaWQgRnJhbWVMb2FkZXI6OmxvYWRJblNhbWVEb2N1bWVudChjb25zdCBLVVJMJiB1cmwsIFNl cmlhbGl6ZWRTY3JpcHRWYWx1ZSogc3RhdGVPYmplY3QsIGJvb2wgaXNOZXdOYXZpZ2F0aW9uKQor dm9pZCBGcmFtZUxvYWRlcjo6bG9hZEluU2FtZURvY3VtZW50KGNvbnN0IEtVUkwmIHVybCwgU2Vy aWFsaXplZFNjcmlwdFZhbHVlKiBzdGF0ZU9iamVjdCwgYm9vbCBpc05ld05hdmlnYXRpb24sIGJv b2wgc3VwcHJlc3NBZGRUb0hpc3RvcnkpCiB7CiAgICAgLy8gSWYgd2UgaGF2ZSBhIHN0YXRlIG9i amVjdCwgd2UgY2Fubm90IGFsc28gYmUgYSBuZXcgbmF2aWdhdGlvbi4KICAgICBBU1NFUlQoIXN0 YXRlT2JqZWN0IHx8IChzdGF0ZU9iamVjdCAmJiAhaXNOZXdOYXZpZ2F0aW9uKSk7CkBAIC0xNzE2 LDcgKzE3MTYsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkSW5TYW1lRG9jdW1lbnQoY29uCiAg ICAgLy8gVXBkYXRlIHRoZSBkYXRhIHNvdXJjZSdzIHJlcXVlc3Qgd2l0aCB0aGUgbmV3IFVSTCB0 byBmYWtlIHRoZSBVUkwgY2hhbmdlCiAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2V0VVJMKHVy bCk7CiAgICAgZG9jdW1lbnRMb2FkZXIoKS0+cmVwbGFjZVJlcXVlc3RVUkxGb3JTYW1lRG9jdW1l bnROYXZpZ2F0aW9uKHVybCk7Ci0gICAgaWYgKGlzTmV3TmF2aWdhdGlvbiAmJiAhc2hvdWxkVHJl YXRVUkxBc1NhbWVBc0N1cnJlbnQodXJsKSAmJiAhc3RhdGVPYmplY3QpIHsKKyAgICBpZiAoaXNO ZXdOYXZpZ2F0aW9uICYmICFzaG91bGRUcmVhdFVSTEFzU2FtZUFzQ3VycmVudCh1cmwpICYmICFz dGF0ZU9iamVjdCAmJiAhc3VwcHJlc3NBZGRUb0hpc3RvcnkpIHsKICAgICAgICAgLy8gTkI6IG11 c3QgaGFwcGVuIGFmdGVyIHJlcGxhY2VSZXF1ZXN0VVJMRm9yU2FtZURvY3VtZW50TmF2aWdhdGlv bigpLCBzaW5jZSB3ZSBhZGQgCiAgICAgICAgIC8vIGJhc2VkIG9uIHRoZSBjdXJyZW50IHJlcXVl c3QuIE11c3QgYWxzbyBoYXBwZW4gYmVmb3JlIHdlIG9wZW5VUkwgYW5kIGRpc3BsYWNlIHRoZSAK ICAgICAgICAgLy8gc2Nyb2xsIHBvc2l0aW9uLCBzaW5jZSBhZGRpbmcgdGhlIEJGIGl0ZW0gd2ls bCBzYXZlIGF3YXkgc2Nyb2xsIHN0YXRlLgpAQCAtMzM4OSw3ICszMzg5LDggQEAgdm9pZCBGcmFt ZUxvYWRlcjo6Y29udGludWVGcmFnbWVudFNjcm9sbAogICAgICAgICByZXR1cm47CiAKICAgICBi b29sIGlzUmVkaXJlY3QgPSBtX3F1aWNrUmVkaXJlY3RDb21pbmcgfHwgcG9saWN5Q2hlY2tlcigp LT5sb2FkVHlwZSgpID09IEZyYW1lTG9hZFR5cGVSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2Fy ZExpc3Q7ICAgIAotICAgIGxvYWRJblNhbWVEb2N1bWVudChyZXF1ZXN0LnVybCgpLCAwLCAhaXNS ZWRpcmVjdCk7CisgICAgLy8gRG8gbm90IGFkZCBoaXN0b3J5IGl0ZW1zIGZvciBhIGZyYWdtZW50 IHNjcm9sbCBub3QgaW5pdGlhdGVkIGJ5IHRoZSB1c2VyLgorICAgIGxvYWRJblNhbWVEb2N1bWVu dChyZXF1ZXN0LnVybCgpLCAwLCAhaXNSZWRpcmVjdCwgIWlzUHJvY2Vzc2luZ1VzZXJHZXN0dXJl KCkpOwogfQogCiBib29sIEZyYW1lTG9hZGVyOjpzaG91bGRTY3JvbGxUb0FuY2hvcihib29sIGlz Rm9ybVN1Ym1pc3Npb24sIEZyYW1lTG9hZFR5cGUgbG9hZFR5cGUsIGNvbnN0IEtVUkwmIHVybCkK QEAgLTM2NzcsNyArMzY3OCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6Om5hdmlnYXRlV2l0aGluRG9j dW1lbnQKICAgICBoaXN0b3J5KCktPnNldEN1cnJlbnRJdGVtKGl0ZW0pOwogICAgICAgICAKICAg ICAvLyBsb2FkSW5TYW1lRG9jdW1lbnQoKSBhY3R1YWxseSBjaGFuZ2VzIHRoZSBVUkwgYW5kIG5v dGlmaWVzIGxvYWQgZGVsZWdhdGVzIG9mIGEgImZha2UiIGxvYWQKLSAgICBsb2FkSW5TYW1lRG9j dW1lbnQoaXRlbS0+dXJsKCksIGl0ZW0tPnN0YXRlT2JqZWN0KCksIGZhbHNlKTsKKyAgICBsb2Fk SW5TYW1lRG9jdW1lbnQoaXRlbS0+dXJsKCksIGl0ZW0tPnN0YXRlT2JqZWN0KCksIGZhbHNlLCBm YWxzZSk7CiAKICAgICAvLyBSZXN0b3JlIHVzZXIgdmlldyBzdGF0ZSBmcm9tIHRoZSBjdXJyZW50 IGhpc3RvcnkgaXRlbSBoZXJlIHNpbmNlIHdlIGRvbid0IGRvIGEgbm9ybWFsIGxvYWQuCiAgICAg Ly8gRXZlbiB0aG91Z2ggd2UganVzdCBtYW51YWxseSBzZXQgdGhlIGN1cnJlbnQgaGlzdG9yeSBp dGVtLCB0aGlzIEFTU0VSVCB2ZXJpZmllcyBub3RoaW5nIApJbmRleDogV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5o CShyZXZpc2lvbiA1MjY4OSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJKHdvcmtp bmcgY29weSkKQEAgLTQyOCw3ICs0MjgsNyBAQCBwcml2YXRlOgogCiAgICAgRnJhbWUqIGxvYWRT dWJmcmFtZShIVE1MRnJhbWVPd25lckVsZW1lbnQqLCBjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5n JiBuYW1lLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyKTsKIAotICAgIHZvaWQgbG9hZEluU2FtZURv Y3VtZW50KGNvbnN0IEtVUkwmLCBTZXJpYWxpemVkU2NyaXB0VmFsdWUqIHN0YXRlT2JqZWN0LCBi b29sIGlzTmV3TmF2aWdhdGlvbik7CisgICAgdm9pZCBsb2FkSW5TYW1lRG9jdW1lbnQoY29uc3Qg S1VSTCYsIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogc3RhdGVPYmplY3QsIGJvb2wgaXNOZXdOYXZp Z2F0aW9uLCBib29sIHN1cHByZXNzQWRkVG9IaXN0b3J5KTsKIAogICAgIHZvaWQgcHJvdmlzaW9u YWxMb2FkU3RhcnRlZCgpOwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1Mjc5NCkKKysrIExheW91dFRl c3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEwLTAxLTA1 ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2ZW50cyBoaXN0b3J5IGl0ZW1zIGJl aW5nIGFkZGVkIHdoZW4gZnJhZ21lbnQgc2Nyb2xscyBhcmUgbm90CisgICAgICAgIHVzZXItaW5p dGlhdGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzAyMjQKKworICAgICAgICAqIGh0dHAvdGVzdHMvbmF2aWdhdGlvbi9zY3JpcHQtaW5pdGlhdGVk LWZyYWdtZW50LW5hdmlnYXRpb24uaHRtbDogQWRkZWQuIFRlc3RzIHRoYXQgd2hhbiBhIGZyYWdt ZW50IHNjcm9sbCBpcyBpbml0aWF0ZWQgYnkgc2NyaXB0LCBubyBhZGRpdGlvbiBpcyBtYWRlIHRv IHRoZSBiYWNrL2ZvcndhcmQgbGlzdC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL25hdmlnYXRpb24v c2NyaXB0LWluaXRpYXRlZC1mcmFnbWVudC1uYXZpZ2F0aW9uLWV4cGVjdGVkLnR4dDogQWRkZWQu IEV4cGVjdGVkIHJlc3VsdCBmb3IgYWJvdmUgdGVzdC4KKwogMjAxMC0wMS0wNCAgQ2hyaXMgRmxl aXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3NjcmlwdC1p bml0aWF0ZWQtZnJhZ21lbnQtbmF2aWdhdGlvbi1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL3NjcmlwdC1pbml0aWF0ZWQtZnJhZ21l bnQtbmF2aWdhdGlvbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL25hdmlnYXRpb24vc2NyaXB0LWluaXRpYXRlZC1mcmFnbWVudC1uYXZpZ2F0aW9u LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw3IEBACitUaGlzIHRlc3QgY2hl Y2tzIHRoYXQgd2hlbiBhIGZyYWdtZW50IG5hdmlnYXRpb24gaXMgaW5pdGlhdGVkIGZyb20gc2Ny aXB0LCBubyBhZGRpdGlvbiBpcyBtYWRlIHRvIHRoZSBiYWNrL2ZvcndhcmQgbGlzdC4KKworQW5j aG9yCisKKz09PT09PT09PT09PT09IEJhY2sgRm9yd2FyZCBMaXN0ID09PT09PT09PT09PT09Citj dXJyLT4gIGh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9uYXZpZ2F0aW9uL3NjcmlwdC1pbml0aWF0ZWQt ZnJhZ21lbnQtbmF2aWdhdGlvbi5odG1sICAqKm5hdiB0YXJnZXQqKgorPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KSW5kZXg6IExheW91dFRlc3RzL2h0dHAv dGVzdHMvbmF2aWdhdGlvbi9zY3JpcHQtaW5pdGlhdGVkLWZyYWdtZW50LW5hdmlnYXRpb24uaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL25hdmlnYXRpb24vc2NyaXB0 LWluaXRpYXRlZC1mcmFnbWVudC1uYXZpZ2F0aW9uLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9odHRwL3Rlc3RzL25hdmlnYXRpb24vc2NyaXB0LWluaXRpYXRlZC1mcmFnbWVudC1u YXZpZ2F0aW9uLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTggQEAKKzxodG1sPgorPGhl YWQ+Cis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CitmdW5jdGlvbiBzdGFydFRlc3Qo KQoreworICAgIHdpbmRvdy5sb2NhdGlvbiA9IHdpbmRvdy5sb2NhdGlvbiArICIjZnJhZ21lbnQi OworICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgICAgbGF5b3V0 VGVzdENvbnRyb2xsZXIuZHVtcEJhY2tGb3J3YXJkTGlzdCgpOworICAgICAgICBsYXlvdXRUZXN0 Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgfQorfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8 Ym9keSBvbmxvYWQ9InN0YXJ0VGVzdCgpOyI+Cis8cD5UaGlzIHRlc3QgY2hlY2tzIHRoYXQgd2hl biBhIGZyYWdtZW50IG5hdmlnYXRpb24gaXMgaW5pdGlhdGVkIGZyb20gc2NyaXB0LCBubyBhZGRp dGlvbiBpcyBtYWRlIHRvIHRoZSBiYWNrL2ZvcndhcmQgbGlzdC48L3A+Cis8cD48YSBuYW1lPSJm cmFnbWVudCI+QW5jaG9yPC9hPjwvcD4KKzwvYm9keT4KKzwvaHRtbD4K