109995 2013-02-15 17:51:49 -0800 LayoutTests/fast/encoding/parser-tests-*.html timeout with threaded HTML parser 2013-02-21 21:52:02 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110401 106127 1 abarth eric benjamin eric esprehn+autocc japhet lforschler ojan.autocc rniwa tonyg webkit.review.bot oldest_to_newest 834561 0 abarth 2013-02-15 17:51:49 -0800 These tests apparently also timeout in debug builds, which is making it difficult to debug what's going on. :) 834562 1 abarth 2013-02-15 17:52:43 -0800 The issue appears to be that TestRunner's m_topLoadingFrame isn't cleared, which results in the call to testRunner.notifyDone to be ignored. 834563 2 eric 2013-02-15 17:52:58 -0800 DumpRenderTree --no-timeout? I remebmer looking at these, it was the removal of a not-yet-fully loaded iframe which was causing the load event to never fire. At least that was before your load event fixes. WE have an email thread on the subject. 834564 3 eric 2013-02-15 17:53:37 -0800 sorry, irrc, the iframe was added and removed during onload, which caused the trouble. again in our email somewhere. 834568 4 abarth 2013-02-15 17:58:35 -0800 Interesting. In the Release case, there's a call to didFailLoad which clears the top loading frame. It seems like there should be a call to didFinishLoad instead indicating that the main frame actually finished loading. 834570 5 abarth 2013-02-15 18:06:22 -0800 == Reduction == <iframe id="test"></iframe> <script> testRunner.dumpAsText(); testRunner.waitUntilDone(); var frame = document.getElementById('test'); window.onload = function () { frame.src = 'resources/010.html'; } window.foo = function () { frame.remove(); testRunner.notifyDone(); }; </script> ... where 010.html is: <script>parent.foo()</script> 834573 6 abarth 2013-02-15 18:08:45 -0800 Good news: the reduction works in Debug as well, which means we actually use a real debugger. :) 834575 7 abarth 2013-02-15 18:15:19 -0800 The call to didFailLoad is coming from the call to FrameLoader::checkLoadComplete inside the FrameLoader::frameDetached call. 837814 8 eric 2013-02-20 15:10:07 -0800 We now understand what's going on here. Previously DocumentLoader::stopLoading() would think it was still loading (because it was on the stack and thus still had a main resource loader), and thus send an error callback to the embedder when removing the iframe. In the threaded case, the DocumentLoader believes the load is complete by the time the removeChild call is made on the iframe, and stopLoading() has code to guard against being called twice, if DocumentLoader::loading() is already false. Our current theory is that we might make DocumentLoader::loading() notice that the parser is still active and return true until it's done. This will require the parser to call checkCompleted() when it's done, but it already calls FrameLoader::checkCompleted() and could be made to call DocumentLoader::checkCompleted() as well if necessary. 837922 9 eric 2013-02-20 16:37:43 -0800 bug 110401 may fix this. 837953 10 eric 2013-02-20 17:01:46 -0800 I was just talking with Tony, and I worry that this bug could be confusing our DOMContentLoaded number. I'm not exactly sure where our DCL number is taken from, but I worry that it could not be including all parse time based on our debugging here. 838014 11 abarth 2013-02-20 17:56:37 -0800 It's good to be skeptical, but DOMContentLoaded should be triggered by the parser after processing EOF. In any case, we need to fix the correctness issues. :) 838951 12 189623 eric 2013-02-21 15:52:43 -0800 Created attachment 189623 Patch 838956 13 189623 abarth 2013-02-21 15:54:07 -0800 Comment on attachment 189623 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189623&action=review > Source/WebCore/loader/DocumentLoader.cpp:283 > + if (m_frame->document() && m_frame->document()->hasActiveParser()) You don't need to call checkComplete on the DocumentLoader when the last parser finishes? 838978 14 189630 eric 2013-02-21 16:19:37 -0800 Created attachment 189630 Patch for landing 839005 15 189630 webkit.review.bot 2013-02-21 16:41:20 -0800 Comment on attachment 189630 Patch for landing Clearing flags on attachment: 189630 Committed r143664: <http://trac.webkit.org/changeset/143664> 839006 16 webkit.review.bot 2013-02-21 16:41:25 -0800 All reviewed patches have been landed. Closing bug. 839069 17 benjamin 2013-02-21 17:38:06 -0800 Looks like this broke the Mac build on all bots. 839072 18 eric 2013-02-21 17:39:17 -0800 Shucks. Too bad the mac ews took over 24 hours to process the patch or I might have noticed. :p Investigating. 839077 19 eric 2013-02-21 17:42:24 -0800 (In reply to comment #18) > Shucks. Too bad the mac ews took over 24 hours to process the patch or I might have noticed. :p > > Investigating. I should be clear, my snarky remark was about the patch when it was attached to bug 110401. :) Anyway, Benjiman says he has a fix ready to land. Thank you! And thanks for letting me know. Hopefully this won't cause any test failures for Mac. I would not expect it to, but anything is possible. 839122 20 benjamin 2013-02-21 18:34:00 -0800 Most tests crash on WebKit1. Here is a backtrace (all of the one I have looked have the same backtrace): https://gist.github.com/BenjaminPoulain/5010267 839125 21 abarth 2013-02-21 18:38:56 -0800 Looks like a missing null check. Perhaps we should roll out? 839126 22 abarth 2013-02-21 18:40:28 -0800 We have the check for document but not for frame. 839130 23 eric 2013-02-21 18:49:10 -0800 We can easily roll out, or I'll try a speculative fix for wk1. 839135 24 eric 2013-02-21 18:56:21 -0800 Speculative fix landed as: Committed r143681: <http://trac.webkit.org/changeset/143681> 839216 25 rniwa 2013-02-21 21:52:02 -0800 This patch caused http/tests/security/feed-urls-from-remote.html to fail on Mac WK1: http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20-%20webkit.org&tests=http%2Ftests%2Fsecurity%2Ffeed-urls-from-remote.html 189623 2013-02-21 15:52:43 -0800 2013-02-21 16:19:34 -0800 Patch bug-109995-20130221154912.patch text/plain 5957 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmNlOWZjMzU0YzljMGI0 N2JhMTc3YzgxZDMzMWE3MTJmNzdlNjI5Ny4uMDZiNWFjMDc5N2VkNTRkMmJhMzU3M2VjNTM3MzA0 NDQ4OGEwODEwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDEzLTAyLTIxICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBMYXlvdXRUZXN0cy9mYXN0L2Vu Y29kaW5nL3BhcnNlci10ZXN0cy0qLmh0bWwgdGltZW91dCB3aXRoIHRocmVhZGVkIEhUTUwgcGFy c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk5 OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0 aGUgY2FzZSB3aGVyZSBkdXJpbmcgbWFpbiBkb2N1bWVudCBvbmxvYWQsIHdlCisgICAgICAgIGxv YWQgYSBuZXcgaWZyYW1lLCBhbmQgdGhlbiBmcm9tIHdpdGhpbiB0aGF0IGlmcmFtZQorICAgICAg ICB3ZSBydW4gc2NyaXB0IHRvIHJlbW92ZSB0aGUgaWZyYW1lIGFuZCBjYWxsIHRlc3RSdW5uZXIu bm90aWZ5RG9uZSgpCisgICAgICAgIHRoZSBub3RpZnlEb25lKCkgd2lsbCBub3QgY29ycmVjdGx5 IGR1bXAgYmVjYXVzZQorICAgICAgICB0aGUgdGVzdFJ1bm5lciBkb2VzIG5vdCB5ZXQgcmVhbGl6 ZSB0aGF0IHRoZSBtYWluIHJlc291cmNlCisgICAgICAgIGhhcyBjb21wbGV0ZWQgbG9hZGluZy4K KworICAgICAgICBJbiB0aGUgbWFpbi10aHJlYWQgcGFyc2VyLCB0aGUgdGVzdFJ1bm5lciBkb2Vz IGNvcnJlY3RseSBrbm93CisgICAgICAgIHRoYXQgdGhlIG1haW4gdGhyZWFkIGhhcyBjb21wbGV0 ZWQsIGJlY2F1c2UgcmVtb3ZpbmcgdGhlIGlmcmFtZQorICAgICAgICBjYXVzZXMgYSBkaWRGYWls TG9hZCBjYWxsYmFjayB0byB0aGUgZW1iZWRkZXIsIGJlY2F1c2Ugd2hlbgorICAgICAgICB0aGUg aWZyYW1lIGlzIGJlaW5nIHJlbW92ZWQsIHRoZSBEb2N1bWVudExvYWRlciBmb3IgdGhhdCBpZnJh bWUKKyAgICAgICAgaXMgc3RpbGwgb24gdGhlIHN0YWNrIGFuZCBiZWxpZXZlJ3MgaXRzIGxvYWRp bmcKKyAgICAgICAgKGJlY2F1c2UgaXQgaGFzIGEgTWFpblJlc291cmNlTG9hZGVyIHdoaWNoIGlz IGFsc28gb24gdGhlIHN0YWNrCisgICAgICAgIGRlbGl2ZXJpbmcgdXMgdGhlIGJ5dGVzIHdoaWNo IGNvbnRhaW4gdGhpcyBpbmxpbmUgc2NyaXB0KS4KKworICAgICAgICBJbiB0aGUgdGhyZWFkZWQt cGFyc2VyIGNhc2UsIHRoZSBEb2N1bWVudExvYWRlciBhbmQgTWFpblJlc291cmNlTG9hZGVyCisg ICAgICAgIGFyZSBubyBsb25nZXIgb24gdGhlIHN0YWNrLCBhcyB3ZSBhcmUgcGFyc2luZyB0aGUg aWZyYW1lIGFzeW5jaHJvbm91c2x5CisgICAgICAgIGFmdGVyIGFsbCB0aGUgYnl0ZXMgaGF2ZSBi ZWVuIGRlbGl2ZXJlZCwgYW5kIHRoZSBNYWluUmVzb3VyY2VMb2FkZXIgZGVzdHJveWVkLgorICAg ICAgICBUaHVzIHdoZW4gRG9jdW1lbnRMb2FkZXI6OnN0b3BMb2FkaW5nKCkgaXMgY2FsbGVkLCBs b2FkaW5nKCkgcmV0dXJucworICAgICAgICBmYWxzZSwgYW5kIGl0IHJldHVybnMgZWFybHkuICBP bmUgbWlnaHQgYXJndWUgdGhhdCB3ZSBzaG91bGQgcmVtb3ZlIHRoYXQKKyAgICAgICAgZWFybHkg cmV0dXJuIGVudGlyZWx5LCBidXQgaXQgc2VlbWVkIHNhZmVyIHRvIGV4dGVuZCB0aGUgaWRlYSBv ZgorICAgICAgICB3aGVuIHdlJ3JlIGxvYWRpbmcgdG8gaW5jbHVkZSB0aGUgdGltZSB3aGVuIHRo ZSBwYXJzZXIgaXMgYWN0aXZlLgorCisgICAgICAgIFRoaXMgcGF0Y2ggc29sdmVzIHRoaXMgYnkg dGVhY2hpbmcgdGhlIERvY3VtZW50TG9hZGVyIHRoYXQgaXQgaXMgc3RpbGwKKyAgICAgICAgImxv YWRpbmciIHNvIGxvbmcgYXMgdGhlIHBhcnNlciBpcyBzdGlsbCBhY3RpdmUuCisKKyAgICAgICAg VGhpcyBjYXVzZXMgaHR0cC90ZXN0cy9zZWN1cml0eS9mZWVkLXVybHMtZnJvbS1yZW1vdGUuaHRt bCB0byB0aW1lb3V0CisgICAgICAgIG9uIGNocm9taXVtIChidXQgbm8gb3RoZXIgcGxhdGZvcm1z IHRoYXQgSSdtIGF3YXJlIG9mKS4gIEkgYmVsaWV2ZSB0aGlzCisgICAgICAgIGlzIGR1ZSB0byBh IGJ1ZyBpbiBvdXIgRFJUIGltcGxlbWVudGF0aW9uIGluIHRoZSBwb2xpY3lEZWxlZ2F0ZSBjYXNl CisgICAgICAgICh3aGljaCBBRkFJSyBpcyBub3QgYSBjb2RlcGF0aCB3aGljaCBDaHJvbWl1bSBh Y3R1YWxseSB1c2VzIGluIHRoZSB3aWxkKS4KKyAgICAgICAgVGhlIHRlc3QgYWxyZWFkeSB0aW1l cyBvdXQgb24gVE9UIGlmIHlvdSByZW1vdmUgdGhlIHNldEN1c3RvbVBvbGljeURlbGVnYXRlIGNh bGxzIQorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkRvY3VtZW50TG9hZGVyOjppc0xvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZSk6Cisg ICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmg6CisgICAgICAgIChEb2N1bWVudExvYWRl cik6CisKIDIwMTMtMDItMjEgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAg ICAgIFBsdWctaW4gc25hcHNob3R0aW5nIGNvZGUgYWx3YXlzIGFjY2VwdHMgZmlyc3Qgc25hcHNo b3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IDgwNTM3ZmJj ZDNhNjYyMGUwNWRjZjliMDU3NzI1MTI1ZGY4YTBjN2IuLjM2YTIxNGJlODJmNjJkMzNiOWMxMWM1 ZTYxOTcwNjYwMGYzN2U1NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVy LmNwcApAQCAtMjc4LDYgKzI3OCwxMyBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjpjb21taXRJZlJl YWR5KCkKICAgICB9CiB9CiAKK2Jvb2wgRG9jdW1lbnRMb2FkZXI6OmlzTG9hZGluZygpIGNvbnN0 Cit7CisgICAgaWYgKG1fZnJhbWUtPmRvY3VtZW50KCkgJiYgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+ aGFzQWN0aXZlUGFyc2VyKCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBpc0xv YWRpbmdNYWluUmVzb3VyY2UoKSB8fCAhbV9zdWJyZXNvdXJjZUxvYWRlcnMuaXNFbXB0eSgpIHx8 ICFtX3BsdWdJblN0cmVhbUxvYWRlcnMuaXNFbXB0eSgpOworfQorCiB2b2lkIERvY3VtZW50TG9h ZGVyOjpmaW5pc2hlZExvYWRpbmcoKQogewogICAgIGNvbW1pdElmUmVhZHkoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKaW5kZXggOGI4NDNlNDA0NTJmMGVlM2UwZWI2Y2Ji NDk0ODY1MTJjMWUzY2VjZi4uN2YwZTY2ODA5NTU3NWRhMDkwYWU5MjNmNjhiM2YzMTE5OGY0Nzc3 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKQEAgLTExNCw3ICsxMTQs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc3RvcExvYWRpbmcoKTsKICAg ICAgICAgdm9pZCBzZXRDb21taXR0ZWQoYm9vbCBjb21taXR0ZWQpIHsgbV9jb21taXR0ZWQgPSBj b21taXR0ZWQ7IH0KICAgICAgICAgYm9vbCBpc0NvbW1pdHRlZCgpIGNvbnN0IHsgcmV0dXJuIG1f Y29tbWl0dGVkOyB9Ci0gICAgICAgIGJvb2wgaXNMb2FkaW5nKCkgY29uc3QgeyByZXR1cm4gaXNM b2FkaW5nTWFpblJlc291cmNlKCkgfHwgIW1fc3VicmVzb3VyY2VMb2FkZXJzLmlzRW1wdHkoKSB8 fCAhbV9wbHVnSW5TdHJlYW1Mb2FkZXJzLmlzRW1wdHkoKTsgfQorICAgICAgICBib29sIGlzTG9h ZGluZygpIGNvbnN0OwogICAgICAgICB2b2lkIHJlY2VpdmVkRGF0YShjb25zdCBjaGFyKiwgaW50 KTsKICAgICAgICAgdm9pZCBzZXR1cEZvclJlcGxhY2UoKTsKICAgICAgICAgdm9pZCBmaW5pc2hl ZExvYWRpbmcoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCAyODhkZjk3MDFkNDNiMjMxN2JlOTZiN2ExZTU3ZTFmOTM1NDJm ODQzLi4zYmJhNGMyYTgyMzIzNDAwYWQ2NDI0MjI3YzBmOWYzMjg1ODUwZTZhIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTMtMDItMjEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgor CisgICAgICAgIExheW91dFRlc3RzL2Zhc3QvZW5jb2RpbmcvcGFyc2VyLXRlc3RzLSouaHRtbCB0 aW1lb3V0IHdpdGggdGhyZWFkZWQgSFRNTCBwYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTk5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hcmsgaHR0cC90ZXN0cy9zZWN1cml0eS9mZWVkLXVy bHMtZnJvbS1yZW1vdGUuaHRtbCBhcyB0aW1lb3V0IG9uIGNocm9taXVtLgorICAgICAgICBJIGJl bGlldmUgdGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gb3VyIERSVCBpbXBsZW1lbnRhdGlvbiBpbiB0 aGUgcG9saWN5RGVsZWdhdGUgY2FzZQorICAgICAgICAod2hpY2ggQUZBSUsgaXMgbm90IGEgY29k ZXBhdGggd2hpY2ggQ2hyb21pdW0gYWN0dWFsbHkgdXNlcyBpbiB0aGUgd2lsZCkuCisgICAgICAg IFRoZSB0ZXN0IGFscmVhZHkgdGltZXMgb3V0IG9uIFRPVCBpZiB5b3UgcmVtb3ZlIHRoZSBzZXRD dXN0b21Qb2xpY3lEZWxlZ2F0ZSBjYWxscy4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTMtMDItMjEgIFBoaWxpcCBSb2dlcnMgIDxwZHJAZ29v Z2xlLmNvbT4KIAogICAgICAgICBSZWJhc2VsaW5lIDQgU1ZHIHRlc3RzIGFmdGVyIGFuIGFzcGVj dCByYXRpbyBjaGFuZ2UgaW4gcjE0MzM4OQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vY2hyb21pdW0vVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9t aXVtL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMjNiZTc5MjljNmY5YThmOWFkOThmNjk4OGI0YTEw OTdiOWM1OWI5Yi4uNTc3NmVhZTI3OTEyYTQ2MWFjOTY2YTE5YTIyNzY1ZGY1ZGQ2NjVjZiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVjdGF0aW9ucwor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9UZXN0RXhwZWN0YXRpb25zCkBAIC01 ODYsNiArNTg2LDggQEAgaHR0cC90ZXN0cy9zZWN1cml0eS9zdG9yYWdlLWJsb2NraW5nLWxvb3Nl bmVkLXNoYXJlZC13b3JrZXIuaHRtbCBbIFdvbnRGaXggXQogaHR0cC90ZXN0cy9zZWN1cml0eS9z dG9yYWdlLWJsb2NraW5nLXN0cmVuZ3RoZW5lZC1zaGFyZWQtd29ya2VyLmh0bWwgWyBXb250Rml4 IF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2Jhc2ljcy1zaGFyZWQtd29ya2Vycy5odG1sIFsgV29udEZp eCBdCiAKK3dlYmtpdC5vcmcvYi8xMTA0MDEgaHR0cC90ZXN0cy9zZWN1cml0eS9mZWVkLXVybHMt ZnJvbS1yZW1vdGUuaHRtbCBbIFRpbWVvdXQgXQorCiAjIHRlc3Rfc2hlbGwgZG9lcyBub3Qgc3Vw cG9ydCBtZXNzYWdlIHBvcnRzCiB3ZWJraXQub3JnL2IvNzQ0NTkgZmFzdC93b3JrZXJzL3Rlcm1p bmF0aW9uLXdpdGgtcG9ydC1tZXNzYWdlcy5odG1sCiB3ZWJraXQub3JnL2IvNzQ0NTkgZmFzdC93 b3JrZXJzL3dvcmtlci1jbG9uZXBvcnQuaHRtbAo= 189630 2013-02-21 16:19:37 -0800 2013-02-21 16:41:20 -0800 Patch for landing bug-109995-20130221161607.patch text/plain 7247 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmNlOWZjMzU0YzljMGI0 N2JhMTc3YzgxZDMzMWE3MTJmNzdlNjI5Ny4uZTgxYjJkMDg4OTg0OTVjZTdiZmI5ZDY1MDM5NmJj YmNkN2FjMmRiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDEzLTAyLTIxICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBMYXlvdXRUZXN0cy9mYXN0L2Vu Y29kaW5nL3BhcnNlci10ZXN0cy0qLmh0bWwgdGltZW91dCB3aXRoIHRocmVhZGVkIEhUTUwgcGFy c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk5 OTUKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIEluIHRoZSBj YXNlIHdoZXJlIGR1cmluZyBtYWluIGRvY3VtZW50IG9ubG9hZCwgd2UKKyAgICAgICAgbG9hZCBh IG5ldyBpZnJhbWUsIGFuZCB0aGVuIGZyb20gd2l0aGluIHRoYXQgaWZyYW1lCisgICAgICAgIHdl IHJ1biBzY3JpcHQgdG8gcmVtb3ZlIHRoZSBpZnJhbWUgYW5kIGNhbGwgdGVzdFJ1bm5lci5ub3Rp ZnlEb25lKCkKKyAgICAgICAgdGhlIG5vdGlmeURvbmUoKSB3aWxsIG5vdCBjb3JyZWN0bHkgZHVt cCBiZWNhdXNlCisgICAgICAgIHRoZSB0ZXN0UnVubmVyIGRvZXMgbm90IHlldCByZWFsaXplIHRo YXQgdGhlIG1haW4gcmVzb3VyY2UKKyAgICAgICAgaGFzIGNvbXBsZXRlZCBsb2FkaW5nLgorCisg ICAgICAgIEluIHRoZSBtYWluLXRocmVhZCBwYXJzZXIsIHRoZSB0ZXN0UnVubmVyIGRvZXMgY29y cmVjdGx5IGtub3cKKyAgICAgICAgdGhhdCB0aGUgbWFpbiB0aHJlYWQgaGFzIGNvbXBsZXRlZCwg YmVjYXVzZSByZW1vdmluZyB0aGUgaWZyYW1lCisgICAgICAgIGNhdXNlcyBhIGRpZEZhaWxMb2Fk IGNhbGxiYWNrIHRvIHRoZSBlbWJlZGRlciwgYmVjYXVzZSB3aGVuCisgICAgICAgIHRoZSBpZnJh bWUgaXMgYmVpbmcgcmVtb3ZlZCwgdGhlIERvY3VtZW50TG9hZGVyIGZvciB0aGF0IGlmcmFtZQor ICAgICAgICBpcyBzdGlsbCBvbiB0aGUgc3RhY2sgYW5kIGJlbGlldmUncyBpdHMgbG9hZGluZwor ICAgICAgICAoYmVjYXVzZSBpdCBoYXMgYSBNYWluUmVzb3VyY2VMb2FkZXIgd2hpY2ggaXMgYWxz byBvbiB0aGUgc3RhY2sKKyAgICAgICAgZGVsaXZlcmluZyB1cyB0aGUgYnl0ZXMgd2hpY2ggY29u dGFpbiB0aGlzIGlubGluZSBzY3JpcHQpLgorCisgICAgICAgIEluIHRoZSB0aHJlYWRlZC1wYXJz ZXIgY2FzZSwgdGhlIERvY3VtZW50TG9hZGVyIGFuZCBNYWluUmVzb3VyY2VMb2FkZXIKKyAgICAg ICAgYXJlIG5vIGxvbmdlciBvbiB0aGUgc3RhY2ssIGFzIHdlIGFyZSBwYXJzaW5nIHRoZSBpZnJh bWUgYXN5bmNocm9ub3VzbHkKKyAgICAgICAgYWZ0ZXIgYWxsIHRoZSBieXRlcyBoYXZlIGJlZW4g ZGVsaXZlcmVkLCBhbmQgdGhlIE1haW5SZXNvdXJjZUxvYWRlciBkZXN0cm95ZWQuCisgICAgICAg IFRodXMgd2hlbiBEb2N1bWVudExvYWRlcjo6c3RvcExvYWRpbmcoKSBpcyBjYWxsZWQsIGxvYWRp bmcoKSByZXR1cm5zCisgICAgICAgIGZhbHNlLCBhbmQgaXQgcmV0dXJucyBlYXJseS4gIE9uZSBt aWdodCBhcmd1ZSB0aGF0IHdlIHNob3VsZCByZW1vdmUgdGhhdAorICAgICAgICBlYXJseSByZXR1 cm4gZW50aXJlbHksIGJ1dCBpdCBzZWVtZWQgc2FmZXIgdG8gZXh0ZW5kIHRoZSBpZGVhIG9mCisg ICAgICAgIHdoZW4gd2UncmUgbG9hZGluZyB0byBpbmNsdWRlIHRoZSB0aW1lIHdoZW4gdGhlIHBh cnNlciBpcyBhY3RpdmUuCisKKyAgICAgICAgVGhpcyBwYXRjaCBzb2x2ZXMgdGhpcyBieSB0ZWFj aGluZyB0aGUgRG9jdW1lbnRMb2FkZXIgdGhhdCBpdCBpcyBzdGlsbAorICAgICAgICAibG9hZGlu ZyIgc28gbG9uZyBhcyB0aGUgcGFyc2VyIGlzIHN0aWxsIGFjdGl2ZS4KKworICAgICAgICBBbHNv IGFkZGVkIGEgY2FsbCB0byBEb2N1bWVudExvYWRlcjo6Y2hlY2tMb2FkQ29tcGxldGUgZnJvbQor ICAgICAgICBEb2N1bWVudDo6ZGVjcmVtZW50QWN0aXZlUGFyc2VyQ291bnQgd2hpY2ggc2VlbWVk IHRvIGNhdXNlCisgICAgICAgIGh0dHAvdGVzdHMvbXVsdGlwYXJ0L3BvbGljeS1pZ25vcmUtY3Jh c2gucGhwIHRvIHBhc3MuCisKKyAgICAgICAgVGhpcyBjYXVzZXMgaHR0cC90ZXN0cy9zZWN1cml0 eS9mZWVkLXVybHMtZnJvbS1yZW1vdGUuaHRtbCB0byB0aW1lb3V0CisgICAgICAgIG9uIGNocm9t aXVtIChidXQgbm8gb3RoZXIgcGxhdGZvcm1zIHRoYXQgSSdtIGF3YXJlIG9mKS4gIEkgYmVsaWV2 ZSB0aGlzCisgICAgICAgIGlzIGR1ZSB0byBhIGJ1ZyBpbiBvdXIgRFJUIGltcGxlbWVudGF0aW9u IGluIHRoZSBwb2xpY3lEZWxlZ2F0ZSBjYXNlCisgICAgICAgICh3aGljaCBBRkFJSyBpcyBub3Qg YSBjb2RlcGF0aCB3aGljaCBDaHJvbWl1bSBhY3R1YWxseSB1c2VzIGluIHRoZSB3aWxkKS4KKyAg ICAgICAgVGhlIHRlc3QgYWxyZWFkeSB0aW1lcyBvdXQgb24gVE9UIGlmIHlvdSByZW1vdmUgdGhl IHNldEN1c3RvbVBvbGljeURlbGVnYXRlIGNhbGxzIQorCisgICAgICAgICogbG9hZGVyL0RvY3Vt ZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjppc0xvYWRp bmcpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVy Lmg6CisgICAgICAgIChEb2N1bWVudExvYWRlcik6CisKIDIwMTMtMDItMjEgIERlYW4gSmFja3Nv biAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFBsdWctaW4gc25hcHNob3R0aW5nIGNvZGUg YWx3YXlzIGFjY2VwdHMgZmlyc3Qgc25hcHNob3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4 IDAyYzkyYTFjYjk0MDA0OWZjMGY5ZjUzMzY4OWY0NGNhYmNkNDZkN2UuLjgwN2I1YTg5OTZlODYw MWFmYTE4YzU3Y2JjNGIxYzM0Njk1NTFhMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAt NTc3Myw2ICs1NzczLDcgQEAgdm9pZCBEb2N1bWVudDo6ZGVjcmVtZW50QWN0aXZlUGFyc2VyQ291 bnQoKQogICAgIC0tbV9hY3RpdmVQYXJzZXJDb3VudDsKICAgICBpZiAoIWZyYW1lKCkpCiAgICAg ICAgIHJldHVybjsKKyAgICBsb2FkZXIoKS0+Y2hlY2tMb2FkQ29tcGxldGUoKTsKICAgICBmcmFt ZSgpLT5sb2FkZXIoKS0+Y2hlY2tMb2FkQ29tcGxldGUoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXggODA1MzdmYmNkM2E2NjIwZTA1ZGNmOWIwNTc3 MjUxMjVkZjhhMGM3Yi4uMzZhMjE0YmU4MmY2MmQzM2I5YzExYzVlNjE5NzA2NjAwZjM3ZTU2YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC0yNzgsNiArMjc4 LDEzIEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmNvbW1pdElmUmVhZHkoKQogICAgIH0KIH0KIAor Ym9vbCBEb2N1bWVudExvYWRlcjo6aXNMb2FkaW5nKCkgY29uc3QKK3sKKyAgICBpZiAobV9mcmFt ZS0+ZG9jdW1lbnQoKSAmJiBtX2ZyYW1lLT5kb2N1bWVudCgpLT5oYXNBY3RpdmVQYXJzZXIoKSkK KyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGlzTG9hZGluZ01haW5SZXNvdXJjZSgp IHx8ICFtX3N1YnJlc291cmNlTG9hZGVycy5pc0VtcHR5KCkgfHwgIW1fcGx1Z0luU3RyZWFtTG9h ZGVycy5pc0VtcHR5KCk7Cit9CisKIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmZpbmlzaGVkTG9hZGlu ZygpCiB7CiAgICAgY29tbWl0SWZSZWFkeSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0RvY3VtZW50TG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRM b2FkZXIuaAppbmRleCA4Yjg0M2U0MDQ1MmYwZWUzZTBlYjZjYmI0OTQ4NjUxMmMxZTNjZWNmLi4w ZTVjZWExNDFhMzBiYjM5M2M0YWZhZWRhNzBlM2FmNDE3ZTNiYzBmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuaApAQCAtMTE0LDcgKzExNCw3IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgdm9pZCBzdG9wTG9hZGluZygpOwogICAgICAgICB2b2lkIHNldENvbW1p dHRlZChib29sIGNvbW1pdHRlZCkgeyBtX2NvbW1pdHRlZCA9IGNvbW1pdHRlZDsgfQogICAgICAg ICBib29sIGlzQ29tbWl0dGVkKCkgY29uc3QgeyByZXR1cm4gbV9jb21taXR0ZWQ7IH0KLSAgICAg ICAgYm9vbCBpc0xvYWRpbmcoKSBjb25zdCB7IHJldHVybiBpc0xvYWRpbmdNYWluUmVzb3VyY2Uo KSB8fCAhbV9zdWJyZXNvdXJjZUxvYWRlcnMuaXNFbXB0eSgpIHx8ICFtX3BsdWdJblN0cmVhbUxv YWRlcnMuaXNFbXB0eSgpOyB9CisgICAgICAgIGJvb2wgaXNMb2FkaW5nKCkgY29uc3Q7CiAgICAg ICAgIHZvaWQgcmVjZWl2ZWREYXRhKGNvbnN0IGNoYXIqLCBpbnQpOwogICAgICAgICB2b2lkIHNl dHVwRm9yUmVwbGFjZSgpOwogICAgICAgICB2b2lkIGZpbmlzaGVkTG9hZGluZygpOwpAQCAtMjQ3 LDYgKzI0Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgQXBwbGljYXRpb25DYWNo ZUhvc3QqIGFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkgY29uc3QgeyByZXR1cm4gbV9hcHBsaWNhdGlv bkNhY2hlSG9zdC5nZXQoKTsgfQogCiAgICAgICAgIHZpcnR1YWwgdm9pZCByZXBvcnRNZW1vcnlV c2FnZShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CisgICAgICAgIHZvaWQgY2hlY2tMb2FkQ29t cGxldGUoKTsKIAogICAgIHByb3RlY3RlZDoKICAgICAgICAgRG9jdW1lbnRMb2FkZXIoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU3Vic3RpdHV0ZURhdGEmKTsKQEAgLTI1Nyw3ICsyNTgs NiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgY29tbWl0SWZSZWFkeSgpOwog ICAgICAgICB2b2lkIHNldE1haW5Eb2N1bWVudEVycm9yKGNvbnN0IFJlc291cmNlRXJyb3ImKTsK ICAgICAgICAgdm9pZCBjb21taXRMb2FkKGNvbnN0IGNoYXIqLCBpbnQpOwotICAgICAgICB2b2lk IGNoZWNrTG9hZENvbXBsZXRlKCk7CiAgICAgICAgIHZvaWQgY2xlYXJNYWluUmVzb3VyY2VMb2Fk ZXIoKTsKICAgICAgICAgCiAgICAgICAgIGJvb2wgbWF5YmVDcmVhdGVBcmNoaXZlKCk7CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggMjg4ZGY5NzAxZDQzYjIzMTdiZTk2YjdhMWU1N2UxZjkzNTQyZjg0My4uYzZhYzUzNTRkMjk1 YjQ4MDQ3ZjUzYjNiNmRjYWVjNzM3MDhiZGI3ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEz LTAyLTIxICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBMYXlvdXRU ZXN0cy9mYXN0L2VuY29kaW5nL3BhcnNlci10ZXN0cy0qLmh0bWwgdGltZW91dCB3aXRoIHRocmVh ZGVkIEhUTUwgcGFyc2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDk5OTUKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAg ICAgIE1hcmsgaHR0cC90ZXN0cy9zZWN1cml0eS9mZWVkLXVybHMtZnJvbS1yZW1vdGUuaHRtbCBh cyB0aW1lb3V0IG9uIGNocm9taXVtLgorICAgICAgICBJIGJlbGlldmUgdGhpcyBpcyBkdWUgdG8g YSBidWcgaW4gb3VyIERSVCBpbXBsZW1lbnRhdGlvbiBpbiB0aGUgcG9saWN5RGVsZWdhdGUgY2Fz ZQorICAgICAgICAod2hpY2ggQUZBSUsgaXMgbm90IGEgY29kZXBhdGggd2hpY2ggQ2hyb21pdW0g YWN0dWFsbHkgdXNlcyBpbiB0aGUgd2lsZCkuCisgICAgICAgIFRoZSB0ZXN0IGFscmVhZHkgdGlt ZXMgb3V0IG9uIFRPVCBpZiB5b3UgcmVtb3ZlIHRoZSBzZXRDdXN0b21Qb2xpY3lEZWxlZ2F0ZSBj YWxscy4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1Rlc3RFeHBlY3RhdGlvbnM6CisK IDIwMTMtMDItMjEgIFBoaWxpcCBSb2dlcnMgIDxwZHJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBS ZWJhc2VsaW5lIDQgU1ZHIHRlc3RzIGFmdGVyIGFuIGFzcGVjdCByYXRpbyBjaGFuZ2UgaW4gcjE0 MzM4OQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVj dGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggMjNiZTc5MjljNmY5YThmOWFkOThmNjk4OGI0YTEwOTdiOWM1OWI5Yi4uNTc3NmVhZTI3 OTEyYTQ2MWFjOTY2YTE5YTIyNzY1ZGY1ZGQ2NjVjZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9jaHJvbWl1bS9UZXN0RXhwZWN0YXRpb25zCkBAIC01ODYsNiArNTg2LDggQEAgaHR0cC90 ZXN0cy9zZWN1cml0eS9zdG9yYWdlLWJsb2NraW5nLWxvb3NlbmVkLXNoYXJlZC13b3JrZXIuaHRt bCBbIFdvbnRGaXggXQogaHR0cC90ZXN0cy9zZWN1cml0eS9zdG9yYWdlLWJsb2NraW5nLXN0cmVu Z3RoZW5lZC1zaGFyZWQtd29ya2VyLmh0bWwgWyBXb250Rml4IF0KIHN0b3JhZ2UvaW5kZXhlZGRi L2Jhc2ljcy1zaGFyZWQtd29ya2Vycy5odG1sIFsgV29udEZpeCBdCiAKK3dlYmtpdC5vcmcvYi8x MTA0MDEgaHR0cC90ZXN0cy9zZWN1cml0eS9mZWVkLXVybHMtZnJvbS1yZW1vdGUuaHRtbCBbIFRp bWVvdXQgXQorCiAjIHRlc3Rfc2hlbGwgZG9lcyBub3Qgc3VwcG9ydCBtZXNzYWdlIHBvcnRzCiB3 ZWJraXQub3JnL2IvNzQ0NTkgZmFzdC93b3JrZXJzL3Rlcm1pbmF0aW9uLXdpdGgtcG9ydC1tZXNz YWdlcy5odG1sCiB3ZWJraXQub3JnL2IvNzQ0NTkgZmFzdC93b3JrZXJzL3dvcmtlci1jbG9uZXBv cnQuaHRtbAo=