13067 2007-03-14 03:44:33 -0700 Manually adding #hash to URL reloads entire page instead of jumping to #hash location in cached page 2009-01-04 08:38:43 -0800 1 1 1 Unclassified WebKit Page Loading 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED http://trac.webkit.org/projects/webkit/changeset/20182 P2 Normal --- 1 ddkilzer ddkilzer hyatt mrowe rachael rik oldest_to_newest 18878 0 ddkilzer 2007-03-14 03:44:33 -0700 Summary: Manually adding "#hash" to the URL in the address bar then hitting Enter will reload the entire page instead of jumping to the "#hash" location in the existing document. If one clicks on a "#hash" link in the page, though, the page does NOT reload and the user is taken to the "#hash" location in the existing document. Steps to reproduce: 1. Open Safari/WebKit. 2. Open URL with #hash locations like: http://trac.webkit.org/projects/webkit/changeset/20182 3. Add "#file3" to the end of the URL in the address bar, then hit Enter. Expected results: Safari/WebKit should jump to "#file3" location without reloading the page. Actual results: Safari/WebKit reloads the entire page, then jumps to "#file3" location. Regression: Surprisingly, this is not a regression from shipping Safari 2.0.4 (419.3) on Mac OS X 10.4.8 (8L127). It has the exact same behavior. Notes: Tested with a local debug build of WebKit r20184 with the above software. Note that Firefox 2.0.0.2 and Opera 9.10 both exhibit the expected behavior. OmniWeb 5.5.3 exhibits the actual behavior (as a WebKit browser). 18879 1 hyatt 2007-03-14 04:18:41 -0700 This is so bad. 18880 2 ddkilzer 2007-03-14 06:25:39 -0700 (In reply to comment #1) > This is so bad. FWIW, Mac IE 5.2.3 behaves the same as Safari. It also appears that opening the URL (http://trac.webkit.org/projects/webkit/changeset/20182) in one browser window, then opening the same URL with a hash (http://trac.webkit.org/projects/webkit/changeset/20182#file13) in a second window (or tab) also doesn't used the cached copy of the page. 66057 3 ddkilzer 2008-01-02 11:31:12 -0800 (In reply to comment #1) > This is so bad. Does this behavior coincide with Safari's "always reload the page when hitting Enter in the URL Address Field" behavior, though? 66058 4 ddkilzer 2008-01-02 11:38:29 -0800 (In reply to comment #3) > Does this behavior coincide with Safari's "always reload the page when hitting > Enter in the URL Address Field" behavior, though? I guess we could do the following: 1. If the new URL only differs from the previous URL by adding a #hash, don't reload the page, just jump to #hash. 2. Else if the new URL only differs from the previous URL by a different #hash, don't reload the page, just jump to #newhash. 3. Else reload the page. 73641 5 khooyp 2008-03-13 16:05:20 -0700 I'm wondering if this is related to the bug I just filed? (http://bugs.webkit.org/show_bug.cgi?id=17832) In this case, setting window.location.hash to an empty string when it was originally empty to begin with will cause the page to reload. 73642 6 ddkilzer 2008-03-13 16:08:25 -0700 (In reply to comment #5) > I'm wondering if this is related to the bug I just filed? > (http://bugs.webkit.org/show_bug.cgi?id=17832) > > In this case, setting window.location.hash to an empty string when it was > originally empty to begin with will cause the page to reload. It's definitely related. 84767 7 zwarich 2008-06-30 11:41:29 -0700 This seems related to bug 19822. 85263 8 22108 ddkilzer 2008-07-06 07:28:18 -0700 Created attachment 22108 Patch v1 Proposed patch. 85299 9 22108 darin 2008-07-06 19:26:59 -0700 Comment on attachment 22108 Patch v1 checkNavigationPolicy(request, oldDocumentLoader.get(), formState, - callContinueFragmentScrollAfterNavigationPolicy, this); + callContinueFragmentScrollAfterNavigationPolicy, this); I don't personally consider this indentation change an improvement. It's a change from a form that can be done with a simple editor to a form that requires careful indenting or a syntax-sensitive editor (like emacs). + // These rules are based on what KHTML was doing in KHTMLPart::openURL. I think this comment should either go away or change its wording to "were originally based on". + bool shouldScrollToAnchor(bool isFormSubmission, FrameLoadType newLoadType, const KURL& newURL); I'm not sure the "new" prefix alone is enough to justify giving the argument names here. r=me 85518 10 ddkilzer 2008-07-09 08:23:39 -0700 Assigning to me. I want to write a manual test case before I land the patch. 85851 11 ddkilzer 2008-07-12 14:35:19 -0700 (In reply to comment #9) > (From update of attachment 22108 [edit]) > checkNavigationPolicy(request, oldDocumentLoader.get(), formState, > - callContinueFragmentScrollAfterNavigationPolicy, this); > + callContinueFragmentScrollAfterNavigationPolicy, > this); > > I don't personally consider this indentation change an improvement. It's a > change from a form that can be done with a simple editor to a form that > requires careful indenting or a syntax-sensitive editor (like emacs). Fixed to only indent 4 spaces from the previous line. > + // These rules are based on what KHTML was doing in KHTMLPart::openURL. > > I think this comment should either go away or change its wording to "were > originally based on". Fixed by changing the wording. > + bool shouldScrollToAnchor(bool isFormSubmission, FrameLoadType > newLoadType, const KURL& newURL); > > I'm not sure the "new" prefix alone is enough to justify giving the argument > names here. Removed "new" prefixes. (I originally kept them because using a parameter name of "url" didn't allow the "url()" method to be called, so I had to qualify it with "this->url()". Committed revision 35151. http://trac.webkit.org/changeset/35151 104335 12 ddkilzer 2009-01-04 08:38:43 -0800 Caused regression in Bug 20038. 22108 2008-07-06 07:28:18 -0700 2008-07-06 19:26:59 -0700 Patch v1 bug-13067-v1.diff text/plain 8597 ddkilzer ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWE2ZDBkMC4uMjNiYTIwZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NCBAQAorMjAwOC0wNy0wNiAgRGF2aWQgRC4gS2ls emVyICA8ZGRraWx6ZXJAd2Via2l0Lm9yZz4KKworICAgICAgICBCdWcgMTMwNjc6IE1hbnVhbGx5 IGFkZGluZyAjaGFzaCB0byBVUkwgcmVsb2FkcyBlbnRpcmUgcGFnZSBpbnN0ZWFkIG9mIGp1bXBp bmcgdG8gI2hhc2ggbG9jYXRpb24gaW4gY2FjaGVkIHBhZ2UKKworICAgICAgICA8aHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDY3PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIHRlc3QgY2FzZSBhZGRlZCBzaW5jZSBE UlQgY2FuJ3QgdGVzdCBsb2FkaW5nIFVSTHMgbWFudWFsbHkgZnJvbQorICAgICAgICB0aGUgd2Vi IGJyb3dzZXIuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWQoY29uc3QgS1VSTCYgbmV3VVJMLCBjb25zdCBTdHJp bmcmIHJlZmVycmVyLAorICAgICAgICAgICAgIEZyYW1lTG9hZFR5cGUgbmV3TG9hZFR5cGUsIGNv bnN0IFN0cmluZyYgZnJhbWVOYW1lLCBFdmVudCogZXZlbnQsCisgICAgICAgICAgICAgUGFzc1Jl ZlB0cjxGb3JtU3RhdGU+IGZvcm1TdGF0ZSkpOiBFeHRyYWN0ZWQgbG9naWMgZm9yIGRldGVybWlu aW5nCisgICAgICAgIHdoZW4gdG8gc2Nyb2xsIHRvIGFuIGFuY2hvciBpbnRvIHNob3VsZFNjcm9s bFRvQW5jaG9yKCkuCisKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkKERvY3Vt ZW50TG9hZGVyKiBsb2FkZXIsIEZyYW1lTG9hZFR5cGUgdHlwZSwKKyAgICAgICAgICAgICBQYXNz UmVmUHRyPEZvcm1TdGF0ZT4gZm9ybVN0YXRlKSk6IEFkZGVkIGNoZWNrIGZvcgorICAgICAgICBz aG91bGRTY3JvbGxUb0FuY2hvcigpIHRvIGNhdGNoIGNhc2VzIHdoZW4gdGhlIHVzZXIgbWFudWFs bHkgYWRkZWQgYQorICAgICAgICBoYXNoIHJlZiB0byB0aGUgVVJMIGluIHRoZSBhZGRyZXNzIGJh ci4gIFRoaXMgaXMgdGhlIGJ1ZyBmaXguCisKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVy OjpzaG91bGRSZWxvYWQpOiBTaW1wbGlmaWVkIGVhcmx5IHJldHVybiBsb2dpYy4KKyAgICAgICAg V2Ugb25seSBuZWVkIHRvIGNoZWNrIGlmIHRoZSBkZXN0aW5hdGlvblVSTCBoYXMgYSBoYXNoIHJl Ziwgbm90IHRoZQorICAgICAgICBjdXJyZW50VVJMLCBwZXIgdGhlIGNvbW1lbnQgaW4gdGhlIG1l dGhvZC4KKworICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnNob3VsZFNjcm9sbFRvQW5j aG9yKTogQWRkZWQuICBMb2dpYyBleHRyYWN0ZWQKKyAgICAgICAgZnJvbSB0aGUgRnJhbWVMb2Fk ZXI6OmxvYWQoY29uc3QgS1VSTCYgbmV3VVJMLCAuLi4pIG1ldGhvZC4gIEZpeGVkIG9yZGVyCisg ICAgICAgIG9mIGFyZ3VtZW50cyB0byBzaG91bGRSZWxvYWQoKSBzaW5jZSB0aGV5IHdlcmUgcHJl dmlvdXNseSBiYWNrd2FyZHMsCisgICAgICAgIGFsdGhvdWdoIHRoZSBwcmV2aW91cyBzaG91bGRS ZWxvYWQoKSBsb2dpYyBtYWRlIHRoaXMgaXJyZWxldmFudC4KKworICAgICAgICAoV2ViQ29yZTo6 RnJhbWVMb2FkZXI6OmxvYWRJdGVtKTogUmVtb3ZlZCBjYWxsIHRvIHNob3VsZFJlbG9hZCgpLiAg U2luY2UKKyAgICAgICAgd2UncmUgbmF2aWdhdGluZyB0byBhIEhpc3RvcnlJdGVtLCBpdCBkb2Vz bid0IG1ha2Ugc2Vuc2UgdG8gYXNrIHdoZXRoZXIKKyAgICAgICAgd2UgbmVlZCB0byByZWxvYWQg dGhlIHBhZ2Ugb3Igbm90LiAgQWRkaXRpb25hbGx5LCB0aGUgbG9naWMgYXQgdGhlIGVuZAorICAg ICAgICBvZiBzaG91bGRSZWxvYWQoKSBpcyBhbHNvIGNoZWNrZWQgaW4gdXJsc01hdGNoSXRlbSgp LCBzbyB0aGVyZSdzIG5vIG5lZWQKKyAgICAgICAgdG8gY2FsbCB0aGUgbWV0aG9kLiAgVGhpcyBm aXhlZCB0ZXN0IGZhc3QvY3NzL3RhcmdldC1mcmFnbWVudC1tYXRjaC5odG1sCisgICAgICAgIGZy b20gY29udGludW91c2x5IHJlbG9hZGluZyBhZnRlciB0aGUgb3RoZXIgY2hhbmdlcy4KKworICAg ICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXI6OnNob3VsZFNjcm9sbFRvQW5jaG9yKTogQWRkZWQuCisKIDIwMDgtMDctMDQgIERhdmlkIEQu IEtpbHplciAgPGRka2lsemVyQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVnIDE1MjkwOiBSRUdS RVNTSU9OIChyMTQxODQtcjE0MjE2KTogRHVwbGljYXRlIERPQ1RZUEUgZGVmaW5pdGlvbnMgd2hl biBzYXZpbmcgZmlsZXMgYXMgd2ViYXJjaGl2ZXMKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBj ZTZiZjhlLi4yNTFlNGJkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5j cHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0yMTIyLDI2ICsyMTIy LDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWQoY29uc3QgS1VSTCYgbmV3VVJMLCBjb25zdCBT dHJpbmcmIHJlZmVycmVyLCBGcmFtZUxvYWRUeXBlCiAgICAgLy8gTWFrZSBzdXJlIHRvIGRvIHNj cm9sbCB0byBhbmNob3IgcHJvY2Vzc2luZyBldmVuIGlmIHRoZSBVUkwgaXMKICAgICAvLyBleGFj dGx5IHRoZSBzYW1lIHNvIHBhZ2VzIHdpdGggJyMnIGxpbmtzIGFuZCBESFRNTCBzaWRlIGVmZmVj dHMKICAgICAvLyB3b3JrIHByb3Blcmx5LgotICAgIGlmICghaXNGb3JtU3VibWlzc2lvbgotICAg ICAgICAmJiBuZXdMb2FkVHlwZSAhPSBGcmFtZUxvYWRUeXBlUmVsb2FkCi0gICAgICAgICYmIG5l d0xvYWRUeXBlICE9IEZyYW1lTG9hZFR5cGVTYW1lCi0gICAgICAgICYmICFzaG91bGRSZWxvYWQo bmV3VVJMLCB1cmwoKSkKLSAgICAgICAgLy8gV2UgZG9uJ3Qgd2FudCB0byBqdXN0IHNjcm9sbCBp ZiBhIGxpbmsgZnJvbSB3aXRoaW4gYQotICAgICAgICAvLyBmcmFtZXNldCBpcyB0cnlpbmcgdG8g cmVsb2FkIHRoZSBmcmFtZXNldCBpbnRvIF90b3AuCi0gICAgICAgICYmICFtX2ZyYW1lLT5pc0Zy YW1lU2V0KCkpIHsKLQotICAgICAgICAvLyBKdXN0IGRvIGFuY2hvciBuYXZpZ2F0aW9uIHdpdGhp biB0aGUgZXhpc3RpbmcgY29udGVudC4KLSAgICAgICAgCi0gICAgICAgIC8vIFdlIGRvbid0IGRv IHRoaXMgaWYgd2UgYXJlIHN1Ym1pdHRpbmcgYSBmb3JtLCBleHBsaWNpdGx5IHJlbG9hZGluZywK LSAgICAgICAgLy8gY3VycmVudGx5IGRpc3BsYXlpbmcgYSBmcmFtZXNldCwgb3IgaWYgdGhlIG5l dyBVUkwgZG9lcyBub3QgaGF2ZSBhIGZyYWdtZW50LgotICAgICAgICAvLyBUaGVzZSBydWxlcyBh cmUgYmFzZWQgb24gd2hhdCBLSFRNTCB3YXMgZG9pbmcgaW4gS0hUTUxQYXJ0OjpvcGVuVVJMLgot ICAgICAgICAKLSAgICAgICAgLy8gRklYTUU6IFdoYXQgYWJvdXQgbG9hZCB0eXBlcyBvdGhlciB0 aGFuIFN0YW5kYXJkIGFuZCBSZWxvYWQ/Ci0gICAgICAgIAorICAgIGlmIChzaG91bGRTY3JvbGxU b0FuY2hvcihpc0Zvcm1TdWJtaXNzaW9uLCBuZXdMb2FkVHlwZSwgbmV3VVJMKSkgewogICAgICAg ICBvbGREb2N1bWVudExvYWRlci0+c2V0VHJpZ2dlcmluZ0FjdGlvbihhY3Rpb24pOwogICAgICAg ICBzdG9wUG9saWN5Q2hlY2soKTsKICAgICAgICAgY2hlY2tOYXZpZ2F0aW9uUG9saWN5KHJlcXVl c3QsIG9sZERvY3VtZW50TG9hZGVyLmdldCgpLCBmb3JtU3RhdGUsCi0gICAgICAgICAgICBjYWxs Q29udGludWVGcmFnbWVudFNjcm9sbEFmdGVyTmF2aWdhdGlvblBvbGljeSwgdGhpcyk7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjYWxsQ29udGludWVGcmFnbWVudFNjcm9sbEFmdGVy TmF2aWdhdGlvblBvbGljeSwgdGhpcyk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gbXVzdCBn cmFiIHRoaXMgbm93LCBzaW5jZSB0aGlzIGxvYWQgbWF5IHN0b3AgdGhlIHByZXZpb3VzIGxvYWQg YW5kIGNsZWFyIHRoaXMgZmxhZwogICAgICAgICBib29sIGlzUmVkaXJlY3QgPSBtX3F1aWNrUmVk aXJlY3RDb21pbmc7CkBAIC0yMjM3LDE0ICsyMjIyLDI3IEBAIHZvaWQgRnJhbWVMb2FkZXI6Omxv YWQoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgRnJhbWVMb2FkVHlwZSB0eXBlLCBQYXNzUmVmUHRy PEZvCiAKICAgICBtX3BvbGljeUxvYWRUeXBlID0gdHlwZTsKIAotICAgIGlmIChGcmFtZSogcGFy ZW50ID0gbV9mcmFtZS0+dHJlZSgpLT5wYXJlbnQoKSkKLSAgICAgICAgbG9hZGVyLT5zZXRPdmVy cmlkZUVuY29kaW5nKHBhcmVudC0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPm92ZXJyaWRl RW5jb2RpbmcoKSk7CisgICAgYm9vbCBpc0Zvcm1TdWJtaXNzaW9uID0gZm9ybVN0YXRlOworICAg IGNvbnN0IEtVUkwmIG5ld1VSTCA9IGxvYWRlci0+cmVxdWVzdCgpLnVybCgpOwogCi0gICAgc3Rv cFBvbGljeUNoZWNrKCk7Ci0gICAgc2V0UG9saWN5RG9jdW1lbnRMb2FkZXIobG9hZGVyKTsKKyAg ICBpZiAoc2hvdWxkU2Nyb2xsVG9BbmNob3IoaXNGb3JtU3VibWlzc2lvbiwgbV9wb2xpY3lMb2Fk VHlwZSwgbmV3VVJMKSkgeworICAgICAgICBSZWZQdHI8RG9jdW1lbnRMb2FkZXI+IG9sZERvY3Vt ZW50TG9hZGVyID0gbV9kb2N1bWVudExvYWRlcjsKKyAgICAgICAgTmF2aWdhdGlvbkFjdGlvbiBh Y3Rpb24obmV3VVJMLCBtX3BvbGljeUxvYWRUeXBlLCBpc0Zvcm1TdWJtaXNzaW9uKTsKKworICAg ICAgICBvbGREb2N1bWVudExvYWRlci0+c2V0VHJpZ2dlcmluZ0FjdGlvbihhY3Rpb24pOworICAg ICAgICBzdG9wUG9saWN5Q2hlY2soKTsKKyAgICAgICAgY2hlY2tOYXZpZ2F0aW9uUG9saWN5KGxv YWRlci0+cmVxdWVzdCgpLCBvbGREb2N1bWVudExvYWRlci5nZXQoKSwgZm9ybVN0YXRlLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FsbENvbnRpbnVlRnJhZ21lbnRTY3JvbGxBZnRl ck5hdmlnYXRpb25Qb2xpY3ksIHRoaXMpOworICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChGcmFt ZSogcGFyZW50ID0gbV9mcmFtZS0+dHJlZSgpLT5wYXJlbnQoKSkKKyAgICAgICAgICAgIGxvYWRl ci0+c2V0T3ZlcnJpZGVFbmNvZGluZyhwYXJlbnQtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigp LT5vdmVycmlkZUVuY29kaW5nKCkpOworCisgICAgICAgIHN0b3BQb2xpY3lDaGVjaygpOworICAg ICAgICBzZXRQb2xpY3lEb2N1bWVudExvYWRlcihsb2FkZXIpOwogCi0gICAgY2hlY2tOYXZpZ2F0 aW9uUG9saWN5KGxvYWRlci0+cmVxdWVzdCgpLCBsb2FkZXIsIGZvcm1TdGF0ZSwKLSAgICAgICAg Y2FsbENvbnRpbnVlTG9hZEFmdGVyTmF2aWdhdGlvblBvbGljeSwgdGhpcyk7CisgICAgICAgIGNo ZWNrTmF2aWdhdGlvblBvbGljeShsb2FkZXItPnJlcXVlc3QoKSwgbG9hZGVyLCBmb3JtU3RhdGUs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYWxsQ29udGludWVMb2FkQWZ0ZXJOYXZp Z2F0aW9uUG9saWN5LCB0aGlzKTsKKyAgICB9CiB9CiAKIC8vIEZJWE1FOiBJdCB3b3VsZCBiZSBu aWNlIGlmIHdlIGNvdWxkIGNvbGxhcHNlIHRoZXNlIGludG8gb25lIG9yIHR3byBmdW5jdGlvbnMu CkBAIC0yODA4LDcgKzI4MDYsNyBAQCBib29sIEZyYW1lTG9hZGVyOjpzaG91bGRSZWxvYWQoY29u c3QgS1VSTCYgY3VycmVudFVSTCwgY29uc3QgS1VSTCYgZGVzdGluYXRpb25VUgogICAgIC8vIFRo aXMgZnVuY3Rpb24gaW1wbGVtZW50cyB0aGUgcnVsZTogIkRvbid0IHJlbG9hZCBpZiBuYXZpZ2F0 aW5nIGJ5IGZyYWdtZW50IHdpdGhpbgogICAgIC8vIHRoZSBzYW1lIFVSTCwgYnV0IGRvIHJlbG9h ZCBpZiBnb2luZyB0byBhIG5ldyBVUkwgb3IgdG8gdGhlIHNhbWUgVVJMIHdpdGggbm8KICAgICAv LyBmcmFnbWVudCBpZGVudGlmaWVyIGF0IGFsbC4iCi0gICAgaWYgKCFjdXJyZW50VVJMLmhhc1Jl ZigpICYmICFkZXN0aW5hdGlvblVSTC5oYXNSZWYoKSkKKyAgICBpZiAoIWRlc3RpbmF0aW9uVVJM Lmhhc1JlZigpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICByZXR1cm4gIWVxdWFsSWdub3Jp bmdSZWYoY3VycmVudFVSTCwgZGVzdGluYXRpb25VUkwpOwogfQpAQCAtMzU3OSw2ICszNTc3LDI1 IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNvbnRpbnVlRnJhZ21lbnRTY3JvbGxBZnRlck5hdmlnYXRp b25Qb2xpY3koY29uc3QgUmVzb3VyY2VSZXF1CiAgICAgbV9jbGllbnQtPmRpZEZpbmlzaExvYWQo KTsKIH0KIAorYm9vbCBGcmFtZUxvYWRlcjo6c2hvdWxkU2Nyb2xsVG9BbmNob3IoYm9vbCBpc0Zv cm1TdWJtaXNzaW9uLCBGcmFtZUxvYWRUeXBlIG5ld0xvYWRUeXBlLCBjb25zdCBLVVJMJiBuZXdV UkwpCit7CisgICAgLy8gU2hvdWxkIHdlIGRvIGFuY2hvciBuYXZpZ2F0aW9uIHdpdGhpbiB0aGUg ZXhpc3RpbmcgY29udGVudD8KKworICAgIC8vIFdlIGRvbid0IGRvIHRoaXMgaWYgd2UgYXJlIHN1 Ym1pdHRpbmcgYSBmb3JtLCBleHBsaWNpdGx5IHJlbG9hZGluZywKKyAgICAvLyBjdXJyZW50bHkg ZGlzcGxheWluZyBhIGZyYW1lc2V0LCBvciBpZiB0aGUgbmV3IFVSTCBkb2VzIG5vdCBoYXZlIGEg ZnJhZ21lbnQuCisgICAgLy8gVGhlc2UgcnVsZXMgYXJlIGJhc2VkIG9uIHdoYXQgS0hUTUwgd2Fz IGRvaW5nIGluIEtIVE1MUGFydDo6b3BlblVSTC4KKworICAgIC8vIEZJWE1FOiBXaGF0IGFib3V0 IGxvYWQgdHlwZXMgb3RoZXIgdGhhbiBTdGFuZGFyZCBhbmQgUmVsb2FkPworCisgICAgcmV0dXJu ICFpc0Zvcm1TdWJtaXNzaW9uCisgICAgICAgICYmIG5ld0xvYWRUeXBlICE9IEZyYW1lTG9hZFR5 cGVSZWxvYWQKKyAgICAgICAgJiYgbmV3TG9hZFR5cGUgIT0gRnJhbWVMb2FkVHlwZVNhbWUKKyAg ICAgICAgJiYgIXNob3VsZFJlbG9hZCh1cmwoKSwgbmV3VVJMKQorICAgICAgICAvLyBXZSBkb24n dCB3YW50IHRvIGp1c3Qgc2Nyb2xsIGlmIGEgbGluayBmcm9tIHdpdGhpbiBhCisgICAgICAgIC8v IGZyYW1lc2V0IGlzIHRyeWluZyB0byByZWxvYWQgdGhlIGZyYW1lc2V0IGludG8gX3RvcC4KKyAg ICAgICAgJiYgIW1fZnJhbWUtPmlzRnJhbWVTZXQoKTsKK30KKwogdm9pZCBGcmFtZUxvYWRlcjo6 b3BlbmVkKCkKIHsKICAgICBpZiAobV9sb2FkVHlwZSA9PSBGcmFtZUxvYWRUeXBlU3RhbmRhcmQg JiYgbV9kb2N1bWVudExvYWRlci0+aXNDbGllbnRSZWRpcmVjdCgpKQpAQCAtNDE2MSw3ICs0MTc4 LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZEl0ZW0oSGlzdG9yeUl0ZW0qIGl0ZW0sIEZyYW1l TG9hZFR5cGUgbG9hZFR5cGUpCiAgICAgLy8gY2hlY2sgZm9yIGFsbCB0aGF0IGFzIGFuIGFkZGl0 aW9uYWwgb3B0aW1pemF0aW9uLgogICAgIC8vIFdlIGFsc28gZG8gbm90IGRvIGFuY2hvci1zdHls ZSBuYXZpZ2F0aW9uIGlmIHdlJ3JlIHBvc3RpbmcgYSBmb3JtLgogICAgIAotICAgIGlmICghZm9y bURhdGEgJiYgIXNob3VsZFJlbG9hZChpdGVtVVJMLCBjdXJyZW50VVJMKSAmJiB1cmxzTWF0Y2hJ dGVtKGl0ZW0pKSB7CisgICAgaWYgKCFmb3JtRGF0YSAmJiB1cmxzTWF0Y2hJdGVtKGl0ZW0pKSB7 CiAgICAgICAgIC8vIE11c3QgZG8gdGhpcyBtYWludGVuYW5jZSBoZXJlLCBzaW5jZSB3ZSBkb24n dCBnbyB0aHJvdWdoIGEgcmVhbCBwYWdlIHJlbG9hZAogICAgICAgICBzYXZlU2Nyb2xsUG9zaXRp b25BbmRWaWV3U3RhdGVUb0l0ZW0obV9jdXJyZW50SGlzdG9yeUl0ZW0uZ2V0KCkpOwogCmRpZmYg LS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuaAppbmRleCA3MmNmODkwLi42Yzc1OTEzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5oCisrKyBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKQEAg LTUxNiw2ICs1MTYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgY29udGlu dWVMb2FkQWZ0ZXJOZXdXaW5kb3dQb2xpY3koY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUGFzc1Jl ZlB0cjxGb3JtU3RhdGU+LCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgYm9vbCBzaG91bGRDb250 aW51ZSk7CiAgICAgICAgIHN0YXRpYyB2b2lkIGNhbGxDb250aW51ZUZyYWdtZW50U2Nyb2xsQWZ0 ZXJOYXZpZ2F0aW9uUG9saWN5KHZvaWQqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBQYXNzUmVm UHRyPEZvcm1TdGF0ZT4sIGJvb2wgc2hvdWxkQ29udGludWUpOwogICAgICAgICB2b2lkIGNvbnRp bnVlRnJhZ21lbnRTY3JvbGxBZnRlck5hdmlnYXRpb25Qb2xpY3koY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiwgYm9vbCBzaG91bGRDb250aW51ZSk7CisgICAgICAgIGJvb2wgc2hvdWxkU2Nyb2xsVG9B bmNob3IoYm9vbCBpc0Zvcm1TdWJtaXNzaW9uLCBGcmFtZUxvYWRUeXBlIG5ld0xvYWRUeXBlLCBj b25zdCBLVVJMJiBuZXdVUkwpOwogICAgICAgICB2b2lkIGFkZEhpc3RvcnlJdGVtRm9yRnJhZ21l bnRTY3JvbGwoKTsKIAogICAgICAgICB2b2lkIHN0b3BQb2xpY3lDaGVjaygpOwo=