141788 2015-02-18 18:54:06 -0800 REGRESSION(r177738): Clearing the PageCache no longer clears the PageCache. 2015-03-06 15:50:50 -0800 1 1 1 Unclassified WebKit History 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 139921 1 kling kling barraclough cdumez commit-queue darin kling oldest_to_newest 1070317 0 kling 2015-02-18 18:54:06 -0800 We got bit by the TemporaryChange trap! 1070320 1 246874 kling 2015-02-18 18:58:45 -0800 Created attachment 246874 Patch 1070321 2 246874 cdumez 2015-02-18 19:08:47 -0800 Comment on attachment 246874 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246874&action=review > LayoutTests/fast/history/page-cache-clearing.html:1 > +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> <!DOCTYPE html> ? > LayoutTests/fast/history/page-cache-clearing.html:29 > + window.testRunner.notifyDone(); This is redundant, I believe finishJSTest() already does that. > LayoutTests/fast/history/page-cache-clearing.html:38 > + window.testRunner.notifyDone(); This is redundant, I believe finishJSTest() already does that. > LayoutTests/fast/history/page-cache-clearing.html:47 > + window.testRunner.waitUntilDone(); window.jsTestIsAsync = true should already take care of this. 1070322 3 246874 cdumez 2015-02-18 19:11:07 -0800 Comment on attachment 246874 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246874&action=review > LayoutTests/fast/history/page-cache-clearing.html:8 > +<div id="console"></div> This should not be needed. > LayoutTests/fast/history/page-cache-clearing.html:24 > + if (cachedPageCountBefore != 0 || cachedPageCountAfter == 0) Do you mean && ? > LayoutTests/fast/history/page-cache-clearing.html:36 > + debug("FAIL - Page did not enter the page cache."); testFailed("Page did not enter the page cache") ? 1070324 4 246874 cdumez 2015-02-18 19:15:01 -0800 Comment on attachment 246874 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246874&action=review > LayoutTests/fast/history/page-cache-clearing.html:46 > + window.testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1); This doesn't really need to be done in the onload handler. > LayoutTests/fast/history/page-cache-clearing.html:51 > + setTimeout(function() { Do we really need this setTimeout. Cannot we simply set href in the onload handler? 1070332 5 246877 kling 2015-02-18 21:16:52 -0800 Created attachment 246877 Patch for landing Fixed the passing condition in the test as pointed out by Chris. 1070334 6 246877 cdumez 2015-02-18 21:20:43 -0800 Comment on attachment 246877 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=246877&action=review > LayoutTests/fast/history/page-cache-clearing.html:19 > + debug("Cached page count before clearing: " + cachedPageCountBefore); Isn't printing the pageCount here dangerous? How do we know there is always the same amount of pages in the page cache when running this test? > LayoutTests/fast/history/page-cache-clearing.html:29 > + window.testRunner.notifyDone(); still redundant. > LayoutTests/fast/history/page-cache-clearing.html:38 > + window.testRunner.notifyDone(); still redundant. > LayoutTests/fast/history/page-cache-clearing.html:47 > + window.testRunner.waitUntilDone(); still redundant. 1070336 7 kling 2015-02-18 21:28:12 -0800 (In reply to comment #6) > Comment on attachment 246877 [details] > Patch for landing > > View in context: > https://bugs.webkit.org/attachment.cgi?id=246877&action=review > > > LayoutTests/fast/history/page-cache-clearing.html:19 > > + debug("Cached page count before clearing: " + cachedPageCountBefore); > > Isn't printing the pageCount here dangerous? How do we know there is always > the same amount of pages in the page cache when running this test? AFAIK the page cache is disabled between tests, as part of the "reset everything between tests so conditions are consistent" mechanism. Sent from my iThing. 1070338 8 cdumez 2015-02-18 21:37:34 -0800 This breaks Windows build due to missing symbol export according to EWS. 1070346 9 246877 commit-queue 2015-02-18 22:07:56 -0800 Comment on attachment 246877 Patch for landing Clearing flags on attachment: 246877 Committed r180337: <http://trac.webkit.org/changeset/180337> 1070347 10 commit-queue 2015-02-18 22:08:00 -0800 All reviewed patches have been landed. Closing bug. 1070348 11 cdumez 2015-02-18 22:18:41 -0800 Windows build fix landed in <http://trac.webkit.org/changeset/180338>. 1070352 12 cdumez 2015-02-18 22:37:00 -0800 Reopening to attach new patch. 1070353 13 246882 cdumez 2015-02-18 22:37:02 -0800 Created attachment 246882 Patch 1070354 14 cdumez 2015-02-18 22:38:00 -0800 Attaching a follow-up patch to clean up the layout test a bit. 1070358 15 246882 kling 2015-02-18 22:54:22 -0800 Comment on attachment 246882 Patch r=me Generally speaking I like tests to be a bit idiosyncratic since that increases our general code coverage. That said I don't mind these changes. And thanks for fixing the windows build! 1070362 16 246882 commit-queue 2015-02-18 23:37:22 -0800 Comment on attachment 246882 Patch Clearing flags on attachment: 246882 Committed r180339: <http://trac.webkit.org/changeset/180339> 1070363 17 commit-queue 2015-02-18 23:37:28 -0800 All reviewed patches have been landed. Closing bug. 1075008 18 cdumez 2015-03-06 10:40:41 -0800 Radar: rdar://problem/20072369 1075016 19 cdumez 2015-03-06 10:47:27 -0800 This is a regression from r177738, not r179347. 246874 2015-02-18 18:58:45 -0800 2015-02-18 21:16:52 -0800 Patch bug-141788.diff text/plain 7589 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZThiMWMxLi5jMWUwZGIyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTUtMDIt MTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjE3OTM0Nyk6IENsZWFyaW5nIHRoZSBQYWdlQ2FjaGUgbm8gbG9uZ2VyIGNsZWFycyB0aGUg UGFnZUNhY2hlLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTQxNzg4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHNpbXBsZSB0 ZXN0IHRoYXQgbmF2aWdhdGVzIHRvIGEgdGVtcG9yYXJ5IHBhZ2Ugd2hpY2ggaW1tZWRpYXRlbHkg ZG9lcyBhIGhpc3RvcnkuYmFjaworICAgICAgICBuYXZpZ2F0aW9uLiBVcG9uIHJldHVybmluZyB0 byB0aGUgZmlyc3QgcGFnZSwgY2hlY2sgdGhhdCB0aGUgcGFnZSBjYWNoZSBub3cgaGFzIDEgZW50 cnksCisgICAgICAgIGFuZCB0aGF0IGNsZWFyaW5nIHRoZSBwYWdlIGNhY2hlIG1ha2VzIHRoYXQg ZW50cnkgZ28gYXdheS4KKworICAgICAgICAqIGZhc3QvaGlzdG9yeS9wYWdlLWNhY2hlLWNsZWFy aW5nLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9oaXN0b3J5L3BhZ2UtY2Fj aGUtY2xlYXJpbmcuaHRtbDogQWRkZWQuCisKIDIwMTUtMDItMTggIEplciBOb2JsZSAgPGplci5u b2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmc7IGFkZCBleHBl Y3RhdGlvbiBmb3IgV0syLW9ubHkgZmFpbGluZyB0ZXN0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9oaXN0b3J5L3BhZ2UtY2FjaGUtY2xlYXJpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZmFzdC9oaXN0b3J5L3BhZ2UtY2FjaGUtY2xlYXJpbmctZXhwZWN0ZWQudHh0Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBlMTE1OWIKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2hpc3RvcnkvcGFnZS1jYWNoZS1jbGVhcmluZy1leHBlY3RlZC50 eHQKQEAgLTAsMCArMSwxMyBAQAorVGVzdHMgdGhhdCBjbGVhcmluZyB0aGUgcGFnZSBjYWNoZSBk b2Vzbid0IGxlYXZlIHBhZ2VzIGluIHRoZSBjYWNoZS4KKworT24gc3VjY2VzcywgeW91IHdpbGwg c2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExF VEUiLgorCisKK3BhZ2VzaG93IC0gbm90IGZyb20gY2FjaGUKK3BhZ2VoaWRlIC0gZW50ZXJpbmcg Y2FjaGUKK3BhZ2VzaG93IC0gZnJvbSBjYWNoZQorQ2FjaGVkIHBhZ2UgY291bnQgYmVmb3JlIGNs ZWFyaW5nOiAxCitDbGVhcmluZyB0aGUgcGFnZSBjYWNoZQorQ2FjaGVkIHBhZ2UgY291bnQgYWZ0 ZXIgY2xlYXJpbmc6IDAKK1BBU1MKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9oaXN0 b3J5L3BhZ2UtY2FjaGUtY2xlYXJpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaGlzdG9yeS9w YWdlLWNhY2hlLWNsZWFyaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uOWFmODJlMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaGlzdG9yeS9w YWdlLWNhY2hlLWNsZWFyaW5nLmh0bWwKQEAgLTAsMCArMSw2MSBAQAorPCFET0NUWVBFIEhUTUwg UFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQg c3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor PGJvZHk+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2 PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCJUZXN0cyB0aGF0IGNsZWFyaW5nIHRoZSBwYWdlIGNh Y2hlIGRvZXNuJ3QgbGVhdmUgcGFnZXMgaW4gdGhlIGNhY2hlLiIpOworCitpZiAoIXdpbmRvdy5p bnRlcm5hbHMpCisgICAgZGVidWcoIlRoaXMgdGVzdCByZXF1aXJlcyB3aW5kb3cuaW50ZXJuYWxz Iik7CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJwYWdlc2hvdyIsIGZ1bmN0aW9uKGV2ZW50 KSB7CisgICAgZGVidWcoInBhZ2VzaG93IC0gIiArIChldmVudC5wZXJzaXN0ZWQgPyAiIiA6ICJu b3QgIikgKyAiZnJvbSBjYWNoZSIpOworICAgIGlmIChldmVudC5wZXJzaXN0ZWQpIHsKKyAgICAg ICAgdmFyIGNhY2hlZFBhZ2VDb3VudEJlZm9yZSA9IHdpbmRvdy5pbnRlcm5hbHMucGFnZUNhY2hl U2l6ZSgpOworICAgICAgICBkZWJ1ZygiQ2FjaGVkIHBhZ2UgY291bnQgYmVmb3JlIGNsZWFyaW5n OiAiICsgY2FjaGVkUGFnZUNvdW50QmVmb3JlKTsKKyAgICAgICAgZGVidWcoIkNsZWFyaW5nIHRo ZSBwYWdlIGNhY2hlIik7CisgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuY2xlYXJQYWdlQ2FjaGUo KTsKKyAgICAgICAgdmFyIGNhY2hlZFBhZ2VDb3VudEFmdGVyID0gd2luZG93LmludGVybmFscy5w YWdlQ2FjaGVTaXplKCk7CisgICAgICAgIGRlYnVnKCJDYWNoZWQgcGFnZSBjb3VudCBhZnRlciBj bGVhcmluZzogIiArIGNhY2hlZFBhZ2VDb3VudEFmdGVyKTsKKyAgICAgICAgaWYgKGNhY2hlZFBh Z2VDb3VudEJlZm9yZSAhPSAwIHx8IGNhY2hlZFBhZ2VDb3VudEFmdGVyID09IDApCisgICAgICAg ICAgICBkZWJ1ZygiUEFTUyIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBkZWJ1ZygiRkFJ TCIpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgd2luZG93LnRlc3RSdW5uZXIu bm90aWZ5RG9uZSgpOworICAgIH0KK30sIGZhbHNlKTsKKword2luZG93LmFkZEV2ZW50TGlzdGVu ZXIoInBhZ2VoaWRlIiwgZnVuY3Rpb24oZXZlbnQpIHsKKyAgICBkZWJ1ZygicGFnZWhpZGUgLSAi ICsgKGV2ZW50LnBlcnNpc3RlZCA/ICIiIDogIm5vdCAiKSArICJlbnRlcmluZyBjYWNoZSIpOwor ICAgIGlmICghZXZlbnQucGVyc2lzdGVkKSB7CisgICAgICAgIGRlYnVnKCJGQUlMIC0gUGFnZSBk aWQgbm90IGVudGVyIHRoZSBwYWdlIGNhY2hlLiIpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsK KyAgICAgICAgd2luZG93LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgIH0KK30sIGZhbHNl KTsKKword2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBmdW5jdGlvbigpIHsKKworICAg IC8vIEVuYWJsZSB0aGUgUGFnZUNhY2hlIGFuZCBtYWtlIHRoaXMgYW4gYXN5bmMgdGVzdC4KKyAg ICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgd2luZG93LnRlc3RSdW5uZXIub3Zl cnJpZGVQcmVmZXJlbmNlKCJXZWJLaXRVc2VzUGFnZUNhY2hlUHJlZmVyZW5jZUtleSIsIDEpOwor ICAgICAgICB3aW5kb3cudGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgfQorCisgICAg Ly8gRm9yY2UgYSBiYWNrIG5hdmlnYXRpb24gYmFjayB0byB0aGlzIHBhZ2UuCisgICAgc2V0VGlt ZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgd2luZG93LmxvY2F0aW9uLmhyZWYgPSAicmVzb3Vy Y2VzL3BhZ2UtY2FjaGUtaGVscGVyLmh0bWwiOworICAgIH0sIDApOworCit9LCBmYWxzZSk7CisK K3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwordmFyIGpzVGVzdElzQXN5bmMgPSB0cnVl OworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk4MzE3Mi4uMzYz NDJlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTAyLTE4ICBBbmRyZWFzIEts aW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIxNzkzNDcpOiBD bGVhcmluZyB0aGUgUGFnZUNhY2hlIG5vIGxvbmdlciBjbGVhcnMgdGhlIFBhZ2VDYWNoZS4KKyAg ICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE0MTc4OD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbmNlIGFnYWluIHdlJ3ZlIGZhbGxlbiBpbnRv IHRoZSBUZW1wb3JhcnlDaGFuZ2UgdHJhcDoKKworICAgICAgICAgICAgVGVtcG9yYXJ5Q2hhbmdl PHVuc2lnbmVkPihtX21lbWJlciwgdGVtcG9yYXJ5VmFsdWUpOworCisgICAgICAgIFRoZSBjb2Rl IGFib3ZlIGRvZXNuJ3QgYWN0dWFsbHkgZG8gYW55dGhpbmcuIFNpbmNlIHRoZSBUZW1wb3JhcnlD aGFuZ2UgbG9jYWwgaXMgbm90IG5hbWVkLAorICAgICAgICBpdCBpbW1lZGlhdGVseSBnb2VzIG91 dCBvZiBzY29wZSBhbmQgcmVzdG9yZXMgdGhlIG9yaWdpbmFsIHZhbHVlIG9mIG1fbWVtYmVyLgor CisgICAgICAgIFVubGVzcyBzb21lb25lIGtub3dzIGEgQysrIHRyaWNrIHRvIHByZXZlbnQgdGhl c2UsIHdlJ2xsIG5lZWQgdG8gYWRkIGEgc3R5bGUgY2hlY2tlciBwYXNzCisgICAgICAgIHRvIGNh dGNoIGJ1Z3MgbGlrZSB0aGlzLgorCisgICAgICAgIFRlc3Q6IGZhc3QvaGlzdG9yeS9wYWdlLWNh Y2hlLWNsZWFyaW5nLmh0bWwKKworICAgICAgICAqIGhpc3RvcnkvUGFnZUNhY2hlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBhZ2VDYWNoZTo6cHJ1bmVUb1NpemVOb3cpOiBOYW1lIHRoZSBsb2Nh bCBzbyBpdCBsaXZlcyBsb25nZXIuCisKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OmNsZWFyUGFnZUNhY2hlKToKKyAgICAgICAg KFdlYkNvcmU6OkludGVybmFsczo6cGFnZUNhY2hlU2l6ZSk6CisgICAgICAgICogdGVzdGluZy9J bnRlcm5hbHMuaDoKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5pZGw6IEFkZCBhIHdheSB0 byBjbGVhciB0aGUgcGFnZSBjYWNoZSBhbmQgcXVlcnkgaXRzIHNpemUgZnJvbQorICAgICAgICB3 aW5kb3cuaW50ZXJuYWxzIHRvIGZhY2lsaXRhdGUgd3JpdGluZyBhIHNpbXBsZSB0ZXN0IGZvciB0 aGlzIGJ1Zy4KKwogMjAxNS0wMi0xOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgogCiAgICAgICAgIFByZXBhcmUgdG8gdXNlIFdFQkNPUkVfRVhQT1JUIG9uIFdp bmRvd3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAKaW5kZXggMGJjOWQ4ZS4uZTAz OGIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hlLmNwcApAQCAtMzY1LDcgKzM2NSw3 IEBAIGJvb2wgUGFnZUNhY2hlOjpjYW5DYWNoZShQYWdlKiBwYWdlKSBjb25zdAogCiB2b2lkIFBh Z2VDYWNoZTo6cHJ1bmVUb1NpemVOb3codW5zaWduZWQgc2l6ZSwgUHJ1bmluZ1JlYXNvbiBwcnVu aW5nUmVhc29uKQogewotICAgIFRlbXBvcmFyeUNoYW5nZTx1bnNpZ25lZD4obV9tYXhTaXplLCBz aXplKTsKKyAgICBUZW1wb3JhcnlDaGFuZ2U8dW5zaWduZWQ+IGNoYW5nZShtX21heFNpemUsIHNp emUpOwogICAgIHBydW5lKHBydW5pbmdSZWFzb24pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0lu dGVybmFscy5jcHAKaW5kZXggNjdjOGYxNy4uZmQ4MTM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv SW50ZXJuYWxzLmNwcApAQCAtODAsNiArODAsNyBAQAogI2luY2x1ZGUgIk1lbW9yeUluZm8uaCIK ICNpbmNsdWRlICJNb2NrUGFnZU92ZXJsYXlDbGllbnQuaCIKICNpbmNsdWRlICJQYWdlLmgiCisj aW5jbHVkZSAiUGFnZUNhY2hlLmgiCiAjaW5jbHVkZSAiUGFnZU92ZXJsYXkuaCIKICNpbmNsdWRl ICJQcmludENvbnRleHQuaCIKICNpbmNsdWRlICJQc2V1ZG9FbGVtZW50LmgiCkBAIC00MjQsNiAr NDI1LDE2IEBAIHVuc2lnbmVkIEludGVybmFsczo6bWVtb3J5Q2FjaGVTaXplKCkgY29uc3QKICAg ICByZXR1cm4gTWVtb3J5Q2FjaGU6OnNpbmdsZXRvbigpLnNpemUoKTsKIH0KIAordm9pZCBJbnRl cm5hbHM6OmNsZWFyUGFnZUNhY2hlKCkKK3sKKyAgICBQYWdlQ2FjaGU6OnNpbmdsZXRvbigpLnBy dW5lVG9TaXplTm93KDAsIFBydW5pbmdSZWFzb246Ok5vbmUpOworfQorCit1bnNpZ25lZCBJbnRl cm5hbHM6OnBhZ2VDYWNoZVNpemUoKSBjb25zdAoreworICAgIHJldHVybiBQYWdlQ2FjaGU6OnNp bmdsZXRvbigpLnBhZ2VDb3VudCgpOworfQorCiBOb2RlKiBJbnRlcm5hbHM6OnRyZWVTY29wZVJv b3ROb2RlKE5vZGUqIG5vZGUsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIGlmICghbm9kZSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaCBiL1NvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKaW5kZXggMDlhNDQ5ZC4uMjM1NzlkZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCkBAIC04OSw2ICs4OSw5IEBAIHB1YmxpYzoKICAg ICB2b2lkIHBydW5lTWVtb3J5Q2FjaGVUb1NpemUodW5zaWduZWQgc2l6ZSk7CiAgICAgdW5zaWdu ZWQgbWVtb3J5Q2FjaGVTaXplKCkgY29uc3Q7CiAKKyAgICB2b2lkIGNsZWFyUGFnZUNhY2hlKCk7 CisgICAgdW5zaWduZWQgcGFnZUNhY2hlU2l6ZSgpIGNvbnN0OworCiAgICAgUGFzc1JlZlB0cjxD U1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24+IGNvbXB1dGVkU3R5bGVJbmNsdWRpbmdWaXNpdGVk SW5mbyhOb2RlKiwgRXhjZXB0aW9uQ29kZSYpIGNvbnN0OwogCiAgICAgTm9kZSogZW5zdXJlU2hh ZG93Um9vdChFbGVtZW50KiBob3N0LCBFeGNlcHRpb25Db2RlJik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5pZGwKaW5kZXggZGMyYWQ1OS4uZGNhNzhmNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvSW50ZXJuYWxzLmlkbApAQCAtNDcsNiArNDcsOSBAQCBlbnVtIFBhZ2VPdmVybGF5VHlwZSB7 CiAgICAgdm9pZCBwcnVuZU1lbW9yeUNhY2hlVG9TaXplKGxvbmcgc2l6ZSk7CiAgICAgbG9uZyBt ZW1vcnlDYWNoZVNpemUoKTsKIAorICAgIHZvaWQgY2xlYXJQYWdlQ2FjaGUoKTsKKyAgICB1bnNp Z25lZCBpbnQgcGFnZUNhY2hlU2l6ZSgpOworCiAgICAgW1JhaXNlc0V4Y2VwdGlvbl0gQ1NTU3R5 bGVEZWNsYXJhdGlvbiBjb21wdXRlZFN0eWxlSW5jbHVkaW5nVmlzaXRlZEluZm8oTm9kZSBub2Rl KTsKIAogICAgIFtSYWlzZXNFeGNlcHRpb25dIE5vZGUgZW5zdXJlU2hhZG93Um9vdChFbGVtZW50 IGhvc3QpOwo= 246877 2015-02-18 21:16:52 -0800 2015-02-18 22:36:54 -0800 Patch for landing land-141788.diff text/plain 7614 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZThiMWMxLi4xMjc5MzMxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTUtMDIt MTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjE3OTM0Nyk6IENsZWFyaW5nIHRoZSBQYWdlQ2FjaGUgbm8gbG9uZ2VyIGNsZWFycyB0aGUg UGFnZUNhY2hlLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTQxNzg4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KKworICAgICAgICBBZGQgYSBzaW1wbGUg dGVzdCB0aGF0IG5hdmlnYXRlcyB0byBhIHRlbXBvcmFyeSBwYWdlIHdoaWNoIGltbWVkaWF0ZWx5 IGRvZXMgYSBoaXN0b3J5LmJhY2sKKyAgICAgICAgbmF2aWdhdGlvbi4gVXBvbiByZXR1cm5pbmcg dG8gdGhlIGZpcnN0IHBhZ2UsIGNoZWNrIHRoYXQgdGhlIHBhZ2UgY2FjaGUgbm93IGhhcyAxIGVu dHJ5LAorICAgICAgICBhbmQgdGhhdCBjbGVhcmluZyB0aGUgcGFnZSBjYWNoZSBtYWtlcyB0aGF0 IGVudHJ5IGdvIGF3YXkuCisKKyAgICAgICAgKiBmYXN0L2hpc3RvcnkvcGFnZS1jYWNoZS1jbGVh cmluZy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvaGlzdG9yeS9wYWdlLWNh Y2hlLWNsZWFyaW5nLmh0bWw6IEFkZGVkLgorCiAyMDE1LTAyLTE4ICBKZXIgTm9ibGUgIDxqZXIu bm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZ2FyZGVuaW5nOyBhZGQgZXhw ZWN0YXRpb24gZm9yIFdLMi1vbmx5IGZhaWxpbmcgdGVzdC4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvaGlzdG9yeS9wYWdlLWNhY2hlLWNsZWFyaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvaGlzdG9yeS9wYWdlLWNhY2hlLWNsZWFyaW5nLWV4cGVjdGVkLnR4dApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wZTExNTliCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9oaXN0b3J5L3BhZ2UtY2FjaGUtY2xlYXJpbmctZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsMTMgQEAKK1Rlc3RzIHRoYXQgY2xlYXJpbmcgdGhlIHBhZ2UgY2FjaGUg ZG9lc24ndCBsZWF2ZSBwYWdlcyBpbiB0aGUgY2FjaGUuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxs IHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBM RVRFIi4KKworCitwYWdlc2hvdyAtIG5vdCBmcm9tIGNhY2hlCitwYWdlaGlkZSAtIGVudGVyaW5n IGNhY2hlCitwYWdlc2hvdyAtIGZyb20gY2FjaGUKK0NhY2hlZCBwYWdlIGNvdW50IGJlZm9yZSBj bGVhcmluZzogMQorQ2xlYXJpbmcgdGhlIHBhZ2UgY2FjaGUKK0NhY2hlZCBwYWdlIGNvdW50IGFm dGVyIGNsZWFyaW5nOiAwCitQQVNTCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaGlz dG9yeS9wYWdlLWNhY2hlLWNsZWFyaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2hpc3Rvcnkv cGFnZS1jYWNoZS1jbGVhcmluZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjVhZjYyZTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2hpc3Rvcnkv cGFnZS1jYWNoZS1jbGVhcmluZy5odG1sCkBAIC0wLDAgKzEsNjEgQEAKKzwhRE9DVFlQRSBodG1s PgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1w cmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwv cD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCJUZXN0 cyB0aGF0IGNsZWFyaW5nIHRoZSBwYWdlIGNhY2hlIGRvZXNuJ3QgbGVhdmUgcGFnZXMgaW4gdGhl IGNhY2hlLiIpOworCitpZiAoIXdpbmRvdy5pbnRlcm5hbHMpCisgICAgZGVidWcoIlRoaXMgdGVz dCByZXF1aXJlcyB3aW5kb3cuaW50ZXJuYWxzIik7CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVy KCJwYWdlc2hvdyIsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgZGVidWcoInBhZ2VzaG93IC0gIiAr IChldmVudC5wZXJzaXN0ZWQgPyAiIiA6ICJub3QgIikgKyAiZnJvbSBjYWNoZSIpOworICAgIGlm IChldmVudC5wZXJzaXN0ZWQpIHsKKyAgICAgICAgdmFyIGNhY2hlZFBhZ2VDb3VudEJlZm9yZSA9 IHdpbmRvdy5pbnRlcm5hbHMucGFnZUNhY2hlU2l6ZSgpOworICAgICAgICBkZWJ1ZygiQ2FjaGVk IHBhZ2UgY291bnQgYmVmb3JlIGNsZWFyaW5nOiAiICsgY2FjaGVkUGFnZUNvdW50QmVmb3JlKTsK KyAgICAgICAgZGVidWcoIkNsZWFyaW5nIHRoZSBwYWdlIGNhY2hlIik7CisgICAgICAgIHdpbmRv dy5pbnRlcm5hbHMuY2xlYXJQYWdlQ2FjaGUoKTsKKyAgICAgICAgdmFyIGNhY2hlZFBhZ2VDb3Vu dEFmdGVyID0gd2luZG93LmludGVybmFscy5wYWdlQ2FjaGVTaXplKCk7CisgICAgICAgIGRlYnVn KCJDYWNoZWQgcGFnZSBjb3VudCBhZnRlciBjbGVhcmluZzogIiArIGNhY2hlZFBhZ2VDb3VudEFm dGVyKTsKKyAgICAgICAgaWYgKGNhY2hlZFBhZ2VDb3VudEJlZm9yZSAhPSAwICYmIGNhY2hlZFBh Z2VDb3VudEFmdGVyID09IDApCisgICAgICAgICAgICBkZWJ1ZygiUEFTUyIpOworICAgICAgICBl bHNlCisgICAgICAgICAgICBkZWJ1ZygiRkFJTCIpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsK KyAgICAgICAgd2luZG93LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgIH0KK30sIGZhbHNl KTsKKword2luZG93LmFkZEV2ZW50TGlzdGVuZXIoInBhZ2VoaWRlIiwgZnVuY3Rpb24oZXZlbnQp IHsKKyAgICBkZWJ1ZygicGFnZWhpZGUgLSAiICsgKGV2ZW50LnBlcnNpc3RlZCA/ICIiIDogIm5v dCAiKSArICJlbnRlcmluZyBjYWNoZSIpOworICAgIGlmICghZXZlbnQucGVyc2lzdGVkKSB7Cisg ICAgICAgIGRlYnVnKCJGQUlMIC0gUGFnZSBkaWQgbm90IGVudGVyIHRoZSBwYWdlIGNhY2hlLiIp OworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgd2luZG93LnRlc3RSdW5uZXIubm90 aWZ5RG9uZSgpOworICAgIH0KK30sIGZhbHNlKTsKKword2luZG93LmFkZEV2ZW50TGlzdGVuZXIo J2xvYWQnLCBmdW5jdGlvbigpIHsKKworICAgIC8vIEVuYWJsZSB0aGUgUGFnZUNhY2hlIGFuZCBt YWtlIHRoaXMgYW4gYXN5bmMgdGVzdC4KKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAg ICAgICAgd2luZG93LnRlc3RSdW5uZXIub3ZlcnJpZGVQcmVmZXJlbmNlKCJXZWJLaXRVc2VzUGFn ZUNhY2hlUHJlZmVyZW5jZUtleSIsIDEpOworICAgICAgICB3aW5kb3cudGVzdFJ1bm5lci53YWl0 VW50aWxEb25lKCk7CisgICAgfQorCisgICAgLy8gRm9yY2UgYSBiYWNrIG5hdmlnYXRpb24gYmFj ayB0byB0aGlzIHBhZ2UuCisgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgd2lu ZG93LmxvY2F0aW9uLmhyZWYgPSAicmVzb3VyY2VzL3BhZ2UtY2FjaGUtaGVscGVyLmh0bWwiOwor ICAgIH0sIDApOworCit9LCBmYWxzZSk7CisKK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVl OwordmFyIGpzVGVzdElzQXN5bmMgPSB0cnVlOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggYTk4MzE3Mi4uYjE2ZGNlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE1LTAyLTE4ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAg ICAgICBSRUdSRVNTSU9OKHIxNzkzNDcpOiBDbGVhcmluZyB0aGUgUGFnZUNhY2hlIG5vIGxvbmdl ciBjbGVhcnMgdGhlIFBhZ2VDYWNoZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE0 MTc4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCisKKyAgICAgICAg T25jZSBhZ2FpbiB3ZSd2ZSBmYWxsZW4gaW50byB0aGUgVGVtcG9yYXJ5Q2hhbmdlIHRyYXA6CisK KyAgICAgICAgICAgIFRlbXBvcmFyeUNoYW5nZTx1bnNpZ25lZD4obV9tZW1iZXIsIHRlbXBvcmFy eVZhbHVlKTsKKworICAgICAgICBUaGUgY29kZSBhYm92ZSBkb2Vzbid0IGFjdHVhbGx5IGRvIGFu eXRoaW5nLiBTaW5jZSB0aGUgVGVtcG9yYXJ5Q2hhbmdlIGxvY2FsIGlzIG5vdCBuYW1lZCwKKyAg ICAgICAgaXQgaW1tZWRpYXRlbHkgZ29lcyBvdXQgb2Ygc2NvcGUgYW5kIHJlc3RvcmVzIHRoZSBv cmlnaW5hbCB2YWx1ZSBvZiBtX21lbWJlci4KKworICAgICAgICBVbmxlc3Mgc29tZW9uZSBrbm93 cyBhIEMrKyB0cmljayB0byBwcmV2ZW50IHRoZXNlLCB3ZSdsbCBuZWVkIHRvIGFkZCBhIHN0eWxl IGNoZWNrZXIgcGFzcworICAgICAgICB0byBjYXRjaCBidWdzIGxpa2UgdGhpcy4gV2hhdGV2ZXIg d2UgZG8gd2lsbCBiZSBkb25lIHNlcGFyYXRlbHkgZnJvbSB0aGlzIGJ1Zy4KKworICAgICAgICBU ZXN0OiBmYXN0L2hpc3RvcnkvcGFnZS1jYWNoZS1jbGVhcmluZy5odG1sCisKKyAgICAgICAgKiBo aXN0b3J5L1BhZ2VDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlQ2FjaGU6OnBydW5l VG9TaXplTm93KTogTmFtZSB0aGUgbG9jYWwgc28gaXQgbGl2ZXMgbG9uZ2VyLgorCisgICAgICAg ICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpj bGVhclBhZ2VDYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnBhZ2VDYWNoZVNp emUpOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmg6CisgICAgICAgICogdGVzdGluZy9J bnRlcm5hbHMuaWRsOiBBZGQgYSB3YXkgdG8gY2xlYXIgdGhlIHBhZ2UgY2FjaGUgYW5kIHF1ZXJ5 IGl0cyBzaXplIGZyb20KKyAgICAgICAgd2luZG93LmludGVybmFscyB0byBmYWNpbGl0YXRlIHdy aXRpbmcgYSBzaW1wbGUgdGVzdCBmb3IgdGhpcyBidWcuCisKIDIwMTUtMDItMTggIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBQcmVwYXJlIHRv IHVzZSBXRUJDT1JFX0VYUE9SVCBvbiBXaW5kb3dzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2Fj aGUuY3BwCmluZGV4IDBiYzlkOGUuLmUwMzhiMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2hpc3RvcnkvUGFnZUNhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VD YWNoZS5jcHAKQEAgLTM2NSw3ICszNjUsNyBAQCBib29sIFBhZ2VDYWNoZTo6Y2FuQ2FjaGUoUGFn ZSogcGFnZSkgY29uc3QKIAogdm9pZCBQYWdlQ2FjaGU6OnBydW5lVG9TaXplTm93KHVuc2lnbmVk IHNpemUsIFBydW5pbmdSZWFzb24gcHJ1bmluZ1JlYXNvbikKIHsKLSAgICBUZW1wb3JhcnlDaGFu Z2U8dW5zaWduZWQ+KG1fbWF4U2l6ZSwgc2l6ZSk7CisgICAgVGVtcG9yYXJ5Q2hhbmdlPHVuc2ln bmVkPiBjaGFuZ2UobV9tYXhTaXplLCBzaXplKTsKICAgICBwcnVuZShwcnVuaW5nUmVhc29uKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIv U291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IDY3YzhmMTcuLmZkODEz OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTgwLDYgKzgwLDcgQEAK ICNpbmNsdWRlICJNZW1vcnlJbmZvLmgiCiAjaW5jbHVkZSAiTW9ja1BhZ2VPdmVybGF5Q2xpZW50 LmgiCiAjaW5jbHVkZSAiUGFnZS5oIgorI2luY2x1ZGUgIlBhZ2VDYWNoZS5oIgogI2luY2x1ZGUg IlBhZ2VPdmVybGF5LmgiCiAjaW5jbHVkZSAiUHJpbnRDb250ZXh0LmgiCiAjaW5jbHVkZSAiUHNl dWRvRWxlbWVudC5oIgpAQCAtNDI0LDYgKzQyNSwxNiBAQCB1bnNpZ25lZCBJbnRlcm5hbHM6Om1l bW9yeUNhY2hlU2l6ZSgpIGNvbnN0CiAgICAgcmV0dXJuIE1lbW9yeUNhY2hlOjpzaW5nbGV0b24o KS5zaXplKCk7CiB9CiAKK3ZvaWQgSW50ZXJuYWxzOjpjbGVhclBhZ2VDYWNoZSgpCit7CisgICAg UGFnZUNhY2hlOjpzaW5nbGV0b24oKS5wcnVuZVRvU2l6ZU5vdygwLCBQcnVuaW5nUmVhc29uOjpO b25lKTsKK30KKwordW5zaWduZWQgSW50ZXJuYWxzOjpwYWdlQ2FjaGVTaXplKCkgY29uc3QKK3sK KyAgICByZXR1cm4gUGFnZUNhY2hlOjpzaW5nbGV0b24oKS5wYWdlQ291bnQoKTsKK30KKwogTm9k ZSogSW50ZXJuYWxzOjp0cmVlU2NvcGVSb290Tm9kZShOb2RlKiBub2RlLCBFeGNlcHRpb25Db2Rl JiBlYykKIHsKICAgICBpZiAoIW5vZGUpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rl c3RpbmcvSW50ZXJuYWxzLmggYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmlu ZGV4IDA5YTQ0OWQuLjIzNTc5ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv SW50ZXJuYWxzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApAQCAt ODksNiArODksOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBwcnVuZU1lbW9yeUNhY2hlVG9TaXplKHVu c2lnbmVkIHNpemUpOwogICAgIHVuc2lnbmVkIG1lbW9yeUNhY2hlU2l6ZSgpIGNvbnN0OwogCisg ICAgdm9pZCBjbGVhclBhZ2VDYWNoZSgpOworICAgIHVuc2lnbmVkIHBhZ2VDYWNoZVNpemUoKSBj b25zdDsKKwogICAgIFBhc3NSZWZQdHI8Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uPiBjb21w dXRlZFN0eWxlSW5jbHVkaW5nVmlzaXRlZEluZm8oTm9kZSosIEV4Y2VwdGlvbkNvZGUmKSBjb25z dDsKIAogICAgIE5vZGUqIGVuc3VyZVNoYWRvd1Jvb3QoRWxlbWVudCogaG9zdCwgRXhjZXB0aW9u Q29kZSYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRs IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCmluZGV4IGRjMmFkNTkuLmRj YTc4ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbAor KysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKQEAgLTQ3LDYgKzQ3LDkg QEAgZW51bSBQYWdlT3ZlcmxheVR5cGUgewogICAgIHZvaWQgcHJ1bmVNZW1vcnlDYWNoZVRvU2l6 ZShsb25nIHNpemUpOwogICAgIGxvbmcgbWVtb3J5Q2FjaGVTaXplKCk7CiAKKyAgICB2b2lkIGNs ZWFyUGFnZUNhY2hlKCk7CisgICAgdW5zaWduZWQgaW50IHBhZ2VDYWNoZVNpemUoKTsKKwogICAg IFtSYWlzZXNFeGNlcHRpb25dIENTU1N0eWxlRGVjbGFyYXRpb24gY29tcHV0ZWRTdHlsZUluY2x1 ZGluZ1Zpc2l0ZWRJbmZvKE5vZGUgbm9kZSk7CiAKICAgICBbUmFpc2VzRXhjZXB0aW9uXSBOb2Rl IGVuc3VyZVNoYWRvd1Jvb3QoRWxlbWVudCBob3N0KTsK 246882 2015-02-18 22:37:02 -0800 2015-02-18 23:37:22 -0800 Patch bug-141788-20150218223655.patch text/plain 4411 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMzM4CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjY0YzkzYTFmNDg0MDM4ZmMxYmNh ZDcxYmNlMzQ2NjJjNzJhZGE2YS4uZTNhMzFhZjQ3Y2NmOTBkZDgyMGQwNzA2ZGNmYzE5ZmU0MjIw MGZiMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE1LTAyLTE4ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgLyBtb2Rlcm5pemUgdGVzdCBpbnRy b2R1Y2VkIGluIHIxODAzMzcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDE3ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGZhc3QvaGlzdG9yeS9wYWdlLWNhY2hlLWNsZWFyaW5nLWV4cGVjdGVkLnR4 dDoKKyAgICAgICAgKiBmYXN0L2hpc3RvcnkvcGFnZS1jYWNoZS1jbGVhcmluZy5odG1sOgorCiAy MDE1LTAyLTE4ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OKHIxNzkzNDcpOiBDbGVhcmluZyB0aGUgUGFnZUNhY2hlIG5vIGxvbmdlciBjbGVh cnMgdGhlIFBhZ2VDYWNoZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaGlzdG9yeS9w YWdlLWNhY2hlLWNsZWFyaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvaGlzdG9y eS9wYWdlLWNhY2hlLWNsZWFyaW5nLWV4cGVjdGVkLnR4dAppbmRleCAwZTExNTliM2UxYzc3YjZl ZGUzMWI5ZmZlYjFlMDE4NmQ1YmYyMjE2Li40ZjQ3YzdiNWI2YmI5MjNiZGE4ZGIzNDdjYzU4MmI4 YjE2YjQ0ZGYwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2hpc3RvcnkvcGFnZS1jYWNo ZS1jbGVhcmluZy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9oaXN0b3J5L3Bh Z2UtY2FjaGUtY2xlYXJpbmctZXhwZWN0ZWQudHh0CkBAIC02LDggKzYsMTAgQEAgT24gc3VjY2Vz cywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkg IlRFU1QgQ09NUExFVEUKIHBhZ2VzaG93IC0gbm90IGZyb20gY2FjaGUKIHBhZ2VoaWRlIC0gZW50 ZXJpbmcgY2FjaGUKIHBhZ2VzaG93IC0gZnJvbSBjYWNoZQotQ2FjaGVkIHBhZ2UgY291bnQgYmVm b3JlIGNsZWFyaW5nOiAxCi1DbGVhcmluZyB0aGUgcGFnZSBjYWNoZQotQ2FjaGVkIHBhZ2UgY291 bnQgYWZ0ZXIgY2xlYXJpbmc6IDAKLVBBU1MKK1BBU1Mgd2luZG93LmludGVybmFscy5wYWdlQ2Fj aGVTaXplKCkgaXMgMQord2luZG93LmludGVybmFscy5jbGVhclBhZ2VDYWNoZSgpCitQQVNTIHdp bmRvdy5pbnRlcm5hbHMucGFnZUNhY2hlU2l6ZSgpIGlzIDAKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFy c2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2hpc3RvcnkvcGFnZS1jYWNoZS1jbGVhcmluZy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9o aXN0b3J5L3BhZ2UtY2FjaGUtY2xlYXJpbmcuaHRtbAppbmRleCA1YWY2MmU4Njk5MDVjNmMyMjdk NmU1NGEzNTIyODExYzhlNjM2NWNmLi40ZDEwYzVhOTY1ZjVmYzU0ZjZkNGViYjAyMTA2YmIxMTBh ZGY0NTBkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2hpc3RvcnkvcGFnZS1jYWNoZS1j bGVhcmluZy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaGlzdG9yeS9wYWdlLWNhY2hlLWNs ZWFyaW5nLmh0bWwKQEAgLTEsMTMgKzEsMTQgQEAKIDwhRE9DVFlQRSBodG1sPgogPGh0bWw+Ci08 aGVhZD4KLTxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2Ny aXB0PgotPC9oZWFkPgogPGJvZHk+Ci08cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KLTxkaXYgaWQ9 ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBy ZS5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0PgogZGVzY3JpcHRpb24oIlRlc3RzIHRoYXQgY2xlYXJp bmcgdGhlIHBhZ2UgY2FjaGUgZG9lc24ndCBsZWF2ZSBwYWdlcyBpbiB0aGUgY2FjaGUuIik7Cit3 aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisKKy8vIEVuYWJsZSBwYWdlIGNhY2hlLgoraWYg KHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHdpbmRvdy50ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVy ZW5jZSgiV2ViS2l0VXNlc1BhZ2VDYWNoZVByZWZlcmVuY2VLZXkiLCAxKTsKIAogaWYgKCF3aW5k b3cuaW50ZXJuYWxzKQogICAgIGRlYnVnKCJUaGlzIHRlc3QgcmVxdWlyZXMgd2luZG93LmludGVy bmFscyIpOwpAQCAtMTUsMzggKzE2LDIyIEBAIGlmICghd2luZG93LmludGVybmFscykKIHdpbmRv dy5hZGRFdmVudExpc3RlbmVyKCJwYWdlc2hvdyIsIGZ1bmN0aW9uKGV2ZW50KSB7CiAgICAgZGVi dWcoInBhZ2VzaG93IC0gIiArIChldmVudC5wZXJzaXN0ZWQgPyAiIiA6ICJub3QgIikgKyAiZnJv bSBjYWNoZSIpOwogICAgIGlmIChldmVudC5wZXJzaXN0ZWQpIHsKLSAgICAgICAgdmFyIGNhY2hl ZFBhZ2VDb3VudEJlZm9yZSA9IHdpbmRvdy5pbnRlcm5hbHMucGFnZUNhY2hlU2l6ZSgpOwotICAg ICAgICBkZWJ1ZygiQ2FjaGVkIHBhZ2UgY291bnQgYmVmb3JlIGNsZWFyaW5nOiAiICsgY2FjaGVk UGFnZUNvdW50QmVmb3JlKTsKLSAgICAgICAgZGVidWcoIkNsZWFyaW5nIHRoZSBwYWdlIGNhY2hl Iik7Ci0gICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuY2xlYXJQYWdlQ2FjaGUoKTsKLSAgICAgICAg dmFyIGNhY2hlZFBhZ2VDb3VudEFmdGVyID0gd2luZG93LmludGVybmFscy5wYWdlQ2FjaGVTaXpl KCk7Ci0gICAgICAgIGRlYnVnKCJDYWNoZWQgcGFnZSBjb3VudCBhZnRlciBjbGVhcmluZzogIiAr IGNhY2hlZFBhZ2VDb3VudEFmdGVyKTsKLSAgICAgICAgaWYgKGNhY2hlZFBhZ2VDb3VudEJlZm9y ZSAhPSAwICYmIGNhY2hlZFBhZ2VDb3VudEFmdGVyID09IDApCi0gICAgICAgICAgICBkZWJ1Zygi UEFTUyIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBkZWJ1ZygiRkFJTCIpOworICAgICAg ICBzaG91bGRCZSgid2luZG93LmludGVybmFscy5wYWdlQ2FjaGVTaXplKCkiLCAiMSIpOworICAg ICAgICBldmFsQW5kTG9nKCJ3aW5kb3cuaW50ZXJuYWxzLmNsZWFyUGFnZUNhY2hlKCkiKTsKKyAg ICAgICAgc2hvdWxkQmUoIndpbmRvdy5pbnRlcm5hbHMucGFnZUNhY2hlU2l6ZSgpIiwgIjAiKTsK ICAgICAgICAgZmluaXNoSlNUZXN0KCk7Ci0gICAgICAgIHdpbmRvdy50ZXN0UnVubmVyLm5vdGlm eURvbmUoKTsKICAgICB9CiB9LCBmYWxzZSk7CiAKIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJw YWdlaGlkZSIsIGZ1bmN0aW9uKGV2ZW50KSB7CiAgICAgZGVidWcoInBhZ2VoaWRlIC0gIiArIChl dmVudC5wZXJzaXN0ZWQgPyAiIiA6ICJub3QgIikgKyAiZW50ZXJpbmcgY2FjaGUiKTsKICAgICBp ZiAoIWV2ZW50LnBlcnNpc3RlZCkgewotICAgICAgICBkZWJ1ZygiRkFJTCAtIFBhZ2UgZGlkIG5v dCBlbnRlciB0aGUgcGFnZSBjYWNoZS4iKTsKKyAgICAgICAgdGVzdEZhaWxlZCgiUGFnZSBkaWQg bm90IGVudGVyIHRoZSBwYWdlIGNhY2hlLiIpOwogICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKLSAg ICAgICAgd2luZG93LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOwogICAgIH0KIH0sIGZhbHNlKTsK IAogd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBmdW5jdGlvbigpIHsKLQotICAgIC8v IEVuYWJsZSB0aGUgUGFnZUNhY2hlIGFuZCBtYWtlIHRoaXMgYW4gYXN5bmMgdGVzdC4KLSAgICBp ZiAod2luZG93LnRlc3RSdW5uZXIpIHsKLSAgICAgICAgd2luZG93LnRlc3RSdW5uZXIub3ZlcnJp ZGVQcmVmZXJlbmNlKCJXZWJLaXRVc2VzUGFnZUNhY2hlUHJlZmVyZW5jZUtleSIsIDEpOwotICAg ICAgICB3aW5kb3cudGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7Ci0gICAgfQotCiAgICAgLy8g Rm9yY2UgYSBiYWNrIG5hdmlnYXRpb24gYmFjayB0byB0aGlzIHBhZ2UuCiAgICAgc2V0VGltZW91 dChmdW5jdGlvbigpIHsKICAgICAgICAgd2luZG93LmxvY2F0aW9uLmhyZWYgPSAicmVzb3VyY2Vz L3BhZ2UtY2FjaGUtaGVscGVyLmh0bWwiOwpAQCAtNTQsOCArMzksNyBAQCB3aW5kb3cuYWRkRXZl bnRMaXN0ZW5lcignbG9hZCcsIGZ1bmN0aW9uKCkgewogCiB9LCBmYWxzZSk7CiAKLXZhciBzdWNj ZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwotdmFyIGpzVGVzdElzQXN5bmMgPSB0cnVlOwogPC9zY3Jp cHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3Jp cHQ+CiA8L2JvZHk+CiA8L2h0bWw+Cg==