119699 2013-08-12 14:16:57 -0700 AX: Headings not longer have an AXTitle if they have a link as the only child 2013-08-15 06:23:08 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach aboxhall apinheiro commit-queue dmazzoni eflews.bot gyuyoung.kim jdiggs mario philn webkit-bug-importer xan.lopez oldest_to_newest 916400 0 cfleizach 2013-08-12 14:16:57 -0700 Headings not longer have an AXTitle if they have a link as the only child rdar://14699680 916403 1 208562 cfleizach 2013-08-12 14:20:42 -0700 Created attachment 208562 patch 916405 2 bshafiei 2013-08-12 14:22:42 -0700 <rdar://problem/14699680> 916434 3 208562 darin 2013-08-12 15:40:51 -0700 Comment on attachment 208562 patch This doesn’t look right. The mode has 3 bits but they don’t seem to be three independent switches. 916807 4 208656 cfleizach 2013-08-13 11:03:48 -0700 Created attachment 208656 patch 916841 5 208656 eflews.bot 2013-08-13 12:26:10 -0700 Comment on attachment 208656 patch Attachment 208656 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/1455498 916844 6 208664 cfleizach 2013-08-13 12:34:00 -0700 Created attachment 208664 patch 916846 7 208664 eflews.bot 2013-08-13 12:41:06 -0700 Comment on attachment 208664 patch Attachment 208664 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/1446757 916847 8 208665 cfleizach 2013-08-13 12:43:05 -0700 Created attachment 208665 patch 917148 9 208665 mario 2013-08-14 09:30:40 -0700 Comment on attachment 208665 patch View in context: https://bugs.webkit.org/attachment.cgi?id=208665&action=review This is not an issue only on the Mac, but apparently affecting also the GTK/EFL ports, so thanks for fixing this. I just have a concern about the layout test, which I'm not sure whether it might be flaky in some case. See my comment below... > LayoutTests/accessibility/heading-title-includes-links.html:24 > +<script> > + > + description("This tests that the title of a heading will include links if available."); > + > + if (window.accessibilityController) { > + > + debug("Heading title: " + accessibilityController.accessibleElementById("heading").title); > + } I found that this test misbehaves in the GTK+ port, as if it was "too soon" to ask for the title of this heading at this moment, as I could check that the visible text (which is what accessibleTitle() ends up calling in this case) is not available at this moment, causing it to return an empty string. However, I also checked that delaying the whole thing for a further iteration of the main loop works fine for the GTK platform, which then is able to print "Apple" for the heading element: <html> <head> <script src="../fast/js/resources/js-test-pre.js"></script> </head> <body id="body"> <h1 id="heading"> <a href="Apple.com"> Apple </a> </h1> <p id="description"></p> <div id="console"></div> <script> description("This tests that the title of a heading will include links if available."); function runTestsOnIdle() { debug("Heading title: " + accessibilityController.accessibleElementById("heading").title); window.testRunner.notifyDone(); } if (window.testRunner && window.accessibilityController) { window.testRunner.dumpAsText(); window.testRunner.waitUntilDone(); } // Do this on idle, so we make sure the visible text will be available. window.setTimeout('runTestsOnIdle()', 0) </script> <script src="../fast/js/resources/js-test-post.js"></script> </body> </html> One problem with this test is that it will print the "Heading title: AXTitle: Apple" line after the "TEST COMPLETE". However, I'm not quite sure whether this is unveiling an issue specific to the GTK+ port (which should perhaps work fine in the original test) or whether the test might be inherently flaky and should be rewritten in a way similar to the proposed one. What do you think? 917175 10 cfleizach 2013-08-14 10:38:51 -0700 (In reply to comment #9) > (From update of attachment 208665 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=208665&action=review > > This is not an issue only on the Mac, but apparently affecting also the GTK/EFL ports, so thanks for fixing this. > > I just have a concern about the layout test, which I'm not sure whether it might be flaky in some case. See my comment below... > > > LayoutTests/accessibility/heading-title-includes-links.html:24 > > +<script> > > + > > + description("This tests that the title of a heading will include links if available."); > > + > > + if (window.accessibilityController) { > > + > > + debug("Heading title: " + accessibilityController.accessibleElementById("heading").title); > > + } > > I found that this test misbehaves in the GTK+ port, as if it was "too soon" to ask for the title of this heading at this moment, as I could check that the visible text (which is what accessibleTitle() ends up calling in this case) is not available at this moment, causing it to return an empty string. > > However, I also checked that delaying the whole thing for a further iteration of the main loop works fine for the GTK platform, which then is able to print "Apple" for the heading element: > > <html> > <head> > <script src="../fast/js/resources/js-test-pre.js"></script> > </head> > <body id="body"> > > <h1 id="heading"> > <a href="Apple.com"> > Apple > </a> > </h1> > > <p id="description"></p> > <div id="console"></div> > > <script> > description("This tests that the title of a heading will include links if available."); > function runTestsOnIdle() > { > debug("Heading title: " + accessibilityController.accessibleElementById("heading").title); > window.testRunner.notifyDone(); > } > > if (window.testRunner && window.accessibilityController) { > window.testRunner.dumpAsText(); > window.testRunner.waitUntilDone(); > } > > // Do this on idle, so we make sure the visible text will be available. > window.setTimeout('runTestsOnIdle()', 0) > </script> > <script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > > > One problem with this test is that it will print the "Heading title: AXTitle: Apple" line after the "TEST COMPLETE". However, I'm not quite sure whether this is unveiling an issue specific to the GTK+ port (which should perhaps work fine in the original test) or whether the test might be inherently flaky and should be rewritten in a way similar to the proposed one. > > What do you think? I'm OK changing the patch so that we don't get a failure, but I think GTK should look into this. There's no good reason I can think of that this shouldn't work 917181 11 cfleizach 2013-08-14 10:43:19 -0700 http://trac.webkit.org/changeset/154058 917490 12 mario 2013-08-15 06:23:08 -0700 (In reply to comment #10) > [...] > I'm OK changing the patch so that we don't get a failure, but I think GTK > should look into this. There's no good reason I can think of that this > shouldn't work Thanks for considering my comments. I will update expectations for this tests in GTK and will try to investigate why this weird behaviour is happening in GTK. 208562 2013-08-12 14:20:42 -0700 2013-08-13 11:03:48 -0700 patch patch text/plain 7535 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1Mzk1NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA4LTEyICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEhlYWRpbmdzIG5v dCBsb25nZXIgaGF2ZSBhbiBBWFRpdGxlIGlmIHRoZXkgaGF2ZSBhIGxpbmsgYXMgdGhlIG9ubHkg Y2hpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx OTY5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v cm1hbGx5LCBmb2N1c2FibGUgY29udGVudCBpcyBub3QgaW5jdWRlZCB3aGVuIGxvb2tpbmcgYXQg dGhlIHZpc2libGUgdGV4dCBvZiBhbiBlbGVtZW50LiAKKyAgICAgICAgT25lIGNhc2Ugd2hlcmUg d2UgbmVlZCBhbiBleGNlcHRpb24gaXMgd2l0aCBoZWFkaW5ncywgd2hlcmUgdGhlcmUgaXMgdXN1 YWxseSBsaW5rIGNvbnRlbnQgaW5zaWRlIHRoZSBoZWFkaW5nCisgICAgICAgIHRoYXQgd2Ugd2Fu dCB0byBiZSB1c2VkIGFzIHRoZSB2aXNpYmxlIHRleHQuCisKKyAgICAgICAgVGVzdDogYWNjZXNz aWJpbGl0eS9oZWFkaW5nLXRpdGxlLWluY2x1ZGVzLWxpbmtzLmh0bWwKKworICAgICAgICAqIGFj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnZpc2libGVUZXh0KToKKyAgICAgICAgKFdlYkNv cmU6OnNob3VsZFVzZUFjY2Vzc2libGl0eU9iamVjdElubmVyVGV4dCk6CisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0Lmg6CisKIDIwMTMtMDgtMTIgIENocmlzdG9w aGUgRHVtZXogIDxjaC5kdW1lekBzaXNhLnNhbXN1bmcuY29tPgogCiAgICAgICAgIERlZmluZSBE T01fS0VZX0xPQ0FUSU9OXyogY29uc3RhbnRzIG9uIEtleWJvYXJkRXZlbnQKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCShy ZXZpc2lvbiAxNTM5NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMjQxLDggKzI0MSw5IEBACiB9OwogCiBl bnVtIEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSB7Ci0gICAgVGV4dFVuZGVyRWxl bWVudE1vZGVTa2lwSWdub3JlZENoaWxkcmVuLAotICAgIFRleHRVbmRlckVsZW1lbnRNb2RlSW5j bHVkZUFsbENoaWxkcmVuCisgICAgVGV4dFVuZGVyRWxlbWVudE1vZGVTa2lwSWdub3JlZENoaWxk cmVuID0gMSwKKyAgICBUZXh0VW5kZXJFbGVtZW50TW9kZUluY2x1ZGVBbGxDaGlsZHJlbiA9IDEg PDwgMSwKKyAgICBUZXh0VW5kZXJFbGVtZW50TW9kZUluY2x1ZGVGb2N1c2FibGVDaGlsZHJlbiA9 IDEgPDwgMiwKIH07CiAgICAgCiBlbnVtIEFjY2Vzc2liaWxpdHlPcmllbnRhdGlvbiB7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlOb2RlT2JqZWN0LmNwcAkocmV2aXNpb24gMTUzOTQ0KQorKysgU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEyNTIsNiArMTI1Miw3IEBACiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBib29sIHVzZVRl eHRVbmRlckVsZW1lbnQgPSBmYWxzZTsKKyAgICBBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVu dE1vZGUgdGV4dFVuZGVyRWxlbWVudE1vZGUgPSBUZXh0VW5kZXJFbGVtZW50TW9kZVNraXBJZ25v cmVkQ2hpbGRyZW47CiAgICAgCiAgICAgc3dpdGNoIChyb2xlVmFsdWUoKSkgewogICAgIGNhc2Ug UG9wVXBCdXR0b25Sb2xlOgpAQCAtMTI3Myw2ICsxMjc0LDEwIEBACiAgICAgZGVmYXVsdDoKICAg ICAgICAgYnJlYWs7CiAgICAgfQorCisgICAgLy8gSGVhZGluZ3Mgc2hvdWxkIGluY2x1ZGUgbGlu a3MgaW4gdGhlaXIgdmlzaWJsZSB0ZXh0LgorICAgIGlmIChpc0hlYWRpbmcoKSkKKyAgICAgICAg dGV4dFVuZGVyRWxlbWVudE1vZGUgPSBUZXh0VW5kZXJFbGVtZW50TW9kZUluY2x1ZGVGb2N1c2Fi bGVDaGlsZHJlbjsKICAgICAKICAgICAvLyBJZiBpdCdzIGZvY3VzYWJsZSBidXQgaXQncyBub3Qg Y29udGVudCBlZGl0YWJsZSBvciBhIGtub3duIGNvbnRyb2wgdHlwZSwgdGhlbiBpdCB3aWxsIGFw cGVhciB0bwogICAgIC8vIHRoZSB1c2VyIGFzIGEgc2luZ2xlIGF0b21pYyBvYmplY3QsIHNvIHdl IHNob3VsZCB1c2UgaXRzIHRleHQgYXMgdGhlIGRlZmF1bHQgdGl0bGUuCkBAIC0xMjgwLDcgKzEy ODUsNyBAQAogICAgICAgICB1c2VUZXh0VW5kZXJFbGVtZW50ID0gdHJ1ZTsKICAgICAKICAgICBp ZiAodXNlVGV4dFVuZGVyRWxlbWVudCkgewotICAgICAgICBTdHJpbmcgdGV4dCA9IHRleHRVbmRl ckVsZW1lbnQoKTsKKyAgICAgICAgU3RyaW5nIHRleHQgPSB0ZXh0VW5kZXJFbGVtZW50KHRleHRV bmRlckVsZW1lbnRNb2RlKTsKICAgICAgICAgaWYgKCF0ZXh0LmlzRW1wdHkoKSkKICAgICAgICAg ICAgIHRleHRPcmRlci5hcHBlbmQoQWNjZXNzaWJpbGl0eVRleHQodGV4dCwgQ2hpbGRyZW5UZXh0 KSk7CiAgICAgfQpAQCAtMTUwNyw3ICsxNTEyLDcgQEAKIHN0YXRpYyBib29sIHNob3VsZFVzZUFj Y2Vzc2libGl0eU9iamVjdElubmVyVGV4dChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmosIEFjY2Vz c2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSBtb2RlKQogewogICAgIC8vIERvIG5vdCB1c2Ug YW55IGhldXJpc3RpYyBpZiB3ZSBhcmUgZXhwbGljaXRseSBhc2tpbmcgdG8gaW5jbHVkZSBhbGwg dGhlIGNoaWxkcmVuLgotICAgIGlmIChtb2RlID09IFRleHRVbmRlckVsZW1lbnRNb2RlSW5jbHVk ZUFsbENoaWxkcmVuKQorICAgIGlmIChtb2RlICYgVGV4dFVuZGVyRWxlbWVudE1vZGVJbmNsdWRl QWxsQ2hpbGRyZW4pCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8gQ29uc2lkZXIgdGhp cyBoeXBvdGhldGljYWwgZXhhbXBsZToKQEAgLTE1MzYsNyArMTU0MSw3IEBACiAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIAogICAgIC8vIFNraXAgZm9jdXNhYmxlIGNoaWxkcmVuLCBzbyB3ZSBk b24ndCBpbmNsdWRlIHRoZSB0ZXh0IG9mIGxpbmtzIGFuZCBjb250cm9scy4KLSAgICBpZiAob2Jq LT5jYW5TZXRGb2N1c0F0dHJpYnV0ZSgpKQorICAgIGlmIChvYmotPmNhblNldEZvY3VzQXR0cmli dXRlKCkgJiYgIShtb2RlICYgVGV4dFVuZGVyRWxlbWVudE1vZGVJbmNsdWRlRm9jdXNhYmxlQ2hp bGRyZW4pKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBTa2lwIGJpZyBjb250YWlu ZXIgZWxlbWVudHMgbGlrZSBsaXN0cywgdGFibGVzLCBldGMuCkluZGV4OiBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAx NTM5NTcpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxNSBAQAorMjAxMy0wOC0xMiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29t PgorCisgICAgICAgIEFYOiBIZWFkaW5ncyBub3QgbG9uZ2VyIGhhdmUgYW4gQVhUaXRsZSBpZiB0 aGV5IGhhdmUgYSBsaW5rIGFzIHRoZSBvbmx5IGNoaWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk2OTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaGVhZGluZy10aXRsZS1p bmNsdWRlcy1saW5rcy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNz aWJpbGl0eS9oZWFkaW5nLXRpdGxlLWluY2x1ZGVzLWxpbmtzLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvaW50ZXJuYWwtbGluay1hbmNo b3JzMi1leHBlY3RlZC50eHQ6CisgICAgICAgICAgICBVcGRhdGUgdGhpcyB0ZXN0IHRvIHJlZmxl Y3QgdGhhdCBsaW5rcyBzaG91bGQgYmUgaW5jbHVkZWQgaW4gdGhlIHRpdGxlIG9mIGhlYWRpbmdz LgorCiAyMDEzLTA4LTEyICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1zdW5n LmNvbT4KIAogICAgICAgICBEZWZpbmUgRE9NX0tFWV9MT0NBVElPTl8qIGNvbnN0YW50cyBvbiBL ZXlib2FyZEV2ZW50CkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2hlYWRpbmctdGl0 bGUtaW5jbHVkZXMtbGlua3MuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9hY2Nlc3Np YmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3MuaHRtbAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvaGVhZGluZy10aXRsZS1pbmNsdWRlcy1saW5rcy5o dG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI4IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMg Ii0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4u L2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5IGlkPSJib2R5Ij4KKworPGgxIGlkPSJoZWFkaW5nIj4KKyAgICA8YSBocmVmPSJBcHBsZS5j b20iPgorICAgIEFwcGxlCisgICAgPC9hPgorPC9oMT4KKworPHAgaWQ9ImRlc2NyaXB0aW9uIj48 L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKworPHNjcmlwdD4KKworICAgIGRlc2NyaXB0 aW9uKCJUaGlzIHRlc3RzIHRoYXQgdGhlIHRpdGxlIG9mIGEgaGVhZGluZyB3aWxsIGluY2x1ZGUg bGlua3MgaWYgYXZhaWxhYmxlLiIpOworCisgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29u dHJvbGxlcikgeworCisgICAgICAgIGRlYnVnKCJIZWFkaW5nIHRpdGxlOiAiICsgYWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJoZWFkaW5nIikudGl0bGUpOwor ICAgIH0KKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRl c3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9oZWFkaW5nLXRpdGxlLWluY2x1ZGVzLWxpbmtz LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNj ZXNzaWJpbGl0eS9oZWFkaW5nLXRpdGxlLWluY2x1ZGVzLWxpbmtzLWV4cGVjdGVkLnR4dAkocmV2 aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2hlYWRp bmctdGl0bGUtaW5jbHVkZXMtbGlua3MtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCww ICsxLDEyIEBACitBcHBsZQorCitUaGlzIHRlc3RzIHRoYXQgdGhlIHRpdGxlIG9mIGEgaGVhZGlu ZyB3aWxsIGluY2x1ZGUgbGlua3MgaWYgYXZhaWxhYmxlLgorCitPbiBzdWNjZXNzLCB5b3Ugd2ls bCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01Q TEVURSIuCisKKworSGVhZGluZyB0aXRsZTogQVhUaXRsZTogQXBwbGUKK1BBU1Mgc3VjY2Vzc2Z1 bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9pbnRlcm5hbC1saW5rLWFuY2hvcnMyLWV4cGVjdGVk LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0 eS9pbnRlcm5hbC1saW5rLWFuY2hvcnMyLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTUzOTQ0KQor KysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvaW50ZXJuYWwtbGluay1h bmNob3JzMi1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTUsMjIgKzUsMjIgQEAKIEFY Um9sZURlc2NyaXB0aW9uOiBoZWFkaW5nCiBBWENoaWxkcmVuOiA8YXJyYXkgb2Ygc2l6ZSA0Pgog QVhIZWxwOiAKLUFYUGFyZW50OiA8QVhIZWFkaW5nOiAnWyBdIFRvdXJldHRlIHN5bmRyb21lJz4K K0FYUGFyZW50OiA8QVhIZWFkaW5nOiAnWyBlZGl0IF0gVG91cmV0dGUgc3luZHJvbWUnPgogQVhT aXplOiBOU1NpemU6IHs3NjksIDIyfQotQVhUaXRsZTogWyBdIFRvdXJldHRlIHN5bmRyb21lCitB WFRpdGxlOiBbIGVkaXQgXSBUb3VyZXR0ZSBzeW5kcm9tZQogQVhEZXNjcmlwdGlvbjogCiBBWFZh bHVlOiAzCiBBWEZvY3VzZWQ6IDAKIEFYRW5hYmxlZDogMQotQVhXaW5kb3c6IDxBWEhlYWRpbmc6 ICdbIF0gVG91cmV0dGUgc3luZHJvbWUnPgorQVhXaW5kb3c6IDxBWEhlYWRpbmc6ICdbIGVkaXQg XSBUb3VyZXR0ZSBzeW5kcm9tZSc+CiBBWFNlbGVjdGVkVGV4dE1hcmtlclJhbmdlOiAobnVsbCkK LUFYU3RhcnRUZXh0TWFya2VyOiA8QVhIZWFkaW5nOiAnWyBdIFRvdXJldHRlIHN5bmRyb21lJz4K LUFYRW5kVGV4dE1hcmtlcjogPEFYSGVhZGluZzogJ1sgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CitB WFN0YXJ0VGV4dE1hcmtlcjogPEFYSGVhZGluZzogJ1sgZWRpdCBdIFRvdXJldHRlIHN5bmRyb21l Jz4KK0FYRW5kVGV4dE1hcmtlcjogPEFYSGVhZGluZzogJ1sgZWRpdCBdIFRvdXJldHRlIHN5bmRy b21lJz4KIEFYVmlzaXRlZDogMAogQVhMaW5rZWRVSUVsZW1lbnRzOiAobnVsbCkKIEFYU2VsZWN0 ZWQ6IDAKIEFYQmxvY2tRdW90ZUxldmVsOiAwCi1BWFRvcExldmVsVUlFbGVtZW50OiA8QVhIZWFk aW5nOiAnWyBdIFRvdXJldHRlIHN5bmRyb21lJz4KK0FYVG9wTGV2ZWxVSUVsZW1lbnQ6IDxBWEhl YWRpbmc6ICdbIGVkaXQgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CiBBWEFSSUFCdXN5OiAwCiAKIC0t LS0tLS0tLS0tLQo= 208656 2013-08-13 11:03:48 -0700 2013-08-13 12:34:00 -0700 patch patch text/plain 11511 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDAxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA4LTEzICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEhlYWRpbmdzIG5v dCBsb25nZXIgaGF2ZSBhbiBBWFRpdGxlIGlmIHRoZXkgaGF2ZSBhIGxpbmsgYXMgdGhlIG9ubHkg Y2hpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx OTY5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v cm1hbGx5LCBmb2N1c2FibGUgY29udGVudCBpcyBub3QgaW5jdWRlZCB3aGVuIGxvb2tpbmcgYXQg dGhlIHZpc2libGUgdGV4dCBvZiBhbiBlbGVtZW50LgorICAgICAgICBPbmUgY2FzZSB3aGVyZSB3 ZSBuZWVkIGFuIGV4Y2VwdGlvbiBpcyB3aXRoIGhlYWRpbmdzLCB3aGVyZSB0aGVyZSBpcyB1c3Vh bGx5IGxpbmsgY29udGVudCBpbnNpZGUgdGhlIGhlYWRpbmcKKyAgICAgICAgdGhhdCB3ZSB3YW50 IHRvIGJlIHVzZWQgYXMgdGhlIHZpc2libGUgdGV4dC4KKworICAgICAgICBUZXN0OiBhY2Nlc3Np YmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3MuaHRtbAorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dmlzaWJsZVRleHQpOgorICAgICAgICAoV2ViQ29y ZTo6c2hvdWxkVXNlQWNjZXNzaWJsaXR5T2JqZWN0SW5uZXJUZXh0KToKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojp0aXRsZSk6CisgICAgICAgICogYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRl eHRVbmRlckVsZW1lbnRNb2RlOjpBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUpOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6dGV4dFVuZGVyRWxlbWVudCk6 CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnRleHRVbmRlckVs ZW1lbnQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5oOgorCiAyMDEzLTA4LTEzICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1z dW5nLmNvbT4KIAogICAgICAgICBOb2RlTGlzdC5pdGVtKCkgZG9lcyBub3QgYmVoYXZlIGFjY29y ZGluZyB0byBzcGVjaWZpY2F0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkocmV2aXNpb24gMTUzOTQ0KQorKysgU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgJKHdvcmtpbmcg Y29weSkKQEAgLTI0MCw5ICsyNDAsMTkgQEAKICAgICB9CiB9OwogCi1lbnVtIEFjY2Vzc2liaWxp dHlUZXh0VW5kZXJFbGVtZW50TW9kZSB7Ci0gICAgVGV4dFVuZGVyRWxlbWVudE1vZGVTa2lwSWdu b3JlZENoaWxkcmVuLAotICAgIFRleHRVbmRlckVsZW1lbnRNb2RlSW5jbHVkZUFsbENoaWxkcmVu CitzdHJ1Y3QgQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlIHsKKyAgICBlbnVtIENo aWxkcmVuSW5jbHVzaW9uIHsKKyAgICAgICAgVGV4dFVuZGVyRWxlbWVudE1vZGVTa2lwSWdub3Jl ZENoaWxkcmVuLAorICAgICAgICBUZXh0VW5kZXJFbGVtZW50TW9kZUluY2x1ZGVBbGxDaGlsZHJl biwKKyAgICB9OworICAgIAorICAgIENoaWxkcmVuSW5jbHVzaW9uIGNoaWxkcmVuSW5jbHVzaW9u OworICAgIGJvb2wgaW5jbHVkZUZvY3VzYWJsZUNvbnRlbnQ7CisgICAgCisgICAgQWNjZXNzaWJp bGl0eVRleHRVbmRlckVsZW1lbnRNb2RlKENoaWxkcmVuSW5jbHVzaW9uIGMgPSBUZXh0VW5kZXJF bGVtZW50TW9kZVNraXBJZ25vcmVkQ2hpbGRyZW4sIGJvb2wgaSA9IGZhbHNlKQorICAgIDogY2hp bGRyZW5JbmNsdXNpb24oYykKKyAgICAsIGluY2x1ZGVGb2N1c2FibGVDb250ZW50KGkpCisgICAg eyB9CiB9OwogICAgIAogZW51bSBBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb24gewpAQCAtNTkwLDcg KzYwMCw3IEBACiAKICAgICAvLyBNZXRob2RzIGZvciBkZXRlcm1pbmluZyBhY2Nlc3NpYmlsaXR5 IHRleHQuCiAgICAgdmlydHVhbCBTdHJpbmcgc3RyaW5nVmFsdWUoKSBjb25zdCB7IHJldHVybiBT dHJpbmcoKTsgfQotICAgIHZpcnR1YWwgU3RyaW5nIHRleHRVbmRlckVsZW1lbnQoQWNjZXNzaWJp bGl0eVRleHRVbmRlckVsZW1lbnRNb2RlID0gVGV4dFVuZGVyRWxlbWVudE1vZGVTa2lwSWdub3Jl ZENoaWxkcmVuKSBjb25zdCB7IHJldHVybiBTdHJpbmcoKTsgfQorICAgIHZpcnR1YWwgU3RyaW5n IHRleHRVbmRlckVsZW1lbnQoQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlID0gQWNj ZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlKCkpIGNvbnN0IHsgcmV0dXJuIFN0cmluZygp OyB9CiAgICAgdmlydHVhbCBTdHJpbmcgdGV4dCgpIGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9 CiAgICAgdmlydHVhbCBpbnQgdGV4dExlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2 aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxlZEJ5QXR0cmlidXRlKCkgY29uc3QgeyByZXR1cm4gU3Ry aW5nKCk7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCShyZXZpc2lvbiAxNTM5NDQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAkod29y a2luZyBjb3B5KQpAQCAtMTQ0LDcgKzE0NCw3IEBACiAgICAgdmlydHVhbCBWaXNpYmxlU2VsZWN0 aW9uIHNlbGVjdGlvbigpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIHN0cmluZ1ZhbHVlKCkg Y29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgaGVscFRleHQoKSBjb25zdDsKLSAgICB2aXJ0dWFs IFN0cmluZyB0ZXh0VW5kZXJFbGVtZW50KEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9k ZSA9IFRleHRVbmRlckVsZW1lbnRNb2RlU2tpcElnbm9yZWRDaGlsZHJlbikgY29uc3Q7CisgICAg dmlydHVhbCBTdHJpbmcgdGV4dFVuZGVyRWxlbWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxl bWVudE1vZGUgPSBBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUoKSkgY29uc3Q7CiAg ICAgdmlydHVhbCBTdHJpbmcgdGV4dCgpIGNvbnN0OwogICAgIHZpcnR1YWwgaW50IHRleHRMZW5n dGgoKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyBzZWxlY3RlZFRleHQoKSBjb25zdDsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Qu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlOb2RlT2JqZWN0LmgJKHJldmlzaW9uIDE1Mzk0NCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMTIw LDcgKzEyMCw3IEBACiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5QnV0dG9uU3RhdGUgY2hlY2ti b3hPclJhZGlvVmFsdWUoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdW5zaWduZWQgaGllcmFyY2hp Y2FsTGV2ZWwoKSBjb25zdDsKLSAgICB2aXJ0dWFsIFN0cmluZyB0ZXh0VW5kZXJFbGVtZW50KEFj Y2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSA9IFRleHRVbmRlckVsZW1lbnRNb2RlU2tp cElnbm9yZWRDaGlsZHJlbikgY29uc3Q7CisgICAgdmlydHVhbCBTdHJpbmcgdGV4dFVuZGVyRWxl bWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUgPSBBY2Nlc3NpYmlsaXR5VGV4 dFVuZGVyRWxlbWVudE1vZGUoKSkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgYWNjZXNzaWJp bGl0eURlc2NyaXB0aW9uKCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgaGVscFRleHQoKSBj b25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyB0aXRsZSgpIGNvbnN0OwpJbmRleDogU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuY3BwCShyZXZpc2lvbiAxNTM5NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NDcs NyArNjQ3LDcgQEAKIAogICAgIC8vIFdlIHVzZSBhIHRleHQgaXRlcmF0b3IgZm9yIHRleHQgb2Jq ZWN0cyBBTkQgZm9yIHRob3NlIGNhc2VzIHdoZXJlIHdlIGFyZQogICAgIC8vIGV4cGxpY2l0bHkg YXNraW5nIGZvciB0aGUgZnVsbCB0ZXh0IHVuZGVyIGEgZ2l2ZW4gZWxlbWVudC4KLSAgICBpZiAo bV9yZW5kZXJlci0+aXNUZXh0KCkgfHwgbW9kZSA9PSBUZXh0VW5kZXJFbGVtZW50TW9kZUluY2x1 ZGVBbGxDaGlsZHJlbikgeworICAgIGlmIChtX3JlbmRlcmVyLT5pc1RleHQoKSB8fCBtb2RlLmNo aWxkcmVuSW5jbHVzaW9uID09IEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZTo6VGV4 dFVuZGVyRWxlbWVudE1vZGVJbmNsdWRlQWxsQ2hpbGRyZW4pIHsKICAgICAgICAgLy8gSWYgcG9z c2libGUsIHVzZSBhIHRleHQgaXRlcmF0b3IgdG8gZ2V0IHRoZSB0ZXh0LCBzbyB0aGF0IHdoaXRl c3BhY2UKICAgICAgICAgLy8gaXMgaGFuZGxlZCBjb25zaXN0ZW50bHkuCiAgICAgICAgIGlmIChO b2RlKiBub2RlID0gdGhpcy0+bm9kZSgpKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAkocmV2aXNp b24gMTUzOTQ0KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 Tm9kZU9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyODAsNyArMTI4MCwxMyBAQAogICAg ICAgICB1c2VUZXh0VW5kZXJFbGVtZW50ID0gdHJ1ZTsKICAgICAKICAgICBpZiAodXNlVGV4dFVu ZGVyRWxlbWVudCkgewotICAgICAgICBTdHJpbmcgdGV4dCA9IHRleHRVbmRlckVsZW1lbnQoKTsK KyAgICAgICAgQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlIG1vZGU7CisgICAgICAg IAorICAgICAgICAvLyBIZWFkaW5ncyBvZnRlbiBpbmNsdWRlIGxpbmtzIGFzIGRpcmVjdCBjaGls ZHJlbi4gVGhvc2UgbGlua3MgbmVlZCB0byBiZSBpbmNsdWRlZCBpbiB0ZXh0IHVuZGVyIGVsZW1l bnQuCisgICAgICAgIGlmIChpc0hlYWRpbmcoKSkKKyAgICAgICAgICAgIG1vZGUuaW5jbHVkZUZv Y3VzYWJsZUNvbnRlbnQgPSB0cnVlOworCisgICAgICAgIFN0cmluZyB0ZXh0ID0gdGV4dFVuZGVy RWxlbWVudChtb2RlKTsKICAgICAgICAgaWYgKCF0ZXh0LmlzRW1wdHkoKSkKICAgICAgICAgICAg IHRleHRPcmRlci5hcHBlbmQoQWNjZXNzaWJpbGl0eVRleHQodGV4dCwgQ2hpbGRyZW5UZXh0KSk7 CiAgICAgfQpAQCAtMTUwNyw3ICsxNTEzLDcgQEAKIHN0YXRpYyBib29sIHNob3VsZFVzZUFjY2Vz c2libGl0eU9iamVjdElubmVyVGV4dChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmosIEFjY2Vzc2li aWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSBtb2RlKQogewogICAgIC8vIERvIG5vdCB1c2UgYW55 IGhldXJpc3RpYyBpZiB3ZSBhcmUgZXhwbGljaXRseSBhc2tpbmcgdG8gaW5jbHVkZSBhbGwgdGhl IGNoaWxkcmVuLgotICAgIGlmIChtb2RlID09IFRleHRVbmRlckVsZW1lbnRNb2RlSW5jbHVkZUFs bENoaWxkcmVuKQorICAgIGlmIChtb2RlLmNoaWxkcmVuSW5jbHVzaW9uID09IEFjY2Vzc2liaWxp dHlUZXh0VW5kZXJFbGVtZW50TW9kZTo6VGV4dFVuZGVyRWxlbWVudE1vZGVJbmNsdWRlQWxsQ2hp bGRyZW4pCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8gQ29uc2lkZXIgdGhpcyBoeXBv dGhldGljYWwgZXhhbXBsZToKQEAgLTE1MzYsNyArMTU0Miw3IEBACiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIAogICAgIC8vIFNraXAgZm9jdXNhYmxlIGNoaWxkcmVuLCBzbyB3ZSBkb24ndCBp bmNsdWRlIHRoZSB0ZXh0IG9mIGxpbmtzIGFuZCBjb250cm9scy4KLSAgICBpZiAob2JqLT5jYW5T ZXRGb2N1c0F0dHJpYnV0ZSgpKQorICAgIGlmIChvYmotPmNhblNldEZvY3VzQXR0cmlidXRlKCkg JiYgIW1vZGUuaW5jbHVkZUZvY3VzYWJsZUNvbnRlbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIC8vIFNraXAgYmlnIGNvbnRhaW5lciBlbGVtZW50cyBsaWtlIGxpc3RzLCB0YWJsZXMs IGV0Yy4KQEAgLTE2MjQsMTAgKzE2MzAsMTIgQEAKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0g ICAgaWYgKGlzSGVhZGluZygpIHx8IGlzTGluaygpKQorICAgIGlmIChpc0xpbmsoKSkKICAgICAg ICAgcmV0dXJuIHRleHRVbmRlckVsZW1lbnQoKTsKKyAgICBpZiAoaXNIZWFkaW5nKCkpCisgICAg ICAgIHJldHVybiB0ZXh0VW5kZXJFbGVtZW50KEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50 TW9kZShBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGU6OlRleHRVbmRlckVsZW1lbnRN b2RlU2tpcElnbm9yZWRDaGlsZHJlbiwgdHJ1ZSkpOwogCi0gICAgLy8gSWYgaXQncyBmb2N1c2Fi bGUgYnV0IGl0J3Mgbm90IGNvbnRlbnQgZWRpdGFibGUgb3IgYSBrbm93biBjb250cm9sIHR5cGUs IHRoZW4gaXQgd2lsbCBhcHBlYXIgdG8gICAgICAgICAgICAgICAgICAKKyAgICAvLyBJZiBpdCdz IGZvY3VzYWJsZSBidXQgaXQncyBub3QgY29udGVudCBlZGl0YWJsZSBvciBhIGtub3duIGNvbnRy b2wgdHlwZSwgdGhlbiBpdCB3aWxsIGFwcGVhciB0bwogICAgIC8vIHRoZSB1c2VyIGFzIGEgc2lu Z2xlIGF0b21pYyBvYmplY3QsIHNvIHdlIHNob3VsZCB1c2UgaXRzIHRleHQgYXMgdGhlIGRlZmF1 bHQgdGl0bGUuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgaWYgKGlzR2VuZXJp Y0ZvY3VzYWJsZUVsZW1lbnQoKSkKICAgICAgICAgcmV0dXJuIHRleHRVbmRlckVsZW1lbnQoKTsK SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1NDAxMikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEzLTA4LTEzICBDaHJpcyBGbGVpemFjaCAg PGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEhlYWRpbmdzIG5vdCBsb25nZXIg aGF2ZSBhbiBBWFRpdGxlIGlmIHRoZXkgaGF2ZSBhIGxpbmsgYXMgdGhlIG9ubHkgY2hpbGQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTY5OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNjZXNzaWJp bGl0eS9oZWFkaW5nLXRpdGxlLWluY2x1ZGVzLWxpbmtzLmh0bWw6IEFkZGVkLgorICAgICAgICAq IHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3Mt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0 eS9pbnRlcm5hbC1saW5rLWFuY2hvcnMyLWV4cGVjdGVkLnR4dDoKKwogMjAxMy0wOC0xMyAgQ2hy aXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgTm9k ZUxpc3QuaXRlbSgpIGRvZXMgbm90IGJlaGF2ZSBhY2NvcmRpbmcgdG8gc3BlY2lmaWNhdGlvbgpJ bmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9oZWFkaW5nLXRpdGxlLWluY2x1ZGVzLWxp bmtzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9oZWFkaW5n LXRpdGxlLWluY2x1ZGVzLWxpbmtzLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9h Y2Nlc3NpYmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3MuaHRtbAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSwyOCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQg SFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291 cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBpZD0iYm9keSI+ CisKKzxoMSBpZD0iaGVhZGluZyI+CisgICAgPGEgaHJlZj0iQXBwbGUuY29tIj4KKyAgICBBcHBs ZQorICAgIDwvYT4KKzwvaDE+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0i Y29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+CisKKyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0 cyB0aGF0IHRoZSB0aXRsZSBvZiBhIGhlYWRpbmcgd2lsbCBpbmNsdWRlIGxpbmtzIGlmIGF2YWls YWJsZS4iKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKwor ICAgICAgICBkZWJ1ZygiSGVhZGluZyB0aXRsZTogIiArIGFjY2Vzc2liaWxpdHlDb250cm9sbGVy LmFjY2Vzc2libGVFbGVtZW50QnlJZCgiaGVhZGluZyIpLnRpdGxlKTsKKyAgICB9Cis8L3Njcmlw dD4KKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwv c2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFj L2FjY2Vzc2liaWxpdHkvaGVhZGluZy10aXRsZS1pbmNsdWRlcy1saW5rcy1leHBlY3RlZC50eHQK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvaGVh ZGluZy10aXRsZS1pbmNsdWRlcy1saW5rcy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9oZWFkaW5nLXRpdGxlLWluY2x1 ZGVzLWxpbmtzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMiBAQAorQXBw bGUKKworVGhpcyB0ZXN0cyB0aGF0IHRoZSB0aXRsZSBvZiBhIGhlYWRpbmcgd2lsbCBpbmNsdWRl IGxpbmtzIGlmIGF2YWlsYWJsZS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVz IG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK0hl YWRpbmcgdGl0bGU6IEFYVGl0bGU6IEFwcGxlCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0 cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Fj Y2Vzc2liaWxpdHkvaW50ZXJuYWwtbGluay1hbmNob3JzMi1leHBlY3RlZC50eHQKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvaW50ZXJuYWwtbGlu ay1hbmNob3JzMi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE1Mzk0NCkKKysrIExheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2ludGVybmFsLWxpbmstYW5jaG9yczItZXhwZWN0 ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC01LDIyICs1LDIyIEBACiBBWFJvbGVEZXNjcmlwdGlv bjogaGVhZGluZwogQVhDaGlsZHJlbjogPGFycmF5IG9mIHNpemUgND4KIEFYSGVscDogCi1BWFBh cmVudDogPEFYSGVhZGluZzogJ1sgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CitBWFBhcmVudDogPEFY SGVhZGluZzogJ1sgZWRpdCBdIFRvdXJldHRlIHN5bmRyb21lJz4KIEFYU2l6ZTogTlNTaXplOiB7 NzY5LCAyMn0KLUFYVGl0bGU6IFsgXSBUb3VyZXR0ZSBzeW5kcm9tZQorQVhUaXRsZTogWyBlZGl0 IF0gVG91cmV0dGUgc3luZHJvbWUKIEFYRGVzY3JpcHRpb246IAogQVhWYWx1ZTogMwogQVhGb2N1 c2VkOiAwCiBBWEVuYWJsZWQ6IDEKLUFYV2luZG93OiA8QVhIZWFkaW5nOiAnWyBdIFRvdXJldHRl IHN5bmRyb21lJz4KK0FYV2luZG93OiA8QVhIZWFkaW5nOiAnWyBlZGl0IF0gVG91cmV0dGUgc3lu ZHJvbWUnPgogQVhTZWxlY3RlZFRleHRNYXJrZXJSYW5nZTogKG51bGwpCi1BWFN0YXJ0VGV4dE1h cmtlcjogPEFYSGVhZGluZzogJ1sgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+Ci1BWEVuZFRleHRNYXJr ZXI6IDxBWEhlYWRpbmc6ICdbIF0gVG91cmV0dGUgc3luZHJvbWUnPgorQVhTdGFydFRleHRNYXJr ZXI6IDxBWEhlYWRpbmc6ICdbIGVkaXQgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CitBWEVuZFRleHRN YXJrZXI6IDxBWEhlYWRpbmc6ICdbIGVkaXQgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CiBBWFZpc2l0 ZWQ6IDAKIEFYTGlua2VkVUlFbGVtZW50czogKG51bGwpCiBBWFNlbGVjdGVkOiAwCiBBWEJsb2Nr UXVvdGVMZXZlbDogMAotQVhUb3BMZXZlbFVJRWxlbWVudDogPEFYSGVhZGluZzogJ1sgXSBUb3Vy ZXR0ZSBzeW5kcm9tZSc+CitBWFRvcExldmVsVUlFbGVtZW50OiA8QVhIZWFkaW5nOiAnWyBlZGl0 IF0gVG91cmV0dGUgc3luZHJvbWUnPgogQVhBUklBQnVzeTogMAogCiAtLS0tLS0tLS0tLS0K 208664 2013-08-13 12:34:00 -0700 2013-08-13 12:43:05 -0700 patch patch text/plain 12261 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDAxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA4LTEzICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEhlYWRpbmdzIG5v dCBsb25nZXIgaGF2ZSBhbiBBWFRpdGxlIGlmIHRoZXkgaGF2ZSBhIGxpbmsgYXMgdGhlIG9ubHkg Y2hpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx OTY5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v cm1hbGx5LCBmb2N1c2FibGUgY29udGVudCBpcyBub3QgaW5jdWRlZCB3aGVuIGxvb2tpbmcgYXQg dGhlIHZpc2libGUgdGV4dCBvZiBhbiBlbGVtZW50LgorICAgICAgICBPbmUgY2FzZSB3aGVyZSB3 ZSBuZWVkIGFuIGV4Y2VwdGlvbiBpcyB3aXRoIGhlYWRpbmdzLCB3aGVyZSB0aGVyZSBpcyB1c3Vh bGx5IGxpbmsgY29udGVudCBpbnNpZGUgdGhlIGhlYWRpbmcKKyAgICAgICAgdGhhdCB3ZSB3YW50 IHRvIGJlIHVzZWQgYXMgdGhlIHZpc2libGUgdGV4dC4KKworICAgICAgICBUZXN0OiBhY2Nlc3Np YmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3MuaHRtbAorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dmlzaWJsZVRleHQpOgorICAgICAgICAoV2ViQ29y ZTo6c2hvdWxkVXNlQWNjZXNzaWJsaXR5T2JqZWN0SW5uZXJUZXh0KToKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojp0aXRsZSk6CisgICAgICAgICogYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRl eHRVbmRlckVsZW1lbnRNb2RlOjpBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUpOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6dGV4dFVuZGVyRWxlbWVudCk6 CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnRleHRVbmRlckVs ZW1lbnQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5oOgorCiAyMDEzLTA4LTEzICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1z dW5nLmNvbT4KIAogICAgICAgICBOb2RlTGlzdC5pdGVtKCkgZG9lcyBub3QgYmVoYXZlIGFjY29y ZGluZyB0byBzcGVjaWZpY2F0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2F0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcAkocmV2aXNp b24gMTUzOTQ0KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvQWNjZXNzaWJp bGl0eU9iamVjdEF0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NCw3ICsxNjQsNyBAQAogICAg IC8vIEdldCB0aGUgdGV4dCBsZW5ndGggZnJvbSB0aGUgZWxlbWVudHMgdW5kZXIgdGhlCiAgICAg Ly8gYWNjZXNzaWJpbGl0eSBvYmplY3QgaWYgdGhlIHZhbHVlIGlzIHN0aWxsIHplcm8uCiAgICAg aWYgKCF0ZXh0TGVuZ3RoICYmIGFsbG93c1RleHRSYW5nZXMoKSkKLSAgICAgICAgdGV4dExlbmd0 aCA9IHRleHRVbmRlckVsZW1lbnQoVGV4dFVuZGVyRWxlbWVudE1vZGVJbmNsdWRlQWxsQ2hpbGRy ZW4pLmxlbmd0aCgpOworICAgICAgICB0ZXh0TGVuZ3RoID0gdGV4dFVuZGVyRWxlbWVudChBY2Nl c3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUoQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1l bnRNb2RlOjpUZXh0VW5kZXJFbGVtZW50TW9kZUluY2x1ZGVBbGxDaGlsZHJlbikpLmxlbmd0aCgp OwogCiAgICAgcmV0dXJuIHRleHRMZW5ndGg7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkocmV2aXNpb24gMTUzOTQ0 KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgJ KHdvcmtpbmcgY29weSkKQEAgLTI0MCw5ICsyNDAsMTkgQEAKICAgICB9CiB9OwogCi1lbnVtIEFj Y2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSB7Ci0gICAgVGV4dFVuZGVyRWxlbWVudE1v ZGVTa2lwSWdub3JlZENoaWxkcmVuLAotICAgIFRleHRVbmRlckVsZW1lbnRNb2RlSW5jbHVkZUFs bENoaWxkcmVuCitzdHJ1Y3QgQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlIHsKKyAg ICBlbnVtIENoaWxkcmVuSW5jbHVzaW9uIHsKKyAgICAgICAgVGV4dFVuZGVyRWxlbWVudE1vZGVT a2lwSWdub3JlZENoaWxkcmVuLAorICAgICAgICBUZXh0VW5kZXJFbGVtZW50TW9kZUluY2x1ZGVB bGxDaGlsZHJlbiwKKyAgICB9OworICAgIAorICAgIENoaWxkcmVuSW5jbHVzaW9uIGNoaWxkcmVu SW5jbHVzaW9uOworICAgIGJvb2wgaW5jbHVkZUZvY3VzYWJsZUNvbnRlbnQ7CisgICAgCisgICAg QWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlKENoaWxkcmVuSW5jbHVzaW9uIGMgPSBU ZXh0VW5kZXJFbGVtZW50TW9kZVNraXBJZ25vcmVkQ2hpbGRyZW4sIGJvb2wgaSA9IGZhbHNlKQor ICAgIDogY2hpbGRyZW5JbmNsdXNpb24oYykKKyAgICAsIGluY2x1ZGVGb2N1c2FibGVDb250ZW50 KGkpCisgICAgeyB9CiB9OwogICAgIAogZW51bSBBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb24gewpA QCAtNTkwLDcgKzYwMCw3IEBACiAKICAgICAvLyBNZXRob2RzIGZvciBkZXRlcm1pbmluZyBhY2Nl c3NpYmlsaXR5IHRleHQuCiAgICAgdmlydHVhbCBTdHJpbmcgc3RyaW5nVmFsdWUoKSBjb25zdCB7 IHJldHVybiBTdHJpbmcoKTsgfQotICAgIHZpcnR1YWwgU3RyaW5nIHRleHRVbmRlckVsZW1lbnQo QWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlID0gVGV4dFVuZGVyRWxlbWVudE1vZGVT a2lwSWdub3JlZENoaWxkcmVuKSBjb25zdCB7IHJldHVybiBTdHJpbmcoKTsgfQorICAgIHZpcnR1 YWwgU3RyaW5nIHRleHRVbmRlckVsZW1lbnQoQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRN b2RlID0gQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlKCkpIGNvbnN0IHsgcmV0dXJu IFN0cmluZygpOyB9CiAgICAgdmlydHVhbCBTdHJpbmcgdGV4dCgpIGNvbnN0IHsgcmV0dXJuIFN0 cmluZygpOyB9CiAgICAgdmlydHVhbCBpbnQgdGV4dExlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIDA7 IH0KICAgICB2aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxlZEJ5QXR0cmlidXRlKCkgY29uc3QgeyBy ZXR1cm4gU3RyaW5nKCk7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCShyZXZpc2lvbiAxNTM5NDQp CisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDcgKzE0NCw3IEBACiAgICAgdmlydHVhbCBWaXNp YmxlU2VsZWN0aW9uIHNlbGVjdGlvbigpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIHN0cmlu Z1ZhbHVlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgaGVscFRleHQoKSBjb25zdDsKLSAg ICB2aXJ0dWFsIFN0cmluZyB0ZXh0VW5kZXJFbGVtZW50KEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJF bGVtZW50TW9kZSA9IFRleHRVbmRlckVsZW1lbnRNb2RlU2tpcElnbm9yZWRDaGlsZHJlbikgY29u c3Q7CisgICAgdmlydHVhbCBTdHJpbmcgdGV4dFVuZGVyRWxlbWVudChBY2Nlc3NpYmlsaXR5VGV4 dFVuZGVyRWxlbWVudE1vZGUgPSBBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUoKSkg Y29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgdGV4dCgpIGNvbnN0OwogICAgIHZpcnR1YWwgaW50 IHRleHRMZW5ndGgoKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyBzZWxlY3RlZFRleHQoKSBj b25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5v ZGVPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlOb2RlT2JqZWN0LmgJKHJldmlzaW9uIDE1Mzk0NCkKKysrIFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuaAkod29ya2luZyBjb3B5 KQpAQCAtMTIwLDcgKzEyMCw3IEBACiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5QnV0dG9uU3Rh dGUgY2hlY2tib3hPclJhZGlvVmFsdWUoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgdW5zaWduZWQg aGllcmFyY2hpY2FsTGV2ZWwoKSBjb25zdDsKLSAgICB2aXJ0dWFsIFN0cmluZyB0ZXh0VW5kZXJF bGVtZW50KEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSA9IFRleHRVbmRlckVsZW1l bnRNb2RlU2tpcElnbm9yZWRDaGlsZHJlbikgY29uc3Q7CisgICAgdmlydHVhbCBTdHJpbmcgdGV4 dFVuZGVyRWxlbWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUgPSBBY2Nlc3Np YmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUoKSkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcg YWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgaGVs cFRleHQoKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyB0aXRsZSgpIGNvbnN0OwpJbmRleDog U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlSZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiAxNTM5NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC02NDcsNyArNjQ3LDcgQEAKIAogICAgIC8vIFdlIHVzZSBhIHRleHQgaXRlcmF0b3IgZm9y IHRleHQgb2JqZWN0cyBBTkQgZm9yIHRob3NlIGNhc2VzIHdoZXJlIHdlIGFyZQogICAgIC8vIGV4 cGxpY2l0bHkgYXNraW5nIGZvciB0aGUgZnVsbCB0ZXh0IHVuZGVyIGEgZ2l2ZW4gZWxlbWVudC4K LSAgICBpZiAobV9yZW5kZXJlci0+aXNUZXh0KCkgfHwgbW9kZSA9PSBUZXh0VW5kZXJFbGVtZW50 TW9kZUluY2x1ZGVBbGxDaGlsZHJlbikgeworICAgIGlmIChtX3JlbmRlcmVyLT5pc1RleHQoKSB8 fCBtb2RlLmNoaWxkcmVuSW5jbHVzaW9uID09IEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50 TW9kZTo6VGV4dFVuZGVyRWxlbWVudE1vZGVJbmNsdWRlQWxsQ2hpbGRyZW4pIHsKICAgICAgICAg Ly8gSWYgcG9zc2libGUsIHVzZSBhIHRleHQgaXRlcmF0b3IgdG8gZ2V0IHRoZSB0ZXh0LCBzbyB0 aGF0IHdoaXRlc3BhY2UKICAgICAgICAgLy8gaXMgaGFuZGxlZCBjb25zaXN0ZW50bHkuCiAgICAg ICAgIGlmIChOb2RlKiBub2RlID0gdGhpcy0+bm9kZSgpKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNw cAkocmV2aXNpb24gMTUzOTQ0KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyODAsNyArMTI4MCwx MyBAQAogICAgICAgICB1c2VUZXh0VW5kZXJFbGVtZW50ID0gdHJ1ZTsKICAgICAKICAgICBpZiAo dXNlVGV4dFVuZGVyRWxlbWVudCkgewotICAgICAgICBTdHJpbmcgdGV4dCA9IHRleHRVbmRlckVs ZW1lbnQoKTsKKyAgICAgICAgQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlIG1vZGU7 CisgICAgICAgIAorICAgICAgICAvLyBIZWFkaW5ncyBvZnRlbiBpbmNsdWRlIGxpbmtzIGFzIGRp cmVjdCBjaGlsZHJlbi4gVGhvc2UgbGlua3MgbmVlZCB0byBiZSBpbmNsdWRlZCBpbiB0ZXh0IHVu ZGVyIGVsZW1lbnQuCisgICAgICAgIGlmIChpc0hlYWRpbmcoKSkKKyAgICAgICAgICAgIG1vZGUu aW5jbHVkZUZvY3VzYWJsZUNvbnRlbnQgPSB0cnVlOworCisgICAgICAgIFN0cmluZyB0ZXh0ID0g dGV4dFVuZGVyRWxlbWVudChtb2RlKTsKICAgICAgICAgaWYgKCF0ZXh0LmlzRW1wdHkoKSkKICAg ICAgICAgICAgIHRleHRPcmRlci5hcHBlbmQoQWNjZXNzaWJpbGl0eVRleHQodGV4dCwgQ2hpbGRy ZW5UZXh0KSk7CiAgICAgfQpAQCAtMTUwNyw3ICsxNTEzLDcgQEAKIHN0YXRpYyBib29sIHNob3Vs ZFVzZUFjY2Vzc2libGl0eU9iamVjdElubmVyVGV4dChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmos IEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSBtb2RlKQogewogICAgIC8vIERvIG5v dCB1c2UgYW55IGhldXJpc3RpYyBpZiB3ZSBhcmUgZXhwbGljaXRseSBhc2tpbmcgdG8gaW5jbHVk ZSBhbGwgdGhlIGNoaWxkcmVuLgotICAgIGlmIChtb2RlID09IFRleHRVbmRlckVsZW1lbnRNb2Rl SW5jbHVkZUFsbENoaWxkcmVuKQorICAgIGlmIChtb2RlLmNoaWxkcmVuSW5jbHVzaW9uID09IEFj Y2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZTo6VGV4dFVuZGVyRWxlbWVudE1vZGVJbmNs dWRlQWxsQ2hpbGRyZW4pCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8gQ29uc2lkZXIg dGhpcyBoeXBvdGhldGljYWwgZXhhbXBsZToKQEAgLTE1MzYsNyArMTU0Miw3IEBACiAgICAgICAg IHJldHVybiB0cnVlOwogICAgIAogICAgIC8vIFNraXAgZm9jdXNhYmxlIGNoaWxkcmVuLCBzbyB3 ZSBkb24ndCBpbmNsdWRlIHRoZSB0ZXh0IG9mIGxpbmtzIGFuZCBjb250cm9scy4KLSAgICBpZiAo b2JqLT5jYW5TZXRGb2N1c0F0dHJpYnV0ZSgpKQorICAgIGlmIChvYmotPmNhblNldEZvY3VzQXR0 cmlidXRlKCkgJiYgIW1vZGUuaW5jbHVkZUZvY3VzYWJsZUNvbnRlbnQpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAogICAgIC8vIFNraXAgYmlnIGNvbnRhaW5lciBlbGVtZW50cyBsaWtlIGxpc3Rz LCB0YWJsZXMsIGV0Yy4KQEAgLTE2MjQsMTAgKzE2MzAsMTIgQEAKICAgICAgICAgYnJlYWs7CiAg ICAgfQogCi0gICAgaWYgKGlzSGVhZGluZygpIHx8IGlzTGluaygpKQorICAgIGlmIChpc0xpbmso KSkKICAgICAgICAgcmV0dXJuIHRleHRVbmRlckVsZW1lbnQoKTsKKyAgICBpZiAoaXNIZWFkaW5n KCkpCisgICAgICAgIHJldHVybiB0ZXh0VW5kZXJFbGVtZW50KEFjY2Vzc2liaWxpdHlUZXh0VW5k ZXJFbGVtZW50TW9kZShBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGU6OlRleHRVbmRl ckVsZW1lbnRNb2RlU2tpcElnbm9yZWRDaGlsZHJlbiwgdHJ1ZSkpOwogCi0gICAgLy8gSWYgaXQn cyBmb2N1c2FibGUgYnV0IGl0J3Mgbm90IGNvbnRlbnQgZWRpdGFibGUgb3IgYSBrbm93biBjb250 cm9sIHR5cGUsIHRoZW4gaXQgd2lsbCBhcHBlYXIgdG8gICAgICAgICAgICAgICAgICAKKyAgICAv LyBJZiBpdCdzIGZvY3VzYWJsZSBidXQgaXQncyBub3QgY29udGVudCBlZGl0YWJsZSBvciBhIGtu b3duIGNvbnRyb2wgdHlwZSwgdGhlbiBpdCB3aWxsIGFwcGVhciB0bwogICAgIC8vIHRoZSB1c2Vy IGFzIGEgc2luZ2xlIGF0b21pYyBvYmplY3QsIHNvIHdlIHNob3VsZCB1c2UgaXRzIHRleHQgYXMg dGhlIGRlZmF1bHQgdGl0bGUuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgaWYg KGlzR2VuZXJpY0ZvY3VzYWJsZUVsZW1lbnQoKSkKICAgICAgICAgcmV0dXJuIHRleHRVbmRlckVs ZW1lbnQoKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDAxMikKKysrIExheW91dFRlc3RzL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEzLTA4LTEzICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEhlYWRpbmdzIG5v dCBsb25nZXIgaGF2ZSBhbiBBWFRpdGxlIGlmIHRoZXkgaGF2ZSBhIGxpbmsgYXMgdGhlIG9ubHkg Y2hpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx OTY5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog YWNjZXNzaWJpbGl0eS9oZWFkaW5nLXRpdGxlLWluY2x1ZGVzLWxpbmtzLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVk ZXMtbGlua3MtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNj ZXNzaWJpbGl0eS9pbnRlcm5hbC1saW5rLWFuY2hvcnMyLWV4cGVjdGVkLnR4dDoKKwogMjAxMy0w OC0xMyAgQ2hyaXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CiAKICAg ICAgICAgTm9kZUxpc3QuaXRlbSgpIGRvZXMgbm90IGJlaGF2ZSBhY2NvcmRpbmcgdG8gc3BlY2lm aWNhdGlvbgpJbmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9oZWFkaW5nLXRpdGxlLWlu Y2x1ZGVzLWxpbmtzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9oZWFkaW5nLXRpdGxlLWluY2x1ZGVzLWxpbmtzLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3MuaHRtbAko cmV2aXNpb24gMCkKQEAgLTAsMCArMSwyOCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9J RVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9mYXN0 L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBp ZD0iYm9keSI+CisKKzxoMSBpZD0iaGVhZGluZyI+CisgICAgPGEgaHJlZj0iQXBwbGUuY29tIj4K KyAgICBBcHBsZQorICAgIDwvYT4KKzwvaDE+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgor PGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+CisKKyAgICBkZXNjcmlwdGlvbigi VGhpcyB0ZXN0cyB0aGF0IHRoZSB0aXRsZSBvZiBhIGhlYWRpbmcgd2lsbCBpbmNsdWRlIGxpbmtz IGlmIGF2YWlsYWJsZS4iKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIpIHsKKworICAgICAgICBkZWJ1ZygiSGVhZGluZyB0aXRsZTogIiArIGFjY2Vzc2liaWxpdHlD b250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiaGVhZGluZyIpLnRpdGxlKTsKKyAgICB9 Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBv c3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvaGVhZGluZy10aXRsZS1pbmNsdWRlcy1saW5rcy1leHBl Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2li aWxpdHkvaGVhZGluZy10aXRsZS1pbmNsdWRlcy1saW5rcy1leHBlY3RlZC50eHQJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9oZWFkaW5nLXRp dGxlLWluY2x1ZGVzLWxpbmtzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwx MiBAQAorQXBwbGUKKworVGhpcyB0ZXN0cyB0aGF0IHRoZSB0aXRsZSBvZiBhIGhlYWRpbmcgd2ls bCBpbmNsdWRlIGxpbmtzIGlmIGF2YWlsYWJsZS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2Vl IGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUi LgorCisKK0hlYWRpbmcgdGl0bGU6IEFYVGl0bGU6IEFwcGxlCitQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjL2FjY2Vzc2liaWxpdHkvaW50ZXJuYWwtbGluay1hbmNob3JzMi1leHBlY3RlZC50eHQK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvaW50 ZXJuYWwtbGluay1hbmNob3JzMi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE1Mzk0NCkKKysrIExh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2ludGVybmFsLWxpbmstYW5jaG9y czItZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC01LDIyICs1LDIyIEBACiBBWFJvbGVE ZXNjcmlwdGlvbjogaGVhZGluZwogQVhDaGlsZHJlbjogPGFycmF5IG9mIHNpemUgND4KIEFYSGVs cDogCi1BWFBhcmVudDogPEFYSGVhZGluZzogJ1sgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CitBWFBh cmVudDogPEFYSGVhZGluZzogJ1sgZWRpdCBdIFRvdXJldHRlIHN5bmRyb21lJz4KIEFYU2l6ZTog TlNTaXplOiB7NzY5LCAyMn0KLUFYVGl0bGU6IFsgXSBUb3VyZXR0ZSBzeW5kcm9tZQorQVhUaXRs ZTogWyBlZGl0IF0gVG91cmV0dGUgc3luZHJvbWUKIEFYRGVzY3JpcHRpb246IAogQVhWYWx1ZTog MwogQVhGb2N1c2VkOiAwCiBBWEVuYWJsZWQ6IDEKLUFYV2luZG93OiA8QVhIZWFkaW5nOiAnWyBd IFRvdXJldHRlIHN5bmRyb21lJz4KK0FYV2luZG93OiA8QVhIZWFkaW5nOiAnWyBlZGl0IF0gVG91 cmV0dGUgc3luZHJvbWUnPgogQVhTZWxlY3RlZFRleHRNYXJrZXJSYW5nZTogKG51bGwpCi1BWFN0 YXJ0VGV4dE1hcmtlcjogPEFYSGVhZGluZzogJ1sgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+Ci1BWEVu ZFRleHRNYXJrZXI6IDxBWEhlYWRpbmc6ICdbIF0gVG91cmV0dGUgc3luZHJvbWUnPgorQVhTdGFy dFRleHRNYXJrZXI6IDxBWEhlYWRpbmc6ICdbIGVkaXQgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CitB WEVuZFRleHRNYXJrZXI6IDxBWEhlYWRpbmc6ICdbIGVkaXQgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+ CiBBWFZpc2l0ZWQ6IDAKIEFYTGlua2VkVUlFbGVtZW50czogKG51bGwpCiBBWFNlbGVjdGVkOiAw CiBBWEJsb2NrUXVvdGVMZXZlbDogMAotQVhUb3BMZXZlbFVJRWxlbWVudDogPEFYSGVhZGluZzog J1sgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CitBWFRvcExldmVsVUlFbGVtZW50OiA8QVhIZWFkaW5n OiAnWyBlZGl0IF0gVG91cmV0dGUgc3luZHJvbWUnPgogQVhBUklBQnVzeTogMAogCiAtLS0tLS0t LS0tLS0K 208665 2013-08-13 12:43:05 -0700 2013-08-14 09:30:40 -0700 patch patch text/plain 13364 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDAxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA4LTEzICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEhlYWRpbmdzIG5v dCBsb25nZXIgaGF2ZSBhbiBBWFRpdGxlIGlmIHRoZXkgaGF2ZSBhIGxpbmsgYXMgdGhlIG9ubHkg Y2hpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx OTY5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v cm1hbGx5LCBmb2N1c2FibGUgY29udGVudCBpcyBub3QgaW5jdWRlZCB3aGVuIGxvb2tpbmcgYXQg dGhlIHZpc2libGUgdGV4dCBvZiBhbiBlbGVtZW50LgorICAgICAgICBPbmUgY2FzZSB3aGVyZSB3 ZSBuZWVkIGFuIGV4Y2VwdGlvbiBpcyB3aXRoIGhlYWRpbmdzLCB3aGVyZSB0aGVyZSBpcyB1c3Vh bGx5IGxpbmsgY29udGVudCBpbnNpZGUgdGhlIGhlYWRpbmcKKyAgICAgICAgdGhhdCB3ZSB3YW50 IHRvIGJlIHVzZWQgYXMgdGhlIHZpc2libGUgdGV4dC4KKworICAgICAgICBUZXN0OiBhY2Nlc3Np YmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3MuaHRtbAorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dmlzaWJsZVRleHQpOgorICAgICAgICAoV2ViQ29y ZTo6c2hvdWxkVXNlQWNjZXNzaWJsaXR5T2JqZWN0SW5uZXJUZXh0KToKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojp0aXRsZSk6CisgICAgICAgICogYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRl eHRVbmRlckVsZW1lbnRNb2RlOjpBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUpOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6dGV4dFVuZGVyRWxlbWVudCk6 CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnRleHRVbmRlckVs ZW1lbnQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5oOgorCiAyMDEzLTA4LTEzICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1z dW5nLmNvbT4KIAogICAgICAgICBOb2RlTGlzdC5pdGVtKCkgZG9lcyBub3QgYmVoYXZlIGFjY29y ZGluZyB0byBzcGVjaWZpY2F0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2F0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcAkocmV2aXNp b24gMTUzOTQ0KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvQWNjZXNzaWJp bGl0eU9iamVjdEF0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2NCw3ICsxNjQsNyBAQAogICAg IC8vIEdldCB0aGUgdGV4dCBsZW5ndGggZnJvbSB0aGUgZWxlbWVudHMgdW5kZXIgdGhlCiAgICAg Ly8gYWNjZXNzaWJpbGl0eSBvYmplY3QgaWYgdGhlIHZhbHVlIGlzIHN0aWxsIHplcm8uCiAgICAg aWYgKCF0ZXh0TGVuZ3RoICYmIGFsbG93c1RleHRSYW5nZXMoKSkKLSAgICAgICAgdGV4dExlbmd0 aCA9IHRleHRVbmRlckVsZW1lbnQoVGV4dFVuZGVyRWxlbWVudE1vZGVJbmNsdWRlQWxsQ2hpbGRy ZW4pLmxlbmd0aCgpOworICAgICAgICB0ZXh0TGVuZ3RoID0gdGV4dFVuZGVyRWxlbWVudChBY2Nl c3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUoQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1l bnRNb2RlOjpUZXh0VW5kZXJFbGVtZW50TW9kZUluY2x1ZGVBbGxDaGlsZHJlbikpLmxlbmd0aCgp OwogCiAgICAgcmV0dXJuIHRleHRMZW5ndGg7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlVGV4dC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZUlu dGVyZmFjZVRleHQuY3BwCShyZXZpc2lvbiAxNTM5NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlVGV4dC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTU5Miw3ICs1OTIsNyBAQAogICAgIGlmIChlbmRPZmZzZXQgPT0gLTEpIHsKICAg ICAgICAgZW5kID0gY29yZU9iamVjdC0+c3RyaW5nVmFsdWUoKS5sZW5ndGgoKTsKICAgICAgICAg aWYgKCFlbmQpCi0gICAgICAgICAgICBlbmQgPSBjb3JlT2JqZWN0LT50ZXh0VW5kZXJFbGVtZW50 KFRleHRVbmRlckVsZW1lbnRNb2RlSW5jbHVkZUFsbENoaWxkcmVuKS5sZW5ndGgoKTsKKyAgICAg ICAgICAgIGVuZCA9IGNvcmVPYmplY3QtPnRleHRVbmRlckVsZW1lbnQoQWNjZXNzaWJpbGl0eVRl eHRVbmRlckVsZW1lbnRNb2RlKEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZTo6VGV4 dFVuZGVyRWxlbWVudE1vZGVJbmNsdWRlQWxsQ2hpbGRyZW4pKS5sZW5ndGgoKTsKICAgICB9CiAK ICAgICBTdHJpbmcgcmV0OwpAQCAtNjAxLDcgKzYwMSw3IEBACiAgICAgZWxzZSB7CiAgICAgICAg IHJldCA9IGNvcmVPYmplY3QtPnN0cmluZ1ZhbHVlKCk7CiAgICAgICAgIGlmICghcmV0KQotICAg ICAgICAgICAgcmV0ID0gY29yZU9iamVjdC0+dGV4dFVuZGVyRWxlbWVudChUZXh0VW5kZXJFbGVt ZW50TW9kZUluY2x1ZGVBbGxDaGlsZHJlbik7CisgICAgICAgICAgICByZXQgPSBjb3JlT2JqZWN0 LT50ZXh0VW5kZXJFbGVtZW50KEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZShBY2Nl c3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGU6OlRleHRVbmRlckVsZW1lbnRNb2RlSW5jbHVk ZUFsbENoaWxkcmVuKSk7CiAgICAgfQogCiAgICAgaWYgKCFyZXQubGVuZ3RoKCkpIHsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oCShyZXZpc2lvbiAxNTM5NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMjQwLDkgKzI0MCwxOSBAQAog ICAgIH0KIH07CiAKLWVudW0gQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlIHsKLSAg ICBUZXh0VW5kZXJFbGVtZW50TW9kZVNraXBJZ25vcmVkQ2hpbGRyZW4sCi0gICAgVGV4dFVuZGVy RWxlbWVudE1vZGVJbmNsdWRlQWxsQ2hpbGRyZW4KK3N0cnVjdCBBY2Nlc3NpYmlsaXR5VGV4dFVu ZGVyRWxlbWVudE1vZGUgeworICAgIGVudW0gQ2hpbGRyZW5JbmNsdXNpb24geworICAgICAgICBU ZXh0VW5kZXJFbGVtZW50TW9kZVNraXBJZ25vcmVkQ2hpbGRyZW4sCisgICAgICAgIFRleHRVbmRl ckVsZW1lbnRNb2RlSW5jbHVkZUFsbENoaWxkcmVuLAorICAgIH07CisgICAgCisgICAgQ2hpbGRy ZW5JbmNsdXNpb24gY2hpbGRyZW5JbmNsdXNpb247CisgICAgYm9vbCBpbmNsdWRlRm9jdXNhYmxl Q29udGVudDsKKyAgICAKKyAgICBBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUoQ2hp bGRyZW5JbmNsdXNpb24gYyA9IFRleHRVbmRlckVsZW1lbnRNb2RlU2tpcElnbm9yZWRDaGlsZHJl biwgYm9vbCBpID0gZmFsc2UpCisgICAgOiBjaGlsZHJlbkluY2x1c2lvbihjKQorICAgICwgaW5j bHVkZUZvY3VzYWJsZUNvbnRlbnQoaSkKKyAgICB7IH0KIH07CiAgICAgCiBlbnVtIEFjY2Vzc2li aWxpdHlPcmllbnRhdGlvbiB7CkBAIC01OTAsNyArNjAwLDcgQEAKIAogICAgIC8vIE1ldGhvZHMg Zm9yIGRldGVybWluaW5nIGFjY2Vzc2liaWxpdHkgdGV4dC4KICAgICB2aXJ0dWFsIFN0cmluZyBz dHJpbmdWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9Ci0gICAgdmlydHVhbCBTdHJp bmcgdGV4dFVuZGVyRWxlbWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUgPSBU ZXh0VW5kZXJFbGVtZW50TW9kZVNraXBJZ25vcmVkQ2hpbGRyZW4pIGNvbnN0IHsgcmV0dXJuIFN0 cmluZygpOyB9CisgICAgdmlydHVhbCBTdHJpbmcgdGV4dFVuZGVyRWxlbWVudChBY2Nlc3NpYmls aXR5VGV4dFVuZGVyRWxlbWVudE1vZGUgPSBBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1v ZGUoKSkgY29uc3QgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICB2aXJ0dWFsIFN0cmluZyB0ZXh0 KCkgY29uc3QgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICB2aXJ0dWFsIGludCB0ZXh0TGVuZ3Ro KCkgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgU3RyaW5nIGFyaWFMYWJlbGVkQnlB dHRyaWJ1dGUoKSBjb25zdCB7IHJldHVybiBTdHJpbmcoKTsgfQpJbmRleDogU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0 LmgJKHJldmlzaW9uIDE1Mzk0NCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDQsNyArMTQ0LDcg QEAKICAgICB2aXJ0dWFsIFZpc2libGVTZWxlY3Rpb24gc2VsZWN0aW9uKCkgY29uc3Q7CiAgICAg dmlydHVhbCBTdHJpbmcgc3RyaW5nVmFsdWUoKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyBo ZWxwVGV4dCgpIGNvbnN0OwotICAgIHZpcnR1YWwgU3RyaW5nIHRleHRVbmRlckVsZW1lbnQoQWNj ZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlID0gVGV4dFVuZGVyRWxlbWVudE1vZGVTa2lw SWdub3JlZENoaWxkcmVuKSBjb25zdDsKKyAgICB2aXJ0dWFsIFN0cmluZyB0ZXh0VW5kZXJFbGVt ZW50KEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSA9IEFjY2Vzc2liaWxpdHlUZXh0 VW5kZXJFbGVtZW50TW9kZSgpKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyB0ZXh0KCkgY29u c3Q7CiAgICAgdmlydHVhbCBpbnQgdGV4dExlbmd0aCgpIGNvbnN0OwogICAgIHZpcnR1YWwgU3Ry aW5nIHNlbGVjdGVkVGV4dCgpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuaAkocmV2aXNpb24gMTUz OTQ0KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9i amVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsNyArMTIwLDcgQEAKICAgICB2aXJ0dWFsIEFj Y2Vzc2liaWxpdHlCdXR0b25TdGF0ZSBjaGVja2JveE9yUmFkaW9WYWx1ZSgpIGNvbnN0OwogCiAg ICAgdmlydHVhbCB1bnNpZ25lZCBoaWVyYXJjaGljYWxMZXZlbCgpIGNvbnN0OwotICAgIHZpcnR1 YWwgU3RyaW5nIHRleHRVbmRlckVsZW1lbnQoQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRN b2RlID0gVGV4dFVuZGVyRWxlbWVudE1vZGVTa2lwSWdub3JlZENoaWxkcmVuKSBjb25zdDsKKyAg ICB2aXJ0dWFsIFN0cmluZyB0ZXh0VW5kZXJFbGVtZW50KEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJF bGVtZW50TW9kZSA9IEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSgpKSBjb25zdDsK ICAgICB2aXJ0dWFsIFN0cmluZyBhY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24oKSBjb25zdDsKICAg ICB2aXJ0dWFsIFN0cmluZyBoZWxwVGV4dCgpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIHRp dGxlKCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDE1Mzk0NCkK KysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY0Nyw3ICs2NDcsNyBAQAogCiAgICAgLy8gV2UgdXNl IGEgdGV4dCBpdGVyYXRvciBmb3IgdGV4dCBvYmplY3RzIEFORCBmb3IgdGhvc2UgY2FzZXMgd2hl cmUgd2UgYXJlCiAgICAgLy8gZXhwbGljaXRseSBhc2tpbmcgZm9yIHRoZSBmdWxsIHRleHQgdW5k ZXIgYSBnaXZlbiBlbGVtZW50LgotICAgIGlmIChtX3JlbmRlcmVyLT5pc1RleHQoKSB8fCBtb2Rl ID09IFRleHRVbmRlckVsZW1lbnRNb2RlSW5jbHVkZUFsbENoaWxkcmVuKSB7CisgICAgaWYgKG1f cmVuZGVyZXItPmlzVGV4dCgpIHx8IG1vZGUuY2hpbGRyZW5JbmNsdXNpb24gPT0gQWNjZXNzaWJp bGl0eVRleHRVbmRlckVsZW1lbnRNb2RlOjpUZXh0VW5kZXJFbGVtZW50TW9kZUluY2x1ZGVBbGxD aGlsZHJlbikgewogICAgICAgICAvLyBJZiBwb3NzaWJsZSwgdXNlIGEgdGV4dCBpdGVyYXRvciB0 byBnZXQgdGhlIHRleHQsIHNvIHRoYXQgd2hpdGVzcGFjZQogICAgICAgICAvLyBpcyBoYW5kbGVk IGNvbnNpc3RlbnRseS4KICAgICAgICAgaWYgKE5vZGUqIG5vZGUgPSB0aGlzLT5ub2RlKCkpIHsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU5vZGVPYmplY3QuY3BwCShyZXZpc2lvbiAxNTM5NDQpCisrKyBTb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTI4MCw3ICsxMjgwLDEzIEBACiAgICAgICAgIHVzZVRleHRVbmRlckVsZW1lbnQgPSB0 cnVlOwogICAgIAogICAgIGlmICh1c2VUZXh0VW5kZXJFbGVtZW50KSB7Ci0gICAgICAgIFN0cmlu ZyB0ZXh0ID0gdGV4dFVuZGVyRWxlbWVudCgpOworICAgICAgICBBY2Nlc3NpYmlsaXR5VGV4dFVu ZGVyRWxlbWVudE1vZGUgbW9kZTsKKyAgICAgICAgCisgICAgICAgIC8vIEhlYWRpbmdzIG9mdGVu IGluY2x1ZGUgbGlua3MgYXMgZGlyZWN0IGNoaWxkcmVuLiBUaG9zZSBsaW5rcyBuZWVkIHRvIGJl IGluY2x1ZGVkIGluIHRleHQgdW5kZXIgZWxlbWVudC4KKyAgICAgICAgaWYgKGlzSGVhZGluZygp KQorICAgICAgICAgICAgbW9kZS5pbmNsdWRlRm9jdXNhYmxlQ29udGVudCA9IHRydWU7CisKKyAg ICAgICAgU3RyaW5nIHRleHQgPSB0ZXh0VW5kZXJFbGVtZW50KG1vZGUpOwogICAgICAgICBpZiAo IXRleHQuaXNFbXB0eSgpKQogICAgICAgICAgICAgdGV4dE9yZGVyLmFwcGVuZChBY2Nlc3NpYmls aXR5VGV4dCh0ZXh0LCBDaGlsZHJlblRleHQpKTsKICAgICB9CkBAIC0xNTA3LDcgKzE1MTMsNyBA QAogc3RhdGljIGJvb2wgc2hvdWxkVXNlQWNjZXNzaWJsaXR5T2JqZWN0SW5uZXJUZXh0KEFjY2Vz c2liaWxpdHlPYmplY3QqIG9iaiwgQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlIG1v ZGUpCiB7CiAgICAgLy8gRG8gbm90IHVzZSBhbnkgaGV1cmlzdGljIGlmIHdlIGFyZSBleHBsaWNp dGx5IGFza2luZyB0byBpbmNsdWRlIGFsbCB0aGUgY2hpbGRyZW4uCi0gICAgaWYgKG1vZGUgPT0g VGV4dFVuZGVyRWxlbWVudE1vZGVJbmNsdWRlQWxsQ2hpbGRyZW4pCisgICAgaWYgKG1vZGUuY2hp bGRyZW5JbmNsdXNpb24gPT0gQWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlOjpUZXh0 VW5kZXJFbGVtZW50TW9kZUluY2x1ZGVBbGxDaGlsZHJlbikKICAgICAgICAgcmV0dXJuIHRydWU7 CiAKICAgICAvLyBDb25zaWRlciB0aGlzIGh5cG90aGV0aWNhbCBleGFtcGxlOgpAQCAtMTUzNiw3 ICsxNTQyLDcgQEAKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgCiAgICAgLy8gU2tpcCBmb2N1 c2FibGUgY2hpbGRyZW4sIHNvIHdlIGRvbid0IGluY2x1ZGUgdGhlIHRleHQgb2YgbGlua3MgYW5k IGNvbnRyb2xzLgotICAgIGlmIChvYmotPmNhblNldEZvY3VzQXR0cmlidXRlKCkpCisgICAgaWYg KG9iai0+Y2FuU2V0Rm9jdXNBdHRyaWJ1dGUoKSAmJiAhbW9kZS5pbmNsdWRlRm9jdXNhYmxlQ29u dGVudCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gU2tpcCBiaWcgY29udGFpbmVy IGVsZW1lbnRzIGxpa2UgbGlzdHMsIHRhYmxlcywgZXRjLgpAQCAtMTYyNCwxMCArMTYzMCwxMiBA QAogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBpZiAoaXNIZWFkaW5nKCkgfHwgaXNMaW5r KCkpCisgICAgaWYgKGlzTGluaygpKQogICAgICAgICByZXR1cm4gdGV4dFVuZGVyRWxlbWVudCgp OworICAgIGlmIChpc0hlYWRpbmcoKSkKKyAgICAgICAgcmV0dXJuIHRleHRVbmRlckVsZW1lbnQo QWNjZXNzaWJpbGl0eVRleHRVbmRlckVsZW1lbnRNb2RlKEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJF bGVtZW50TW9kZTo6VGV4dFVuZGVyRWxlbWVudE1vZGVTa2lwSWdub3JlZENoaWxkcmVuLCB0cnVl KSk7CiAKLSAgICAvLyBJZiBpdCdzIGZvY3VzYWJsZSBidXQgaXQncyBub3QgY29udGVudCBlZGl0 YWJsZSBvciBhIGtub3duIGNvbnRyb2wgdHlwZSwgdGhlbiBpdCB3aWxsIGFwcGVhciB0byAgICAg ICAgICAgICAgICAgIAorICAgIC8vIElmIGl0J3MgZm9jdXNhYmxlIGJ1dCBpdCdzIG5vdCBjb250 ZW50IGVkaXRhYmxlIG9yIGEga25vd24gY29udHJvbCB0eXBlLCB0aGVuIGl0IHdpbGwgYXBwZWFy IHRvCiAgICAgLy8gdGhlIHVzZXIgYXMgYSBzaW5nbGUgYXRvbWljIG9iamVjdCwgc28gd2Ugc2hv dWxkIHVzZSBpdHMgdGV4dCBhcyB0aGUgZGVmYXVsdCB0aXRsZS4gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAKICAgICBpZiAoaXNHZW5lcmljRm9jdXNhYmxlRWxlbWVudCgpKQogICAgICAg ICByZXR1cm4gdGV4dFVuZGVyRWxlbWVudCgpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTU0MDEyKQor KysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTMtMDgtMTMgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAg ICAgICBBWDogSGVhZGluZ3Mgbm90IGxvbmdlciBoYXZlIGFuIEFYVGl0bGUgaWYgdGhleSBoYXZl IGEgbGluayBhcyB0aGUgb25seSBjaGlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE5Njk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMt bGlua3MuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv aGVhZGluZy10aXRsZS1pbmNsdWRlcy1saW5rcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg ICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2ludGVybmFsLWxpbmstYW5jaG9yczItZXhw ZWN0ZWQudHh0OgorCiAyMDEzLTA4LTEzICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lz YS5zYW1zdW5nLmNvbT4KIAogICAgICAgICBOb2RlTGlzdC5pdGVtKCkgZG9lcyBub3QgYmVoYXZl IGFjY29yZGluZyB0byBzcGVjaWZpY2F0aW9uCkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3MuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3MuaHRtbAko cmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvaGVhZGluZy10aXRsZS1p bmNsdWRlcy1saW5rcy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI4IEBACis8IURPQ1RZ UEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgor PHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3Njcmlw dD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5Ij4KKworPGgxIGlkPSJoZWFkaW5nIj4KKyAgICA8 YSBocmVmPSJBcHBsZS5jb20iPgorICAgIEFwcGxlCisgICAgPC9hPgorPC9oMT4KKworPHAgaWQ9 ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKworPHNjcmlwdD4K KworICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3RzIHRoYXQgdGhlIHRpdGxlIG9mIGEgaGVhZGlu ZyB3aWxsIGluY2x1ZGUgbGlua3MgaWYgYXZhaWxhYmxlLiIpOworCisgICAgaWYgKHdpbmRvdy5h Y2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworCisgICAgICAgIGRlYnVnKCJIZWFkaW5nIHRpdGxl OiAiICsgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJoZWFk aW5nIikudGl0bGUpOworICAgIH0KKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMv cmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cklu ZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9oZWFkaW5nLXRpdGxl LWluY2x1ZGVzLWxpbmtzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9oZWFkaW5nLXRpdGxlLWluY2x1ZGVzLWxpbmtzLWV4 cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nl c3NpYmlsaXR5L2hlYWRpbmctdGl0bGUtaW5jbHVkZXMtbGlua3MtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDEyIEBACitBcHBsZQorCitUaGlzIHRlc3RzIHRoYXQgdGhlIHRp dGxlIG9mIGEgaGVhZGluZyB3aWxsIGluY2x1ZGUgbGlua3MgaWYgYXZhaWxhYmxlLgorCitPbiBz dWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dl ZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworSGVhZGluZyB0aXRsZTogQVhUaXRsZTogQXBwbGUK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4 OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9pbnRlcm5hbC1saW5rLWFu Y2hvcnMyLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvYWNjZXNzaWJpbGl0eS9pbnRlcm5hbC1saW5rLWFuY2hvcnMyLWV4cGVjdGVkLnR4dAkocmV2 aXNpb24gMTUzOTQ0KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv aW50ZXJuYWwtbGluay1hbmNob3JzMi1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTUs MjIgKzUsMjIgQEAKIEFYUm9sZURlc2NyaXB0aW9uOiBoZWFkaW5nCiBBWENoaWxkcmVuOiA8YXJy YXkgb2Ygc2l6ZSA0PgogQVhIZWxwOiAKLUFYUGFyZW50OiA8QVhIZWFkaW5nOiAnWyBdIFRvdXJl dHRlIHN5bmRyb21lJz4KK0FYUGFyZW50OiA8QVhIZWFkaW5nOiAnWyBlZGl0IF0gVG91cmV0dGUg c3luZHJvbWUnPgogQVhTaXplOiBOU1NpemU6IHs3NjksIDIyfQotQVhUaXRsZTogWyBdIFRvdXJl dHRlIHN5bmRyb21lCitBWFRpdGxlOiBbIGVkaXQgXSBUb3VyZXR0ZSBzeW5kcm9tZQogQVhEZXNj cmlwdGlvbjogCiBBWFZhbHVlOiAzCiBBWEZvY3VzZWQ6IDAKIEFYRW5hYmxlZDogMQotQVhXaW5k b3c6IDxBWEhlYWRpbmc6ICdbIF0gVG91cmV0dGUgc3luZHJvbWUnPgorQVhXaW5kb3c6IDxBWEhl YWRpbmc6ICdbIGVkaXQgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CiBBWFNlbGVjdGVkVGV4dE1hcmtl clJhbmdlOiAobnVsbCkKLUFYU3RhcnRUZXh0TWFya2VyOiA8QVhIZWFkaW5nOiAnWyBdIFRvdXJl dHRlIHN5bmRyb21lJz4KLUFYRW5kVGV4dE1hcmtlcjogPEFYSGVhZGluZzogJ1sgXSBUb3VyZXR0 ZSBzeW5kcm9tZSc+CitBWFN0YXJ0VGV4dE1hcmtlcjogPEFYSGVhZGluZzogJ1sgZWRpdCBdIFRv dXJldHRlIHN5bmRyb21lJz4KK0FYRW5kVGV4dE1hcmtlcjogPEFYSGVhZGluZzogJ1sgZWRpdCBd IFRvdXJldHRlIHN5bmRyb21lJz4KIEFYVmlzaXRlZDogMAogQVhMaW5rZWRVSUVsZW1lbnRzOiAo bnVsbCkKIEFYU2VsZWN0ZWQ6IDAKIEFYQmxvY2tRdW90ZUxldmVsOiAwCi1BWFRvcExldmVsVUlF bGVtZW50OiA8QVhIZWFkaW5nOiAnWyBdIFRvdXJldHRlIHN5bmRyb21lJz4KK0FYVG9wTGV2ZWxV SUVsZW1lbnQ6IDxBWEhlYWRpbmc6ICdbIGVkaXQgXSBUb3VyZXR0ZSBzeW5kcm9tZSc+CiBBWEFS SUFCdXN5OiAwCiAKIC0tLS0tLS0tLS0tLQo=