64895 2011-07-20 14:11:11 -0700 Wrong URL loaded into child frame after back/forward navigation 2011-08-17 13:18:15 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet beidson mihaip webkit.review.bot xt6.thomas.genin oldest_to_newest 440007 0 japhet 2011-07-20 14:11:11 -0700 Original report at http://code.google.com/p/chromium/issues/detail?id=59576. Repro steps: 1. Display a web page 2. In the web page, display an iframe or object containing html 3. Navigate back & forward 4. In the same web page, display another iframe containing a different html page The problem is in the logic in FrameLoader::loadURLIntoChildFrame to load a child frame from a HistoryItem instead of from the url. I think we only want to load from a HistoryItem before the load event. Note that this problem is prevented by the page cache because the old contents of the child frame are immediately present and the display of a new frame will typically add a new Frame rather than overwrite. 440018 1 101509 japhet 2011-07-20 14:25:11 -0700 Created attachment 101509 patch 440171 2 101509 mihaip 2011-07-20 18:25:57 -0700 Comment on attachment 101509 patch View in context: https://bugs.webkit.org/attachment.cgi?id=101509&action=review Is the current behavior (that the URL is restored for iframes for back-forward navigations) tested anywhere? > LayoutTests/fast/loader/child-frame-add-after-back-forward.html:9 > + layoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey', 0); You may want to add an unload handler too, so that the page cache is disabled when running the test in Safari too. 440663 3 japhet 2011-07-21 15:13:05 -0700 (In reply to comment #2) > (From update of attachment 101509 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=101509&action=review > > Is the current behavior (that the URL is restored for iframes for back-forward navigations) tested anywhere? Yeah, if I comment out the if() statement and everything inside, 2 tests each in fast/history and http/tests/navigation fail. > > > LayoutTests/fast/loader/child-frame-add-after-back-forward.html:9 > > + layoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey', 0); > > You may want to add an unload handler too, so that the page cache is disabled when running the test in Safari too. Good point. 441038 4 101743 japhet 2011-07-22 11:14:03 -0700 Created attachment 101743 Patch for landing 441068 5 101743 webkit.review.bot 2011-07-22 12:02:11 -0700 Comment on attachment 101743 Patch for landing Clearing flags on attachment: 101743 Committed r91583: <http://trac.webkit.org/changeset/91583> 441069 6 webkit.review.bot 2011-07-22 12:02:15 -0700 All reviewed patches have been landed. Closing bug. 452503 7 ap 2011-08-17 13:18:15 -0700 *** Bug 64402 has been marked as a duplicate of this bug. *** 101509 2011-07-20 14:25:11 -0700 2011-07-22 11:14:00 -0700 patch childframe.txt text/plain 5547 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCShyZXZpc2lvbiA5MTM5OSkKKysrIFNvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjg3LDYgKzEyODcsOCBAQAog CiAgICAgLy8gRklYTUU6IE1lcmdlIHRoZXNlIDIgdmFyaWFibGVzIGludG8gYW4gZW51bS4gQWxz bywgRnJhbWVMb2FkZXI6Om1fZGlkQ2FsbEltcGxpY2l0Q2xvc2UKICAgICAvLyBpcyBhbG1vc3Qg YSBkdXBsaWNhdGlvbiBvZiB0aGlzIGRhdGEsIHNvIHRoYXQgc2hvdWxkIHByb2JhYmx5IGdldCBt ZXJnZWQgaW4gdG9vLgorICAgIC8vIEZJWE1FOiBEb2N1bWVudDo6bV9wcm9jZXNzaW5nTG9hZEV2 ZW50IGFuZCBEb2N1bWVudExvYWRlcjo6bV93YXNPbmxvYWRIYW5kbGVkIGFyZSByb3VnaGx5IHRo ZSBzYW1lCisgICAgLy8gYW5kIHNob3VsZCBiZSBtZXJnZWQuCiAgICAgYm9vbCBtX3Byb2Nlc3Np bmdMb2FkRXZlbnQ7CiAgICAgYm9vbCBtX2xvYWRFdmVudEZpbmlzaGVkOwogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCShyZXZpc2lvbiA5MTQwNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDExLTA3LTIwICBOYXRlIENoYXBpbiAgPGphcGhl dEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRG9uJ3QgdHJlYXQgY2hpbGQgZnJhbWUgbG9hZHMg YXMgYmFjay1mb3J3YXJkIG5hdmlnYXRpb25zCisgICAgICAgIGFmdGVyIHRoZSBsb2FkIGV2ZW50 IGZpcmVzLiBUaGlzIGNhbiBsZWFkIHRvIGxvYWRpbmcKKyAgICAgICAgdGhlIHdyb25nIHVybCBp biB0aGUgY2hpbGQgZnJhbWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NDg5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRlc3Q6IGZhc3QvbG9hZGVyL2NoaWxkLWZyYW1lLWFkZC1hZnRlci1iYWNrLWZv cndhcmQuaHRtbAorCisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6IERyaXZlLWJ5IEZJWE1FLgor ICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5oOiBEcml2ZS1ieSBGSVhNRS4KKyAgICAg ICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXI6OmxvYWRVUkxJbnRvQ2hpbGRGcmFtZSk6CisKIDIwMTEtMDctMjAgIFBldGVyIEthc3Rpbmcg IDxwa2FzdGluZ0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSAiY29uc3QiIGZyb20gb2J2 aW91c2x5LW5vbi1jb25zdCBhY2Nlc3NvcnMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcAkocmV2aXNpb24gOTEzOTkpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MDIsNyArODAyLDggQEAKICAgICBIaXN0 b3J5SXRlbSogcGFyZW50SXRlbSA9IGhpc3RvcnkoKS0+Y3VycmVudEl0ZW0oKTsKICAgICAvLyBJ ZiB3ZSdyZSBtb3ZpbmcgaW4gdGhlIGJhY2svZm9yd2FyZCBsaXN0LCB3ZSBtaWdodCB3YW50IHRv IHJlcGxhY2UgdGhlIGNvbnRlbnQKICAgICAvLyBvZiB0aGlzIGNoaWxkIGZyYW1lIHdpdGggd2hh dGV2ZXIgd2FzIHRoZXJlIGF0IHRoYXQgcG9pbnQuCi0gICAgaWYgKHBhcmVudEl0ZW0gJiYgcGFy ZW50SXRlbS0+Y2hpbGRyZW4oKS5zaXplKCkgJiYgaXNCYWNrRm9yd2FyZExvYWRUeXBlKGxvYWRU eXBlKCkpKSB7CisgICAgaWYgKHBhcmVudEl0ZW0gJiYgcGFyZW50SXRlbS0+Y2hpbGRyZW4oKS5z aXplKCkgJiYgaXNCYWNrRm9yd2FyZExvYWRUeXBlKGxvYWRUeXBlKCkpIAorICAgICAgICAmJiAh bV9mcmFtZS0+ZG9jdW1lbnQoKS0+bG9hZEV2ZW50RmluaXNoZWQoKSkgewogICAgICAgICBIaXN0 b3J5SXRlbSogY2hpbGRJdGVtID0gcGFyZW50SXRlbS0+Y2hpbGRJdGVtV2l0aFRhcmdldChjaGls ZEZyYW1lLT50cmVlKCktPnVuaXF1ZU5hbWUoKSk7CiAgICAgICAgIGlmIChjaGlsZEl0ZW0pIHsK ICAgICAgICAgICAgIGNoaWxkRnJhbWUtPmxvYWRlcigpLT5sb2FkRGlmZmVyZW50RG9jdW1lbnRJ dGVtKGNoaWxkSXRlbSwgbG9hZFR5cGUoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv RG9jdW1lbnRMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9j dW1lbnRMb2FkZXIuaAkocmV2aXNpb24gOTEzOTkpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv RG9jdW1lbnRMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzAyLDYgKzMwMiw5IEBACiAgICAg ICAgIGJvb2wgbV9nb3RGaXJzdEJ5dGU7CiAgICAgICAgIGJvb2wgbV9wcmltYXJ5TG9hZENvbXBs ZXRlOwogICAgICAgICBib29sIG1faXNDbGllbnRSZWRpcmVjdDsKKworICAgICAgICAvLyBGSVhN RTogRG9jdW1lbnQ6Om1fcHJvY2Vzc2luZ0xvYWRFdmVudCBhbmQgRG9jdW1lbnRMb2FkZXI6Om1f d2FzT25sb2FkSGFuZGxlZCBhcmUgcm91Z2hseSB0aGUgc2FtZQorICAgICAgICAvLyBhbmQgc2hv dWxkIGJlIG1lcmdlZC4KICAgICAgICAgYm9vbCBtX3dhc09ubG9hZEhhbmRsZWQ7CiAKICAgICAg ICAgU3RyaW5nV2l0aERpcmVjdGlvbiBtX3BhZ2VUaXRsZTsKSW5kZXg6IExheW91dFRlc3RzL2Zh c3QvbG9hZGVyL2NoaWxkLWZyYW1lLWFkZC1hZnRlci1iYWNrLWZvcndhcmQtZXhwZWN0ZWQudHh0 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NoaWxkLWZyYW1lLWFkZC1h ZnRlci1iYWNrLWZvcndhcmQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz dHMvZmFzdC9sb2FkZXIvY2hpbGQtZnJhbWUtYWRkLWFmdGVyLWJhY2stZm9yd2FyZC1leHBlY3Rl ZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNiBAQAorR28gZm9yd2FyZCB0aGVuIGJhY2su ICAKKworLS0tLS0tLS0KK0ZyYW1lOiAnPCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTAtLT4tLT4n CistLS0tLS0tLQorUEFTUwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY2hpbGQtZnJh bWUtYWRkLWFmdGVyLWJhY2stZm9yd2FyZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3QvbG9hZGVyL2NoaWxkLWZyYW1lLWFkZC1hZnRlci1iYWNrLWZvcndhcmQuaHRtbAkocmV2 aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NoaWxkLWZyYW1lLWFkZC1hZnRl ci1iYWNrLWZvcndhcmQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzNyBAQAorPGh0bWw+ Cis8aGVhZD4KKzxzY3JpcHQ+CisKK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsK KyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7CisgICAgbGF5b3V0VGVz dENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBD aGlsZEZyYW1lc0FzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLm92ZXJyaWRlUHJl ZmVyZW5jZSgnV2ViS2l0VXNlc1BhZ2VDYWNoZVByZWZlcmVuY2VLZXknLCAwKTsKK30KKworZnVu Y3Rpb24gbmF2aWdhdGUoKSB7CisgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAg ICB2YXIgYSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJhIik7CisgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlTW92ZVRvKGEub2Zmc2V0TGVmdCArIDIsIGEub2Zmc2V0VG9wICsgMik7CisgICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgICAgICBldmVudFNlbmRlci5tb3VzZVVw KCk7CisgICAgfQorfQorZnVuY3Rpb24gYWRkQ2hpbGRGcmFtZSgpCit7CisgICAgaWYgKCF3aW5k b3cuc2Vzc2lvblN0b3JhZ2UuZ2V0SXRlbSgiY2hpbGRGcmFtZSIpKSB7CisgICAgICAgIHdpbmRv dy5zZXNzaW9uU3RvcmFnZS5jaGlsZEZyYW1lID0gInRydWUiOworICAgICAgICBkb2N1bWVudC5i b2R5LmlubmVySFRNTCArPSAnPGlmcmFtZSBvbmxvYWQ9XCdzZXRUaW1lb3V0KG5hdmlnYXRlLCAw KTtcJyBzcmM9XCdyZXNvdXJjZXMvZW1wdHktc3ViZnJhbWUuaHRtbFwnPjwvaWZyYW1lPic7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICB3aW5kb3cuc2Vzc2lvblN0b3JhZ2UucmVtb3Zl SXRlbSgiY2hpbGRGcmFtZSIpOworICAgIGRvY3VtZW50LmJvZHkuaW5uZXJIVE1MICs9ICc8aWZy YW1lIHNyYz1cJ3Jlc291cmNlcy9wYXNzLWFuZC1ub3RpZnktZG9uZS5odG1sXCc+PC9pZnJhbWU+ JzsKK30KKworPC9zY3JpcHQ+Cis8L2hlYWQ+DQorPGJvZHkgb25sb2FkPSJzZXRUaW1lb3V0KGFk ZENoaWxkRnJhbWUsIDApIj4KKzxhIGlkPSJhIiBocmVmPSJyZXNvdXJjZXMvZW1wdHktZG9jdW1l bnQtZ29lcy1iYWNrLmh0bWwiPkdvIGZvcndhcmQgdGhlbiBiYWNrLjwvYT4NCis8L2JvZHk+DQor PC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gOTE0MDQpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAxMS0wNy0yMCAgTmF0ZSBDaGFw aW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFRlc3QgZm9yIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDg5NS4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbG9hZGVyL2NoaWxkLWZyYW1lLWFk ZC1hZnRlci1iYWNrLWZvcndhcmQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2xvYWRlci9jaGlsZC1mcmFtZS1hZGQtYWZ0ZXItYmFjay1mb3J3YXJkLmh0bWw6IEFkZGVkLgor CiAyMDExLTA3LTIwICBTdGVwaGVuIFdoaXRlICA8c2Vub3JibGFuY29AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIENocm9taXVtIHRlc3RfZXhwZWN0YXRpb25zIHVwZGF0ZSBmb3IgdGVzdHMgbm93 IHBhc3Npbmcgb24gV0lONy4K 101743 2011-07-22 11:14:03 -0700 2011-07-22 12:02:11 -0700 Patch for landing bug-64895-20110722111402.patch text/plain 5694 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNTc2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDctMjAgIE5hdGUgQ2hh cGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKworICAgICAgICBEb24ndCB0cmVhdCBjaGlsZCBm cmFtZSBsb2FkcyBhcyBiYWNrLWZvcndhcmQgbmF2aWdhdGlvbnMKKyAgICAgICAgYWZ0ZXIgdGhl IGxvYWQgZXZlbnQgZmlyZXMuIFRoaXMgY2FuIGxlYWQgdG8gbG9hZGluZworICAgICAgICB0aGUg d3JvbmcgdXJsIGluIHRoZSBjaGlsZCBmcmFtZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY0ODk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWloYWkg UGFycGFyaXRhLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbG9hZGVyL2NoaWxkLWZyYW1lLWFkZC1h ZnRlci1iYWNrLWZvcndhcmQuaHRtbAorCisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6IERyaXZl LWJ5IEZJWE1FLgorICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5oOiBEcml2ZS1ieSBG SVhNRS4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXI6OmxvYWRVUkxJbnRvQ2hpbGRGcmFtZSk6CisKIDIwMTEtMDctMjIgIEtl bnQgVGFtdXJhICA8dGtlbnRAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHI4ODc1 Nyk6IFRoZSB0aHVtYiBvZiBhIHZlcnRpY2FsIHJhbmdlIHNsaWRlciBpcyBvZmZzZXQgdG8gdGhl IHJpZ2h0IG9uIG5vbi1NYWMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAkocmV2aXNpb24gOTE1 NzYpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAt MTI4Nyw2ICsxMjg3LDggQEAgcHJpdmF0ZToKIAogICAgIC8vIEZJWE1FOiBNZXJnZSB0aGVzZSAy IHZhcmlhYmxlcyBpbnRvIGFuIGVudW0uIEFsc28sIEZyYW1lTG9hZGVyOjptX2RpZENhbGxJbXBs aWNpdENsb3NlCiAgICAgLy8gaXMgYWxtb3N0IGEgZHVwbGljYXRpb24gb2YgdGhpcyBkYXRhLCBz byB0aGF0IHNob3VsZCBwcm9iYWJseSBnZXQgbWVyZ2VkIGluIHRvby4KKyAgICAvLyBGSVhNRTog RG9jdW1lbnQ6Om1fcHJvY2Vzc2luZ0xvYWRFdmVudCBhbmQgRG9jdW1lbnRMb2FkZXI6Om1fd2Fz T25sb2FkSGFuZGxlZCBhcmUgcm91Z2hseSB0aGUgc2FtZQorICAgIC8vIGFuZCBzaG91bGQgYmUg bWVyZ2VkLgogICAgIGJvb2wgbV9wcm9jZXNzaW5nTG9hZEV2ZW50OwogICAgIGJvb2wgbV9sb2Fk RXZlbnRGaW5pc2hlZDsKIApJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVy LmgJKHJldmlzaW9uIDkxNTc2KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwMiw2ICszMDIsOSBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIGJvb2wgbV9nb3RGaXJzdEJ5dGU7CiAgICAgICAgIGJvb2wgbV9wcmltYXJ5 TG9hZENvbXBsZXRlOwogICAgICAgICBib29sIG1faXNDbGllbnRSZWRpcmVjdDsKKworICAgICAg ICAvLyBGSVhNRTogRG9jdW1lbnQ6Om1fcHJvY2Vzc2luZ0xvYWRFdmVudCBhbmQgRG9jdW1lbnRM b2FkZXI6Om1fd2FzT25sb2FkSGFuZGxlZCBhcmUgcm91Z2hseSB0aGUgc2FtZQorICAgICAgICAv LyBhbmQgc2hvdWxkIGJlIG1lcmdlZC4KICAgICAgICAgYm9vbCBtX3dhc09ubG9hZEhhbmRsZWQ7 CiAKICAgICAgICAgU3RyaW5nV2l0aERpcmVjdGlvbiBtX3BhZ2VUaXRsZTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gOTE1NzYpCisrKyBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MDIsNyAr ODAyLDggQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFVSTEludG9DaGlsZEZyYW1lKAogICAgIEhp c3RvcnlJdGVtKiBwYXJlbnRJdGVtID0gaGlzdG9yeSgpLT5jdXJyZW50SXRlbSgpOwogICAgIC8v IElmIHdlJ3JlIG1vdmluZyBpbiB0aGUgYmFjay9mb3J3YXJkIGxpc3QsIHdlIG1pZ2h0IHdhbnQg dG8gcmVwbGFjZSB0aGUgY29udGVudAogICAgIC8vIG9mIHRoaXMgY2hpbGQgZnJhbWUgd2l0aCB3 aGF0ZXZlciB3YXMgdGhlcmUgYXQgdGhhdCBwb2ludC4KLSAgICBpZiAocGFyZW50SXRlbSAmJiBw YXJlbnRJdGVtLT5jaGlsZHJlbigpLnNpemUoKSAmJiBpc0JhY2tGb3J3YXJkTG9hZFR5cGUobG9h ZFR5cGUoKSkpIHsKKyAgICBpZiAocGFyZW50SXRlbSAmJiBwYXJlbnRJdGVtLT5jaGlsZHJlbigp LnNpemUoKSAmJiBpc0JhY2tGb3J3YXJkTG9hZFR5cGUobG9hZFR5cGUoKSkgCisgICAgICAgICYm ICFtX2ZyYW1lLT5kb2N1bWVudCgpLT5sb2FkRXZlbnRGaW5pc2hlZCgpKSB7CiAgICAgICAgIEhp c3RvcnlJdGVtKiBjaGlsZEl0ZW0gPSBwYXJlbnRJdGVtLT5jaGlsZEl0ZW1XaXRoVGFyZ2V0KGNo aWxkRnJhbWUtPnRyZWUoKS0+dW5pcXVlTmFtZSgpKTsKICAgICAgICAgaWYgKGNoaWxkSXRlbSkg ewogICAgICAgICAgICAgY2hpbGRGcmFtZS0+bG9hZGVyKCktPmxvYWREaWZmZXJlbnREb2N1bWVu dEl0ZW0oY2hpbGRJdGVtLCBsb2FkVHlwZSgpKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNTc2KQor KysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTEtMDctMjAgIE5hdGUgQ2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KKworICAgICAg ICBUZXN0IGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQ4OTUu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWloYWkgUGFycGFyaXRhLgorCisgICAgICAgICogZmFz dC9sb2FkZXIvY2hpbGQtZnJhbWUtYWRkLWFmdGVyLWJhY2stZm9yd2FyZC1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVyL2NoaWxkLWZyYW1lLWFkZC1hZnRlci1iYWNr LWZvcndhcmQuaHRtbDogQWRkZWQuCisKIDIwMTEtMDctMjIgIE1hcmsgSGFobmVuYmVyZyAgPG1o YWhuZW5iZXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBEYXRlLnByb3RvdHlwZS50b0lTT1N0cmlu ZyBkb2Vzbid0IGhhbmRsZSBuZWdhdGl2ZSB5ZWFycyBvciB5ZWFycyA+IDk5OTkgY29ycmVjdGx5 LgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvY2hpbGQtZnJhbWUtYWRkLWFmdGVyLWJh Y2stZm9yd2FyZC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9s b2FkZXIvY2hpbGQtZnJhbWUtYWRkLWFmdGVyLWJhY2stZm9yd2FyZC1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jaGlsZC1mcmFtZS1hZGQtYWZ0 ZXItYmFjay1mb3J3YXJkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw4IEBA CittYWluIGZyYW1lIC0gaGFzIDEgb251bmxvYWQgaGFuZGxlcihzKQorbWFpbiBmcmFtZSAtIGhh cyAxIG9udW5sb2FkIGhhbmRsZXIocykKK0dvIGZvcndhcmQgdGhlbiBiYWNrLiAgCisKKy0tLS0t LS0tCitGcmFtZTogJzwhLS1mcmFtZVBhdGggLy88IS0tZnJhbWUwLS0+LS0+JworLS0tLS0tLS0K K1BBU1MKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2NoaWxkLWZyYW1lLWFkZC1hZnRl ci1iYWNrLWZvcndhcmQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2xvYWRl ci9jaGlsZC1mcmFtZS1hZGQtYWZ0ZXItYmFjay1mb3J3YXJkLmh0bWwJKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9jaGlsZC1mcmFtZS1hZGQtYWZ0ZXItYmFjay1mb3J3 YXJkLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzYgQEAKKzxodG1sPgorPGhlYWQ+Cis8 c2NyaXB0PgorCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgbGF5b3V0 VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVy LmR1bXBBc1RleHQoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQ2hpbGRGcmFtZXNB c1RleHQoKTsKK30KKworZnVuY3Rpb24gbmF2aWdhdGUoKSB7CisgICAgaWYgKHdpbmRvdy5ldmVu dFNlbmRlcikgeworICAgICAgICB2YXIgYSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJhIik7 CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKGEub2Zmc2V0TGVmdCArIDIsIGEub2Zm c2V0VG9wICsgMik7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgICAgICBl dmVudFNlbmRlci5tb3VzZVVwKCk7CisgICAgfQorfQorZnVuY3Rpb24gYWRkQ2hpbGRGcmFtZSgp Cit7CisgICAgaWYgKCF3aW5kb3cuc2Vzc2lvblN0b3JhZ2UuZ2V0SXRlbSgiY2hpbGRGcmFtZSIp KSB7CisgICAgICAgIHdpbmRvdy5zZXNzaW9uU3RvcmFnZS5jaGlsZEZyYW1lID0gInRydWUiOwor ICAgICAgICBkb2N1bWVudC5ib2R5LmlubmVySFRNTCArPSAnPGlmcmFtZSBvbmxvYWQ9XCdzZXRU aW1lb3V0KG5hdmlnYXRlLCAwKTtcJyBzcmM9XCdyZXNvdXJjZXMvZW1wdHktc3ViZnJhbWUuaHRt bFwnPjwvaWZyYW1lPic7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICB3aW5kb3cuc2Vz c2lvblN0b3JhZ2UucmVtb3ZlSXRlbSgiY2hpbGRGcmFtZSIpOworICAgIGRvY3VtZW50LmJvZHku aW5uZXJIVE1MICs9ICc8aWZyYW1lIHNyYz1cJ3Jlc291cmNlcy9wYXNzLWFuZC1ub3RpZnktZG9u ZS5odG1sXCc+PC9pZnJhbWU+JzsKK30KKworPC9zY3JpcHQ+Cis8L2hlYWQ+DQorPGJvZHkgb25s b2FkPSJzZXRUaW1lb3V0KGFkZENoaWxkRnJhbWUsIDApIiBvbnVubG9hZD0icmV0dXJuIGZhbHNl OyI+Cis8YSBpZD0iYSIgaHJlZj0icmVzb3VyY2VzL2VtcHR5LWRvY3VtZW50LWdvZXMtYmFjay5o dG1sIj5HbyBmb3J3YXJkIHRoZW4gYmFjay48L2E+DQorPC9ib2R5Pg0KKzwvaHRtbD4K