84434 2012-04-20 04:48:41 -0700 [Qt][WK2] Convert touch-point area 2012-05-16 02:43:10 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 79666 1 allan.jensen allan.jensen jturcotte menard ossy webkit.review.bot zoltan oldest_to_newest 606497 0 allan.jensen 2012-04-20 04:48:41 -0700 In WK1 touch-point area is now converted from QTouchEvent::TouchPoint to PlatformTouchPoint, but it's missing from WK2. 606502 1 138069 allan.jensen 2012-04-20 04:53:53 -0700 Created attachment 138069 Patch 606629 2 138069 kenneth 2012-04-20 09:21:28 -0700 Comment on attachment 138069 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138069&action=review > Source/WebKit2/ChangeLog:6 > + [Qt][WK2] Convert touch-point area. > + https://bugs.webkit.org/show_bug.cgi?id=84434 > + > + Reviewed by NOBODY (OOPS!). it would be nicer with more descriptive changelogs explaining why this is a good idea and what it means etc. 606630 3 138069 kenneth 2012-04-20 09:21:32 -0700 Comment on attachment 138069 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138069&action=review > Source/WebKit2/ChangeLog:6 > + [Qt][WK2] Convert touch-point area. > + https://bugs.webkit.org/show_bug.cgi?id=84434 > + > + Reviewed by NOBODY (OOPS!). it would be nicer with more descriptive changelogs explaining why this is a good idea and what it means etc. 607197 4 allan.jensen 2012-04-21 06:27:31 -0700 (In reply to comment #2) > (From update of attachment 138069 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138069&action=review > > > Source/WebKit2/ChangeLog:6 > > + [Qt][WK2] Convert touch-point area. > > + https://bugs.webkit.org/show_bug.cgi?id=84434 > > + > > + Reviewed by NOBODY (OOPS!). > > it would be nicer with more descriptive changelogs explaining why this is a good idea and what it means etc. Okay. I left it out because it was really just an omission from a previous patch. It means dom touch-events when accessed from javascript does not have radius (and pressure) parameters. Well, at least not if the event comes from WebKit2, from WebKit1 the conversion is already handled. 607214 5 138069 kenneth 2012-04-21 09:39:23 -0700 Comment on attachment 138069 Patch Please add a bit more info to the changelog 607752 6 138363 allan.jensen 2012-04-23 09:25:52 -0700 Created attachment 138363 Patch for landing 607753 7 138363 allan.jensen 2012-04-23 09:27:33 -0700 Comment on attachment 138363 Patch for landing missed new files 607754 8 138364 allan.jensen 2012-04-23 09:30:25 -0700 Created attachment 138364 Patch for landing 607818 9 138364 webkit.review.bot 2012-04-23 10:37:15 -0700 Comment on attachment 138364 Patch for landing Clearing flags on attachment: 138364 Committed r114917: <http://trac.webkit.org/changeset/114917> 607819 10 webkit.review.bot 2012-04-23 10:37:29 -0700 All reviewed patches have been landed. Closing bug. 608447 11 ossy 2012-04-24 01:31:31 -0700 Reopen, because fast/events/touch/basic-single-touch-events.html started to fail after this change. http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Release%20WebKit2%20%28Amazon%20EC2%29/r114919%20%281606%29/fast/events/touch/basic-single-touch-events-pretty-diff.html 608452 12 ossy 2012-04-24 01:36:00 -0700 I skipped it to make the bot happier a little bit - http://trac.webkit.org/changeset/115010/trunk/LayoutTests/platform/qt-5.0-wk2/Skipped Please unskip it with the proper fix. 608457 13 allan.jensen 2012-04-24 01:39:05 -0700 (In reply to comment #12) > I skipped it to make the bot happier a little bit - http://trac.webkit.org/changeset/115010/trunk/LayoutTests/platform/qt-5.0-wk2/Skipped > > Please unskip it with the proper fix. It looks like the bot is not running with the new DumpRenderTree function. 608513 14 ossy 2012-04-24 03:35:54 -0700 Do you use the latest pinned Qt5 hash? 608611 15 138550 allan.jensen 2012-04-24 06:46:10 -0700 Created attachment 138550 Patch for failing test Also adds the new EventSender API to WebKitTestRunner 608755 16 138550 webkit.review.bot 2012-04-24 09:28:37 -0700 Comment on attachment 138550 Patch for failing test Clearing flags on attachment: 138550 Committed r115071: <http://trac.webkit.org/changeset/115071> 608756 17 webkit.review.bot 2012-04-24 09:28:43 -0700 All reviewed patches have been landed. Closing bug. 625193 18 jturcotte 2012-05-16 02:43:10 -0700 Committed r117245: <http://trac.webkit.org/changeset/117245> 138069 2012-04-20 04:53:53 -0700 2012-04-23 09:25:44 -0700 Patch bug-84434-20120420135400.patch text/plain 12963 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NzI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzY2MzMyMTczNjQ5MmVl M2M0NjQwMzFjMjM4YjhmYmY1Y2U0MDc0ZS4uMGUxNzUxMThkOTEzMzNlMzYwMDgxYzlhZDVmYzlm YjE3MDNjOTg1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA0LTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF1bV0syXSBDb252ZXJ0IHRvdWNoLXBvaW50IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJUb3VjaEV2ZW50 KToKKwogMjAxMi0wNC0xNyAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQG5v a2lhLmNvbT4KIAogICAgICAgICBbUXRdIE9wdGlvbmFsbHkgc3VwcG9ydCBzbW9vdGgtc2Nyb2xs aW5nIG9uIGFsbCBwbGF0Zm9ybXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv cXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL3F0L1dlYkV2 ZW50RmFjdG9yeVF0LmNwcAppbmRleCBlOTMwYzQ2MWMzYWFmZmJjODY0MjdmODg5NGIyZGEzZDk1 ZjRlOTI2Li4zMDkxZDY0Yzk2NzcwMDc1ZGJhOTUxNzkwZWYxN2E0NzRlOThhNTc5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAKQEAgLTIwOSw3 ICsyMDksOCBAQCBXZWJUb3VjaEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViVG91Y2hF dmVudChjb25zdCBRVG91Y2hFdmVudCogZXZlbnQsIGNvbgogICAgICAgICBpZiAodHlwZSA9PSBX ZWJFdmVudDo6VG91Y2hDYW5jZWwpCiAgICAgICAgICAgICBzdGF0ZSA9IFdlYlBsYXRmb3JtVG91 Y2hQb2ludDo6VG91Y2hDYW5jZWxsZWQ7CiAKLSAgICAgICAgbV90b3VjaFBvaW50cy5hcHBlbmQo V2ViUGxhdGZvcm1Ub3VjaFBvaW50KGlkLCBzdGF0ZSwgdG91Y2hQb2ludC5zY3JlZW5Qb3MoKS50 b1BvaW50KCksIGZyb21JdGVtVHJhbnNmb3JtLm1hcCh0b3VjaFBvaW50LnBvcygpKS50b1BvaW50 KCkpKTsKKyAgICAgICAgSW50U2l6ZSByYWRpdXModG91Y2hQb2ludC5yZWN0KCkud2lkdGgoKS8g MiwgdG91Y2hQb2ludC5yZWN0KCkuaGVpZ2h0KCkgLyAyKTsKKyAgICAgICAgbV90b3VjaFBvaW50 cy5hcHBlbmQoV2ViUGxhdGZvcm1Ub3VjaFBvaW50KGlkLCBzdGF0ZSwgdG91Y2hQb2ludC5zY3Jl ZW5Qb3MoKS50b1BvaW50KCksIGZyb21JdGVtVHJhbnNmb3JtLm1hcCh0b3VjaFBvaW50LnBvcygp KS50b1BvaW50KCksIHJhZGl1cywgMC4wLCB0b3VjaFBvaW50LnByZXNzdXJlKCkpKTsKICAgICB9 CiAKICAgICByZXR1cm4gV2ViVG91Y2hFdmVudCh0eXBlLCBtX3RvdWNoUG9pbnRzLCBtb2RpZmll cnMsIHRpbWVzdGFtcCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggNjJjNGI5M2ExZDk4NzJmZmViNDJkNGFhNWNjYTEwY2IwNGFiNDJlNC4uM2Jh ZGQ2MjAzYjBhMjhjOTdkY2RiYTRmMDBjZmFiY2E3NmIzNTg4YSAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0 LTIwICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisg ICAgICAgIFtRdF1bV0syXSBDb252ZXJ0IHRvdWNoLXBvaW50IGFyZWEuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQzNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgQWRkIGZlYXR1cmUgdG8g c2V0IHRvdWNoLXBvaW50IHJhZGl1cyBmb3IgZW1pdHRlZCB0b3VjaC1ldmVudHMuCisKKyAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNwcDoKKyAgICAgICAgKEV2ZW50 U2VuZGVyOjphZGRUb3VjaFBvaW50KToKKyAgICAgICAgKEV2ZW50U2VuZGVyOjp1cGRhdGVUb3Vj aFBvaW50KToKKyAgICAgICAgKEV2ZW50U2VuZGVyOjpzZXRUb3VjaFBvaW50UmFkaXVzKToKKyAg ICAgICAgKEV2ZW50U2VuZGVyOjpjbGVhclRvdWNoUG9pbnRzKToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0Lmg6CisgICAgICAgIChFdmVudFNlbmRlcik6CisKIDIw MTItMDQtMTcgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBub2tpYS5jb20+ CiAKICAgICAgICAgW1F0XSBPcHRpb25hbGx5IHN1cHBvcnQgc21vb3RoLXNjcm9sbGluZyBvbiBh bGwgcGxhdGZvcm1zLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRXZlbnRT ZW5kZXJRdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNwcApp bmRleCAwMjA5MDQ5YjZmYmM2YjQ4ZDZiNjQ4MjM5M2MwNDc2MDNkNTY2NTJjLi40YTNiMjQ1YWJl YTY1MzE4MmRlNmJjOTRhY2FkMDQxNjdlZmMxOGYwIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9x dC9FdmVudFNlbmRlclF0LmNwcApAQCAtNDExLDYgKzQxMSw4IEBAIHZvaWQgRXZlbnRTZW5kZXI6 OmFkZFRvdWNoUG9pbnQoaW50IHgsIGludCB5KQogICAgIHBvaW50LnNldFBvcyhwb3MpOwogICAg IHBvaW50LnNldFN0YXJ0UG9zKHBvcyk7CiAgICAgcG9pbnQuc2V0U3RhdGUoUXQ6OlRvdWNoUG9p bnRQcmVzc2VkKTsKKyAgICBpZiAoIW1fdG91Y2hQb2ludFJhZGl1cy5pc051bGwoKSkKKyAgICAg ICAgcG9pbnQuc2V0UmVjdChRUmVjdEYocG9zIC0gbV90b3VjaFBvaW50UmFkaXVzLCBwb3MgKyBt X3RvdWNoUG9pbnRSYWRpdXMpKTsKICAgICBtX3RvdWNoUG9pbnRzLmFwcGVuZChwb2ludCk7CiB9 CiAKQEAgLTQxOSw5ICs0MjEsMTIgQEAgdm9pZCBFdmVudFNlbmRlcjo6dXBkYXRlVG91Y2hQb2lu dChpbnQgaW5kZXgsIGludCB4LCBpbnQgeSkKICAgICBpZiAoaW5kZXggPCAwIHx8IGluZGV4ID49 IG1fdG91Y2hQb2ludHMuY291bnQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgUVRvdWNoRXZl bnQ6OlRvdWNoUG9pbnQgJnAgPSBtX3RvdWNoUG9pbnRzW2luZGV4XTsKLSAgICBwLnNldFBvcyhR UG9pbnRGKHgsIHkpKTsKLSAgICBwLnNldFN0YXRlKFF0OjpUb3VjaFBvaW50TW92ZWQpOworICAg IGNvbnN0IFFQb2ludEYgcG9zKHgsIHkpOworICAgIFFUb3VjaEV2ZW50OjpUb3VjaFBvaW50ICZw b2ludCA9IG1fdG91Y2hQb2ludHNbaW5kZXhdOworICAgIHBvaW50LnNldFBvcyhwb3MpOworICAg IHBvaW50LnNldFN0YXRlKFF0OjpUb3VjaFBvaW50TW92ZWQpOworICAgIGlmICghbV90b3VjaFBv aW50UmFkaXVzLmlzTnVsbCgpKQorICAgICAgICBwb2ludC5zZXRSZWN0KFFSZWN0Rihwb3MgLSBt X3RvdWNoUG9pbnRSYWRpdXMsIHBvcyArIG1fdG91Y2hQb2ludFJhZGl1cykpOwogfQogCiB2b2lk IEV2ZW50U2VuZGVyOjpzZXRUb3VjaE1vZGlmaWVyKGNvbnN0IFFTdHJpbmcgJm1vZGlmaWVyLCBi b29sIGVuYWJsZSkKQEAgLTQ0Miw2ICs0NDcsMTEgQEAgdm9pZCBFdmVudFNlbmRlcjo6c2V0VG91 Y2hNb2RpZmllcihjb25zdCBRU3RyaW5nICZtb2RpZmllciwgYm9vbCBlbmFibGUpCiAgICAgICAg IG1fdG91Y2hNb2RpZmllcnMgJj0gfm1vZDsKIH0KIAordm9pZCBFdmVudFNlbmRlcjo6c2V0VG91 Y2hQb2ludFJhZGl1cyhpbnQgcmFkaXVzWCwgaW50IHJhZGl1c1kpCit7CisgICAgbV90b3VjaFBv aW50UmFkaXVzID0gUVBvaW50KHJhZGl1c1gsIHJhZGl1c1kpOworfQorCiB2b2lkIEV2ZW50U2Vu ZGVyOjp0b3VjaFN0YXJ0KCkKIHsKICAgICBpZiAoIW1fdG91Y2hBY3RpdmUpIHsKQEAgLTQ4MCw2 ICs0OTAsNyBAQCB2b2lkIEV2ZW50U2VuZGVyOjpjbGVhclRvdWNoUG9pbnRzKCkKICAgICBtX3Rv dWNoUG9pbnRzLmNsZWFyKCk7CiAgICAgbV90b3VjaE1vZGlmaWVycyA9IFF0OjpLZXlib2FyZE1v ZGlmaWVycygpOwogICAgIG1fdG91Y2hBY3RpdmUgPSBmYWxzZTsKKyAgICBtX3RvdWNoUG9pbnRS YWRpdXMgPSBRUG9pbnQoKTsKIH0KIAogdm9pZCBFdmVudFNlbmRlcjo6cmVsZWFzZVRvdWNoUG9p bnQoaW50IGluZGV4KQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRXZlbnRT ZW5kZXJRdC5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRXZlbnRTZW5kZXJRdC5oCmluZGV4 IGU4MDhkYjk1NTRhN2UwY2E2YThhMDkyMWY1OTFmZWJlMzU4ODU3NWEuLjJjYTFiMTE4NDkwOWQ0 YzRkYzRhOWI2YzUzZTI2YzI4MDFkY2M4YTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0V2ZW50U2VuZGVyUXQuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVu dFNlbmRlclF0LmgKQEAgLTcwLDYgKzcwLDcgQEAgcHVibGljIHNsb3RzOgogICAgIHZvaWQgYWRk VG91Y2hQb2ludChpbnQgeCwgaW50IHkpOwogICAgIHZvaWQgdXBkYXRlVG91Y2hQb2ludChpbnQg aW5kZXgsIGludCB4LCBpbnQgeSk7CiAgICAgdm9pZCBzZXRUb3VjaE1vZGlmaWVyKGNvbnN0IFFT dHJpbmcgJm1vZGlmaWVyLCBib29sIGVuYWJsZSk7CisgICAgdm9pZCBzZXRUb3VjaFBvaW50UmFk aXVzKGludCByYWRpdXNYLCBpbnQgcmFkaXVzWSk7CiAgICAgdm9pZCB0b3VjaFN0YXJ0KCk7CiAg ICAgdm9pZCB0b3VjaE1vdmUoKTsKICAgICB2b2lkIHRvdWNoRW5kKCk7CkBAIC0xMDEsNiArMTAy LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlcGxheVNhdmVkRXZlbnRzKGJvb2wgZmx1c2gpOwog ICAgIFFQb2ludCBtX21vdXNlUG9zOwogICAgIFFQb2ludCBtX2NsaWNrUG9zOworICAgIFFQb2lu dCBtX3RvdWNoUG9pbnRSYWRpdXM7CiAgICAgUXQ6Ok1vdXNlQnV0dG9ucyBtX21vdXNlQnV0dG9u czsKICAgICBRV2ViUGFnZSogbV9wYWdlOwogICAgIGludCBtX2NsaWNrQ291bnQ7CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg ZDk3NDAzZGUwMjBiYjdmYTg5NTQ4OWMzOTVjYTFiZWEyYjNmOGYwYi4uZGY1MTA2OWExNjVkZmY0 ZjJiMDdlZTI1MmE5MDViNWMyZTI1MDNjNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA0 LTIwICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisg ICAgICAgIFtRdF1bV0syXSBDb252ZXJ0IHRvdWNoLXBvaW50IGFyZWEuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQzNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgRXhwYW5kIHRoZSBiYXNp YyB0b3VjaCB0ZXN0LCB0byBjaGVjayB0b3VjaC1wb2ludCByYWRpdXMsIGlmIGZlYXR1cmUKKyAg ICAgICAgaXMgYXZhaWxhYmxlIGluIEV2ZW50U2VuZGVyLgorCisgICAgICAgICogZmFzdC9ldmVu dHMvdG91Y2gvc2NyaXB0LXRlc3RzL2Jhc2ljLXNpbmdsZS10b3VjaC1ldmVudHMuanM6CisgICAg ICAgICh2ZXJpZnlUb3VjaFBvaW50KToKKyAgICAgICAgKHZlcmlmeVRvdWNoKToKKyAgICAgICAg KHNpbmdsZVRvdWNoU2VxdWVuY2UpOgorCiAyMDEyLTA0LTIwICBNaWtoYWlsIE5hZ2Fub3YgIDxt bmFnYW5vdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkIHRl c3QgcmVzdWx0cyB1cGRhdGUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90 b3VjaC9zY3JpcHQtdGVzdHMvYmFzaWMtc2luZ2xlLXRvdWNoLWV2ZW50cy5qcyBiL0xheW91dFRl c3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3NjcmlwdC10ZXN0cy9iYXNpYy1zaW5nbGUtdG91Y2gtZXZl bnRzLmpzCmluZGV4IGU4NGJhNzVjYzYwYTI4YTdkMGNiNDY3N2M0NDFmMjI3ZWY5M2EzYTQuLjAz ZWFkYTk0ZjMzN2RlY2I5NjYxYjE4Y2Q4ZmQwMmQ5ODMwYzc2NjUgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3NjcmlwdC10ZXN0cy9iYXNpYy1zaW5nbGUtdG91Y2gt ZXZlbnRzLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3NjcmlwdC10ZXN0 cy9iYXNpYy1zaW5nbGUtdG91Y2gtZXZlbnRzLmpzCkBAIC00MCwxMyArNDAsMTggQEAgZnVuY3Rp b24gdmVyaWZ5VG91Y2hFdmVudCh0eXBlLCB0b3RhbFRvdWNoQ291bnQsIGNoYW5nZWRUb3VjaENv dW50LCB0YXJnZXRUb3VjaEMKICAgICBzaG91bGRCZSgibGFzdEV2ZW50LnBhZ2VZIiwgIjAiKTsK IH0KIAotZnVuY3Rpb24gdmVyaWZ5VG91Y2hQb2ludChsaXN0LCBwb2ludCwgeCwgeSwgaWQpCitm dW5jdGlvbiB2ZXJpZnlUb3VjaFBvaW50KGxpc3QsIHBvaW50LCB4LCB5LCBpZCwgcngsIHJ5KQog ewogICAgIHNob3VsZEJlKCJsYXN0RXZlbnQuIiArIGxpc3QgKyAiWyIgKyBwb2ludCArICJdLnBh Z2VYIiwgeC50b1N0cmluZygpKTsKICAgICBzaG91bGRCZSgibGFzdEV2ZW50LiIgKyBsaXN0ICsg IlsiICsgcG9pbnQgKyAiXS5wYWdlWSIsIHkudG9TdHJpbmcoKSk7CiAgICAgc2hvdWxkQmUoImxh c3RFdmVudC4iICsgbGlzdCArICJbIiArIHBvaW50ICsgIl0uY2xpZW50WCIsIHgudG9TdHJpbmco KSk7CiAgICAgc2hvdWxkQmUoImxhc3RFdmVudC4iICsgbGlzdCArICJbIiArIHBvaW50ICsgIl0u Y2xpZW50WSIsIHkudG9TdHJpbmcoKSk7CiAgICAgc2hvdWxkQmUoImxhc3RFdmVudC4iICsgbGlz dCArICJbIiArIHBvaW50ICsgIl0uaWRlbnRpZmllciIsIGlkLnRvU3RyaW5nKCkpOworICAgIGlm IChldmVudFNlbmRlci5zZXRUb3VjaFBvaW50UmFkaXVzKSB7CisgICAgICAgIHNob3VsZEJlKCJs YXN0RXZlbnQuIiArIGxpc3QgKyAiWyIgKyBwb2ludCArICJdLndlYmtpdFJhZGl1c1giLCByeC50 b1N0cmluZygpKTsKKyAgICAgICAgc2hvdWxkQmUoImxhc3RFdmVudC4iICsgbGlzdCArICJbIiAr IHBvaW50ICsgIl0ud2Via2l0UmFkaXVzWSIsIHJ5LnRvU3RyaW5nKCkpOworICAgIH0KKyAgICAK IH0KIAogZnVuY3Rpb24gdmVyaWZ5VG91Y2god2hpY2gpIHsKQEAgLTU1LDEzICs2MCwxMyBAQCBm dW5jdGlvbiB2ZXJpZnlUb3VjaCh3aGljaCkgewogICAgICAgICAgICB2ZXJpZnlUb3VjaEV2ZW50 KCJ0b3VjaHN0YXJ0IiwgMSwgMSwgMSk7CiAgICAgICAgICAgIHNob3VsZEJlKCJsYXN0RXZlbnQu c2hpZnRLZXkiLCAiZmFsc2UiKTsKICAgICAgICAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJs YXN0RXZlbnQudG91Y2hlc1swXS50YXJnZXQuaWQiLCAidG91Y2h0YXJnZXQiKTsKLSAgICAgICAg ICAgdmVyaWZ5VG91Y2hQb2ludCgidG91Y2hlcyIsIDAsIDEwLCAxMCwgMCk7Ci0gICAgICAgICAg IHZlcmlmeVRvdWNoUG9pbnQoImNoYW5nZWRUb3VjaGVzIiwgMCwgMTAsIDEwLCAwKTsKLSAgICAg ICAgICAgdmVyaWZ5VG91Y2hQb2ludCgidGFyZ2V0VG91Y2hlcyIsIDAsIDEwLCAxMCwgMCk7Cisg ICAgICAgICAgIHZlcmlmeVRvdWNoUG9pbnQoInRvdWNoZXMiLCAwLCAxMCwgMTAsIDAsIDEwLCAx MCk7CisgICAgICAgICAgIHZlcmlmeVRvdWNoUG9pbnQoImNoYW5nZWRUb3VjaGVzIiwgMCwgMTAs IDEwLCAwLCAxMCwgMTApOworICAgICAgICAgICB2ZXJpZnlUb3VjaFBvaW50KCJ0YXJnZXRUb3Vj aGVzIiwgMCwgMTAsIDEwLCAwLCAxMCwgMTApOwogICAgICAgICBicmVhazsKICAgICAgICAgY2Fz ZSAxOgogICAgICAgICAgICB2ZXJpZnlUb3VjaEV2ZW50KCJ0b3VjaG1vdmUiLCAxLCAxLCAxKTsK LSAgICAgICAgICAgdmVyaWZ5VG91Y2hQb2ludCgidG91Y2hlcyIsIDAsIDUwLCA1MCwgMCk7Cisg ICAgICAgICAgIHZlcmlmeVRvdWNoUG9pbnQoInRvdWNoZXMiLCAwLCA1MCwgNTAsIDAsIDEyLCAx Mik7CiAgICAgICAgICAgIHNob3VsZEJlKCJsYXN0RXZlbnQuc2hpZnRLZXkiLCAidHJ1ZSIpOwog ICAgICAgICAgICBzaG91bGRCZSgibGFzdEV2ZW50LmFsdEtleSIsICJ0cnVlIik7CiAgICAgICAg ICAgIHNob3VsZEJlKCJsYXN0RXZlbnQuY3RybEtleSIsICJmYWxzZSIpOwpAQCAtNjksNyArNzQs NyBAQCBmdW5jdGlvbiB2ZXJpZnlUb3VjaCh3aGljaCkgewogICAgICAgICBicmVhazsKICAgICAg ICAgY2FzZSAyOgogICAgICAgICAgICAgdmVyaWZ5VG91Y2hFdmVudCgidG91Y2hlbmQiLCAwLCAx LCAwKTsKLSAgICAgICAgICAgIHZlcmlmeVRvdWNoUG9pbnQoImNoYW5nZWRUb3VjaGVzIiwgMCwg NTAsIDUwLCAwKTsKKyAgICAgICAgICAgIHZlcmlmeVRvdWNoUG9pbnQoImNoYW5nZWRUb3VjaGVz IiwgMCwgNTAsIDUwLCAwLCAxMiwgMTIpOwogICAgICAgICAgICAgc2hvdWxkQmUoImxhc3RFdmVu dC5zaGlmdEtleSIsICJmYWxzZSIpOwogICAgICAgICAgICAgc2hvdWxkQmUoImxhc3RFdmVudC5h bHRLZXkiLCAiZmFsc2UiKTsKICAgICAgICAgYnJlYWs7CkBAIC04OCw5ICs5MywxMyBAQCBmdW5j dGlvbiB2ZXJpZnlUb3VjaCh3aGljaCkgewogCiBmdW5jdGlvbiBzaW5nbGVUb3VjaFNlcXVlbmNl KCkKIHsKKyAgICBpZiAoZXZlbnRTZW5kZXIuc2V0VG91Y2hQb2ludFJhZGl1cykKKyAgICAgICAg ZXZlbnRTZW5kZXIuc2V0VG91Y2hQb2ludFJhZGl1cygxMCwxMCk7CiAgICAgZXZlbnRTZW5kZXIu YWRkVG91Y2hQb2ludCgxMCwgMTApOwogICAgIGV2ZW50U2VuZGVyLnRvdWNoU3RhcnQoKTsKIAor ICAgIGlmIChldmVudFNlbmRlci5zZXRUb3VjaFBvaW50UmFkaXVzKQorICAgICAgICBldmVudFNl bmRlci5zZXRUb3VjaFBvaW50UmFkaXVzKDEyLDEyKTsKICAgICBldmVudFNlbmRlci51cGRhdGVU b3VjaFBvaW50KDAsIDUwLCA1MCk7CiAgICAgZXZlbnRTZW5kZXIuc2V0VG91Y2hNb2RpZmllcigi c2hpZnQiLCB0cnVlKTsKICAgICBldmVudFNlbmRlci5zZXRUb3VjaE1vZGlmaWVyKCJhbHQiLCB0 cnVlKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L2Zhc3QvZXZlbnRzL3Rv dWNoL2Jhc2ljLXNpbmdsZS10b3VjaC1ldmVudHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vcXQvZmFzdC9ldmVudHMvdG91Y2gvYmFzaWMtc2luZ2xlLXRvdWNoLWV2ZW50cy1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDY1OWEyYTQwZTJlYjljZDRmZjMyMmVjZWUwNjM4YTMw NTZhOWMxZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L2Zhc3Qv ZXZlbnRzL3RvdWNoL2Jhc2ljLXNpbmdsZS10b3VjaC1ldmVudHMtZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsODQgQEAKK1RoaXMgdGVzdHMgYmFzaWMgc2luZ2xlIHRvdWNoIGV2ZW50IHN1cHBvcnQu CisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMs IGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIGxhc3RFdmVudC50eXBlIGlz ICJ0b3VjaHN0YXJ0IgorUEFTUyBsYXN0RXZlbnQudG91Y2hlcy5sZW5ndGggaXMgMQorUEFTUyBs YXN0RXZlbnQuY2hhbmdlZFRvdWNoZXMubGVuZ3RoIGlzIDEKK1BBU1MgbGFzdEV2ZW50LnRhcmdl dFRvdWNoZXMubGVuZ3RoIGlzIDEKK1BBU1MgbGFzdEV2ZW50LnBhZ2VYIGlzIDAKK1BBU1MgbGFz dEV2ZW50LnBhZ2VZIGlzIDAKK1BBU1MgbGFzdEV2ZW50LnNoaWZ0S2V5IGlzIGZhbHNlCitQQVNT IGxhc3RFdmVudC50b3VjaGVzWzBdLnRhcmdldC5pZCBpcyAidG91Y2h0YXJnZXQiCitQQVNTIGxh c3RFdmVudC50b3VjaGVzWzBdLnBhZ2VYIGlzIDEwCitQQVNTIGxhc3RFdmVudC50b3VjaGVzWzBd LnBhZ2VZIGlzIDEwCitQQVNTIGxhc3RFdmVudC50b3VjaGVzWzBdLmNsaWVudFggaXMgMTAKK1BB U1MgbGFzdEV2ZW50LnRvdWNoZXNbMF0uY2xpZW50WSBpcyAxMAorUEFTUyBsYXN0RXZlbnQudG91 Y2hlc1swXS5pZGVudGlmaWVyIGlzIDAKK1BBU1MgbGFzdEV2ZW50LnRvdWNoZXNbMF0ud2Via2l0 UmFkaXVzWCBpcyAxMAorUEFTUyBsYXN0RXZlbnQudG91Y2hlc1swXS53ZWJraXRSYWRpdXNZIGlz IDEwCitQQVNTIGxhc3RFdmVudC5jaGFuZ2VkVG91Y2hlc1swXS5wYWdlWCBpcyAxMAorUEFTUyBs YXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0ucGFnZVkgaXMgMTAKK1BBU1MgbGFzdEV2ZW50LmNo YW5nZWRUb3VjaGVzWzBdLmNsaWVudFggaXMgMTAKK1BBU1MgbGFzdEV2ZW50LmNoYW5nZWRUb3Vj aGVzWzBdLmNsaWVudFkgaXMgMTAKK1BBU1MgbGFzdEV2ZW50LmNoYW5nZWRUb3VjaGVzWzBdLmlk ZW50aWZpZXIgaXMgMAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0ud2Via2l0UmFk aXVzWCBpcyAxMAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0ud2Via2l0UmFkaXVz WSBpcyAxMAorUEFTUyBsYXN0RXZlbnQudGFyZ2V0VG91Y2hlc1swXS5wYWdlWCBpcyAxMAorUEFT UyBsYXN0RXZlbnQudGFyZ2V0VG91Y2hlc1swXS5wYWdlWSBpcyAxMAorUEFTUyBsYXN0RXZlbnQu dGFyZ2V0VG91Y2hlc1swXS5jbGllbnRYIGlzIDEwCitQQVNTIGxhc3RFdmVudC50YXJnZXRUb3Vj aGVzWzBdLmNsaWVudFkgaXMgMTAKK1BBU1MgbGFzdEV2ZW50LnRhcmdldFRvdWNoZXNbMF0uaWRl bnRpZmllciBpcyAwCitQQVNTIGxhc3RFdmVudC50YXJnZXRUb3VjaGVzWzBdLndlYmtpdFJhZGl1 c1ggaXMgMTAKK1BBU1MgbGFzdEV2ZW50LnRhcmdldFRvdWNoZXNbMF0ud2Via2l0UmFkaXVzWSBp cyAxMAorUEFTUyBsYXN0RXZlbnQudHlwZSBpcyAidG91Y2htb3ZlIgorUEFTUyBsYXN0RXZlbnQu dG91Y2hlcy5sZW5ndGggaXMgMQorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXMubGVuZ3Ro IGlzIDEKK1BBU1MgbGFzdEV2ZW50LnRhcmdldFRvdWNoZXMubGVuZ3RoIGlzIDEKK1BBU1MgbGFz dEV2ZW50LnBhZ2VYIGlzIDAKK1BBU1MgbGFzdEV2ZW50LnBhZ2VZIGlzIDAKK1BBU1MgbGFzdEV2 ZW50LnRvdWNoZXNbMF0ucGFnZVggaXMgNTAKK1BBU1MgbGFzdEV2ZW50LnRvdWNoZXNbMF0ucGFn ZVkgaXMgNTAKK1BBU1MgbGFzdEV2ZW50LnRvdWNoZXNbMF0uY2xpZW50WCBpcyA1MAorUEFTUyBs YXN0RXZlbnQudG91Y2hlc1swXS5jbGllbnRZIGlzIDUwCitQQVNTIGxhc3RFdmVudC50b3VjaGVz WzBdLmlkZW50aWZpZXIgaXMgMAorUEFTUyBsYXN0RXZlbnQudG91Y2hlc1swXS53ZWJraXRSYWRp dXNYIGlzIDEyCitQQVNTIGxhc3RFdmVudC50b3VjaGVzWzBdLndlYmtpdFJhZGl1c1kgaXMgMTIK K1BBU1MgbGFzdEV2ZW50LnNoaWZ0S2V5IGlzIHRydWUKK1BBU1MgbGFzdEV2ZW50LmFsdEtleSBp cyB0cnVlCitQQVNTIGxhc3RFdmVudC5jdHJsS2V5IGlzIGZhbHNlCitQQVNTIGxhc3RFdmVudC5t ZXRhS2V5IGlzIGZhbHNlCitQQVNTIGxhc3RFdmVudC50eXBlIGlzICJ0b3VjaGVuZCIKK1BBU1Mg bGFzdEV2ZW50LnRvdWNoZXMubGVuZ3RoIGlzIDAKK1BBU1MgbGFzdEV2ZW50LmNoYW5nZWRUb3Vj aGVzLmxlbmd0aCBpcyAxCitQQVNTIGxhc3RFdmVudC50YXJnZXRUb3VjaGVzLmxlbmd0aCBpcyAw CitQQVNTIGxhc3RFdmVudC5wYWdlWCBpcyAwCitQQVNTIGxhc3RFdmVudC5wYWdlWSBpcyAwCitQ QVNTIGxhc3RFdmVudC5jaGFuZ2VkVG91Y2hlc1swXS5wYWdlWCBpcyA1MAorUEFTUyBsYXN0RXZl bnQuY2hhbmdlZFRvdWNoZXNbMF0ucGFnZVkgaXMgNTAKK1BBU1MgbGFzdEV2ZW50LmNoYW5nZWRU b3VjaGVzWzBdLmNsaWVudFggaXMgNTAKK1BBU1MgbGFzdEV2ZW50LmNoYW5nZWRUb3VjaGVzWzBd LmNsaWVudFkgaXMgNTAKK1BBU1MgbGFzdEV2ZW50LmNoYW5nZWRUb3VjaGVzWzBdLmlkZW50aWZp ZXIgaXMgMAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0ud2Via2l0UmFkaXVzWCBp cyAxMgorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0ud2Via2l0UmFkaXVzWSBpcyAx MgorUEFTUyBsYXN0RXZlbnQuc2hpZnRLZXkgaXMgZmFsc2UKK1BBU1MgbGFzdEV2ZW50LmFsdEtl eSBpcyBmYWxzZQorUEFTUyBsYXN0RXZlbnQudHlwZSBpcyAidG91Y2hzdGFydCIKK1BBU1MgbGFz dEV2ZW50LnRvdWNoZXMubGVuZ3RoIGlzIDEKK1BBU1MgbGFzdEV2ZW50LmNoYW5nZWRUb3VjaGVz Lmxlbmd0aCBpcyAxCitQQVNTIGxhc3RFdmVudC50YXJnZXRUb3VjaGVzLmxlbmd0aCBpcyAxCitQ QVNTIGxhc3RFdmVudC5wYWdlWCBpcyAwCitQQVNTIGxhc3RFdmVudC5wYWdlWSBpcyAwCitQQVNT IGxhc3RFdmVudC50YXJnZXRUb3VjaGVzWzBdLnRhcmdldC50YWdOYW1lIGlzICJESVYiCitQQVNT IGxhc3RFdmVudC50eXBlIGlzICJ0b3VjaG1vdmUiCitQQVNTIGxhc3RFdmVudC50b3VjaGVzLmxl bmd0aCBpcyAxCitQQVNTIGxhc3RFdmVudC5jaGFuZ2VkVG91Y2hlcy5sZW5ndGggaXMgMQorUEFT UyBsYXN0RXZlbnQudGFyZ2V0VG91Y2hlcy5sZW5ndGggaXMgMQorUEFTUyBsYXN0RXZlbnQucGFn ZVggaXMgMAorUEFTUyBsYXN0RXZlbnQucGFnZVkgaXMgMAorUEFTUyBsYXN0RXZlbnQudG91Y2hl c1swXS50YXJnZXQudGFnTmFtZSBpcyAiRElWIgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMg dHJ1ZQorCitURVNUIENPTVBMRVRFCisK 138363 2012-04-23 09:25:52 -0700 2012-04-23 09:30:19 -0700 Patch for landing bug-84434-20120423182558.patch text/plain 9341 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTdmZTFlYzg5YjVmZTkz YjUyN2FhMzgzYWRmZmY0YTdmMmVhZDZmNS4uNWQ1ODJiYjQ2NDYxYmE2NzZkMWVlNzUzMGIzMTM0 NGI5Nzg2NzUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF1bV0syXSBDb252ZXJ0IHRvdWNoLXBvaW50IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IEtl bm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIE1pc3NlZCBXZWJLaXQyIGNvbnZl cnNpb24gaW4gY29tbWl0IHIxMDY0NzAuCisKKyAgICAgICAgKiBTaGFyZWQvcXQvV2ViRXZlbnRG YWN0b3J5UXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdl YlRvdWNoRXZlbnQpOgorCiAyMDEyLTA0LTIzICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBBZGQgdGVzdCBmdW5jdGlvbiB0byBnZXQgcGxhY2Vob2xkZXIgc3Ry aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5 UXQuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNwcApp bmRleCBlOTMwYzQ2MWMzYWFmZmJjODY0MjdmODg5NGIyZGEzZDk1ZjRlOTI2Li4zMDkxZDY0Yzk2 NzcwMDc1ZGJhOTUxNzkwZWYxN2E0NzRlOThhNTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAKQEAgLTIwOSw3ICsyMDksOCBAQCBXZWJUb3Vj aEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViVG91Y2hFdmVudChjb25zdCBRVG91Y2hF dmVudCogZXZlbnQsIGNvbgogICAgICAgICBpZiAodHlwZSA9PSBXZWJFdmVudDo6VG91Y2hDYW5j ZWwpCiAgICAgICAgICAgICBzdGF0ZSA9IFdlYlBsYXRmb3JtVG91Y2hQb2ludDo6VG91Y2hDYW5j ZWxsZWQ7CiAKLSAgICAgICAgbV90b3VjaFBvaW50cy5hcHBlbmQoV2ViUGxhdGZvcm1Ub3VjaFBv aW50KGlkLCBzdGF0ZSwgdG91Y2hQb2ludC5zY3JlZW5Qb3MoKS50b1BvaW50KCksIGZyb21JdGVt VHJhbnNmb3JtLm1hcCh0b3VjaFBvaW50LnBvcygpKS50b1BvaW50KCkpKTsKKyAgICAgICAgSW50 U2l6ZSByYWRpdXModG91Y2hQb2ludC5yZWN0KCkud2lkdGgoKS8gMiwgdG91Y2hQb2ludC5yZWN0 KCkuaGVpZ2h0KCkgLyAyKTsKKyAgICAgICAgbV90b3VjaFBvaW50cy5hcHBlbmQoV2ViUGxhdGZv cm1Ub3VjaFBvaW50KGlkLCBzdGF0ZSwgdG91Y2hQb2ludC5zY3JlZW5Qb3MoKS50b1BvaW50KCks IGZyb21JdGVtVHJhbnNmb3JtLm1hcCh0b3VjaFBvaW50LnBvcygpKS50b1BvaW50KCksIHJhZGl1 cywgMC4wLCB0b3VjaFBvaW50LnByZXNzdXJlKCkpKTsKICAgICB9CiAKICAgICByZXR1cm4gV2Vi VG91Y2hFdmVudCh0eXBlLCBtX3RvdWNoUG9pbnRzLCBtb2RpZmllcnMsIHRpbWVzdGFtcCk7CmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDI0NmJm OTQyYzE0Y2Q3NzU1MTMzZjIwNWJmMzA5N2JmMjI5YTk4Mi4uNDE4ZTI5ZTkyMWEwNDA0NTFiZDU4 MDhlMmM5MzYwYjdhMWRkMzk0NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTIwICBBbGxhbiBTYW5kZmVs ZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBD b252ZXJ0IHRvdWNoLXBvaW50IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NDQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIEFkZCBmZWF0dXJlIHRvIHNldCB0b3VjaC1wb2lu dCByYWRpdXMgZm9yIGVtaXR0ZWQgdG91Y2gtZXZlbnRzLgorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvcXQvRXZlbnRTZW5kZXJRdC5jcHA6CisgICAgICAgIChFdmVudFNlbmRlcjo6YWRkVG91 Y2hQb2ludCk6CisgICAgICAgIChFdmVudFNlbmRlcjo6dXBkYXRlVG91Y2hQb2ludCk6CisgICAg ICAgIChFdmVudFNlbmRlcjo6c2V0VG91Y2hQb2ludFJhZGl1cyk6CisgICAgICAgIChFdmVudFNl bmRlcjo6Y2xlYXJUb3VjaFBvaW50cyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvRXZl bnRTZW5kZXJRdC5oOgorICAgICAgICAoRXZlbnRTZW5kZXIpOgorCiAyMDEyLTA0LTIzICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBy b2xsaW5nIG91dCByMTE0ODgxLCBiZWNhdXNlIGl0IGJyb2tlIHVwbG9hZCBidWlsZHN0ZXAuCmRp ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNwcCBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL3F0L0V2ZW50U2VuZGVyUXQuY3BwCmluZGV4IDAyMDkwNDliNmZi YzZiNDhkNmI2NDgyMzkzYzA0NzYwM2Q1NjY1MmMuLjRhM2IyNDVhYmVhNjUzMTgyZGU2YmM5NGFj YWQwNDE2N2VmYzE4ZjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0V2ZW50 U2VuZGVyUXQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0V2ZW50U2VuZGVyUXQu Y3BwCkBAIC00MTEsNiArNDExLDggQEAgdm9pZCBFdmVudFNlbmRlcjo6YWRkVG91Y2hQb2ludChp bnQgeCwgaW50IHkpCiAgICAgcG9pbnQuc2V0UG9zKHBvcyk7CiAgICAgcG9pbnQuc2V0U3RhcnRQ b3MocG9zKTsKICAgICBwb2ludC5zZXRTdGF0ZShRdDo6VG91Y2hQb2ludFByZXNzZWQpOworICAg IGlmICghbV90b3VjaFBvaW50UmFkaXVzLmlzTnVsbCgpKQorICAgICAgICBwb2ludC5zZXRSZWN0 KFFSZWN0Rihwb3MgLSBtX3RvdWNoUG9pbnRSYWRpdXMsIHBvcyArIG1fdG91Y2hQb2ludFJhZGl1 cykpOwogICAgIG1fdG91Y2hQb2ludHMuYXBwZW5kKHBvaW50KTsKIH0KIApAQCAtNDE5LDkgKzQy MSwxMiBAQCB2b2lkIEV2ZW50U2VuZGVyOjp1cGRhdGVUb3VjaFBvaW50KGludCBpbmRleCwgaW50 IHgsIGludCB5KQogICAgIGlmIChpbmRleCA8IDAgfHwgaW5kZXggPj0gbV90b3VjaFBvaW50cy5j b3VudCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBRVG91Y2hFdmVudDo6VG91Y2hQb2ludCAm cCA9IG1fdG91Y2hQb2ludHNbaW5kZXhdOwotICAgIHAuc2V0UG9zKFFQb2ludEYoeCwgeSkpOwot ICAgIHAuc2V0U3RhdGUoUXQ6OlRvdWNoUG9pbnRNb3ZlZCk7CisgICAgY29uc3QgUVBvaW50RiBw b3MoeCwgeSk7CisgICAgUVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQgJnBvaW50ID0gbV90b3VjaFBv aW50c1tpbmRleF07CisgICAgcG9pbnQuc2V0UG9zKHBvcyk7CisgICAgcG9pbnQuc2V0U3RhdGUo UXQ6OlRvdWNoUG9pbnRNb3ZlZCk7CisgICAgaWYgKCFtX3RvdWNoUG9pbnRSYWRpdXMuaXNOdWxs KCkpCisgICAgICAgIHBvaW50LnNldFJlY3QoUVJlY3RGKHBvcyAtIG1fdG91Y2hQb2ludFJhZGl1 cywgcG9zICsgbV90b3VjaFBvaW50UmFkaXVzKSk7CiB9CiAKIHZvaWQgRXZlbnRTZW5kZXI6OnNl dFRvdWNoTW9kaWZpZXIoY29uc3QgUVN0cmluZyAmbW9kaWZpZXIsIGJvb2wgZW5hYmxlKQpAQCAt NDQyLDYgKzQ0NywxMSBAQCB2b2lkIEV2ZW50U2VuZGVyOjpzZXRUb3VjaE1vZGlmaWVyKGNvbnN0 IFFTdHJpbmcgJm1vZGlmaWVyLCBib29sIGVuYWJsZSkKICAgICAgICAgbV90b3VjaE1vZGlmaWVy cyAmPSB+bW9kOwogfQogCit2b2lkIEV2ZW50U2VuZGVyOjpzZXRUb3VjaFBvaW50UmFkaXVzKGlu dCByYWRpdXNYLCBpbnQgcmFkaXVzWSkKK3sKKyAgICBtX3RvdWNoUG9pbnRSYWRpdXMgPSBRUG9p bnQocmFkaXVzWCwgcmFkaXVzWSk7Cit9CisKIHZvaWQgRXZlbnRTZW5kZXI6OnRvdWNoU3RhcnQo KQogewogICAgIGlmICghbV90b3VjaEFjdGl2ZSkgewpAQCAtNDgwLDYgKzQ5MCw3IEBAIHZvaWQg RXZlbnRTZW5kZXI6OmNsZWFyVG91Y2hQb2ludHMoKQogICAgIG1fdG91Y2hQb2ludHMuY2xlYXIo KTsKICAgICBtX3RvdWNoTW9kaWZpZXJzID0gUXQ6OktleWJvYXJkTW9kaWZpZXJzKCk7CiAgICAg bV90b3VjaEFjdGl2ZSA9IGZhbHNlOworICAgIG1fdG91Y2hQb2ludFJhZGl1cyA9IFFQb2ludCgp OwogfQogCiB2b2lkIEV2ZW50U2VuZGVyOjpyZWxlYXNlVG91Y2hQb2ludChpbnQgaW5kZXgpCmRp ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmggYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmgKaW5kZXggZTgwOGRiOTU1NGE3ZTBj YTZhOGEwOTIxZjU5MWZlYmUzNTg4NTc1YS4uMmNhMWIxMTg0OTA5ZDRjNGRjNGE5YjZjNTNlMjZj MjgwMWRjYzhhOCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRXZlbnRTZW5k ZXJRdC5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0V2ZW50U2VuZGVyUXQuaApAQCAt NzAsNiArNzAsNyBAQCBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBhZGRUb3VjaFBvaW50KGludCB4 LCBpbnQgeSk7CiAgICAgdm9pZCB1cGRhdGVUb3VjaFBvaW50KGludCBpbmRleCwgaW50IHgsIGlu dCB5KTsKICAgICB2b2lkIHNldFRvdWNoTW9kaWZpZXIoY29uc3QgUVN0cmluZyAmbW9kaWZpZXIs IGJvb2wgZW5hYmxlKTsKKyAgICB2b2lkIHNldFRvdWNoUG9pbnRSYWRpdXMoaW50IHJhZGl1c1gs IGludCByYWRpdXNZKTsKICAgICB2b2lkIHRvdWNoU3RhcnQoKTsKICAgICB2b2lkIHRvdWNoTW92 ZSgpOwogICAgIHZvaWQgdG91Y2hFbmQoKTsKQEAgLTEwMSw2ICsxMDIsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgcmVwbGF5U2F2ZWRFdmVudHMoYm9vbCBmbHVzaCk7CiAgICAgUVBvaW50IG1fbW91 c2VQb3M7CiAgICAgUVBvaW50IG1fY2xpY2tQb3M7CisgICAgUVBvaW50IG1fdG91Y2hQb2ludFJh ZGl1czsKICAgICBRdDo6TW91c2VCdXR0b25zIG1fbW91c2VCdXR0b25zOwogICAgIFFXZWJQYWdl KiBtX3BhZ2U7CiAgICAgaW50IG1fY2xpY2tDb3VudDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMzI1Y2U5MWQ2MzBhZmUw YzExZGFmNDgxNGNhNjNmOThjNGU0ODc1Li4yOTUzNjIzMTY2ZTJjZjIzZWQzZjkzYjQyMTM0YmRj N2JkZTAzZjZmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDQtMjAgIEFsbGFuIFNhbmRm ZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtXSzJd IENvbnZlcnQgdG91Y2gtcG9pbnQgYXJlYS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTg0NDM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBS b2hkZSBDaHJpc3RpYW5zZW4uCisKKyAgICAgICAgRXhwYW5kIHRoZSBiYXNpYyB0b3VjaCB0ZXN0 LCB0byBjaGVjayB0b3VjaC1wb2ludCByYWRpdXMsIGlmIGZlYXR1cmUKKyAgICAgICAgaXMgYXZh aWxhYmxlIGluIEV2ZW50U2VuZGVyLgorCisgICAgICAgICogZmFzdC9ldmVudHMvdG91Y2gvc2Ny aXB0LXRlc3RzL2Jhc2ljLXNpbmdsZS10b3VjaC1ldmVudHMuanM6CisgICAgICAgICh2ZXJpZnlU b3VjaFBvaW50KToKKyAgICAgICAgKHZlcmlmeVRvdWNoKToKKyAgICAgICAgKHNpbmdsZVRvdWNo U2VxdWVuY2UpOgorCiAyMDEyLTA0LTIzICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkIHRlc3QgZXhwZWN0YXRp b25zIHVwZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3Nj cmlwdC10ZXN0cy9iYXNpYy1zaW5nbGUtdG91Y2gtZXZlbnRzLmpzIGIvTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvdG91Y2gvc2NyaXB0LXRlc3RzL2Jhc2ljLXNpbmdsZS10b3VjaC1ldmVudHMuanMK aW5kZXggZTg0YmE3NWNjNjBhMjhhN2QwY2I0Njc3YzQ0MWYyMjdlZjkzYTNhNC4uMzYxYzY5MmE2 MWI3NjgyOWY3MDA1NzdlNmZmODNmMTA2YzUwMjM3NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvdG91Y2gvc2NyaXB0LXRlc3RzL2Jhc2ljLXNpbmdsZS10b3VjaC1ldmVudHMu anMKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvc2NyaXB0LXRlc3RzL2Jhc2lj LXNpbmdsZS10b3VjaC1ldmVudHMuanMKQEAgLTQwLDEzICs0MCwxNyBAQCBmdW5jdGlvbiB2ZXJp ZnlUb3VjaEV2ZW50KHR5cGUsIHRvdGFsVG91Y2hDb3VudCwgY2hhbmdlZFRvdWNoQ291bnQsIHRh cmdldFRvdWNoQwogICAgIHNob3VsZEJlKCJsYXN0RXZlbnQucGFnZVkiLCAiMCIpOwogfQogCi1m dW5jdGlvbiB2ZXJpZnlUb3VjaFBvaW50KGxpc3QsIHBvaW50LCB4LCB5LCBpZCkKK2Z1bmN0aW9u IHZlcmlmeVRvdWNoUG9pbnQobGlzdCwgcG9pbnQsIHgsIHksIGlkLCByeCwgcnkpCiB7CiAgICAg c2hvdWxkQmUoImxhc3RFdmVudC4iICsgbGlzdCArICJbIiArIHBvaW50ICsgIl0ucGFnZVgiLCB4 LnRvU3RyaW5nKCkpOwogICAgIHNob3VsZEJlKCJsYXN0RXZlbnQuIiArIGxpc3QgKyAiWyIgKyBw b2ludCArICJdLnBhZ2VZIiwgeS50b1N0cmluZygpKTsKICAgICBzaG91bGRCZSgibGFzdEV2ZW50 LiIgKyBsaXN0ICsgIlsiICsgcG9pbnQgKyAiXS5jbGllbnRYIiwgeC50b1N0cmluZygpKTsKICAg ICBzaG91bGRCZSgibGFzdEV2ZW50LiIgKyBsaXN0ICsgIlsiICsgcG9pbnQgKyAiXS5jbGllbnRZ IiwgeS50b1N0cmluZygpKTsKICAgICBzaG91bGRCZSgibGFzdEV2ZW50LiIgKyBsaXN0ICsgIlsi ICsgcG9pbnQgKyAiXS5pZGVudGlmaWVyIiwgaWQudG9TdHJpbmcoKSk7CisgICAgaWYgKGV2ZW50 U2VuZGVyLnNldFRvdWNoUG9pbnRSYWRpdXMpIHsKKyAgICAgICAgc2hvdWxkQmUoImxhc3RFdmVu dC4iICsgbGlzdCArICJbIiArIHBvaW50ICsgIl0ud2Via2l0UmFkaXVzWCIsIHJ4LnRvU3RyaW5n KCkpOworICAgICAgICBzaG91bGRCZSgibGFzdEV2ZW50LiIgKyBsaXN0ICsgIlsiICsgcG9pbnQg KyAiXS53ZWJraXRSYWRpdXNZIiwgcnkudG9TdHJpbmcoKSk7CisgICAgfQogfQogCiBmdW5jdGlv biB2ZXJpZnlUb3VjaCh3aGljaCkgewpAQCAtNTUsMTMgKzU5LDEzIEBAIGZ1bmN0aW9uIHZlcmlm eVRvdWNoKHdoaWNoKSB7CiAgICAgICAgICAgIHZlcmlmeVRvdWNoRXZlbnQoInRvdWNoc3RhcnQi LCAxLCAxLCAxKTsKICAgICAgICAgICAgc2hvdWxkQmUoImxhc3RFdmVudC5zaGlmdEtleSIsICJm YWxzZSIpOwogICAgICAgICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImxhc3RFdmVudC50b3Vj aGVzWzBdLnRhcmdldC5pZCIsICJ0b3VjaHRhcmdldCIpOwotICAgICAgICAgICB2ZXJpZnlUb3Vj aFBvaW50KCJ0b3VjaGVzIiwgMCwgMTAsIDEwLCAwKTsKLSAgICAgICAgICAgdmVyaWZ5VG91Y2hQ b2ludCgiY2hhbmdlZFRvdWNoZXMiLCAwLCAxMCwgMTAsIDApOwotICAgICAgICAgICB2ZXJpZnlU b3VjaFBvaW50KCJ0YXJnZXRUb3VjaGVzIiwgMCwgMTAsIDEwLCAwKTsKKyAgICAgICAgICAgdmVy aWZ5VG91Y2hQb2ludCgidG91Y2hlcyIsIDAsIDEwLCAxMCwgMCwgMTAsIDEwKTsKKyAgICAgICAg ICAgdmVyaWZ5VG91Y2hQb2ludCgiY2hhbmdlZFRvdWNoZXMiLCAwLCAxMCwgMTAsIDAsIDEwLCAx MCk7CisgICAgICAgICAgIHZlcmlmeVRvdWNoUG9pbnQoInRhcmdldFRvdWNoZXMiLCAwLCAxMCwg MTAsIDAsIDEwLCAxMCk7CiAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIDE6CiAgICAgICAg ICAgIHZlcmlmeVRvdWNoRXZlbnQoInRvdWNobW92ZSIsIDEsIDEsIDEpOwotICAgICAgICAgICB2 ZXJpZnlUb3VjaFBvaW50KCJ0b3VjaGVzIiwgMCwgNTAsIDUwLCAwKTsKKyAgICAgICAgICAgdmVy aWZ5VG91Y2hQb2ludCgidG91Y2hlcyIsIDAsIDUwLCA1MCwgMCwgMTIsIDEyKTsKICAgICAgICAg ICAgc2hvdWxkQmUoImxhc3RFdmVudC5zaGlmdEtleSIsICJ0cnVlIik7CiAgICAgICAgICAgIHNo b3VsZEJlKCJsYXN0RXZlbnQuYWx0S2V5IiwgInRydWUiKTsKICAgICAgICAgICAgc2hvdWxkQmUo Imxhc3RFdmVudC5jdHJsS2V5IiwgImZhbHNlIik7CkBAIC02OSw3ICs3Myw3IEBAIGZ1bmN0aW9u IHZlcmlmeVRvdWNoKHdoaWNoKSB7CiAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIDI6CiAg ICAgICAgICAgICB2ZXJpZnlUb3VjaEV2ZW50KCJ0b3VjaGVuZCIsIDAsIDEsIDApOwotICAgICAg ICAgICAgdmVyaWZ5VG91Y2hQb2ludCgiY2hhbmdlZFRvdWNoZXMiLCAwLCA1MCwgNTAsIDApOwor ICAgICAgICAgICAgdmVyaWZ5VG91Y2hQb2ludCgiY2hhbmdlZFRvdWNoZXMiLCAwLCA1MCwgNTAs IDAsIDEyLCAxMik7CiAgICAgICAgICAgICBzaG91bGRCZSgibGFzdEV2ZW50LnNoaWZ0S2V5Iiwg ImZhbHNlIik7CiAgICAgICAgICAgICBzaG91bGRCZSgibGFzdEV2ZW50LmFsdEtleSIsICJmYWxz ZSIpOwogICAgICAgICBicmVhazsKQEAgLTg4LDkgKzkyLDEzIEBAIGZ1bmN0aW9uIHZlcmlmeVRv dWNoKHdoaWNoKSB7CiAKIGZ1bmN0aW9uIHNpbmdsZVRvdWNoU2VxdWVuY2UoKQogeworICAgIGlm IChldmVudFNlbmRlci5zZXRUb3VjaFBvaW50UmFkaXVzKQorICAgICAgICBldmVudFNlbmRlci5z ZXRUb3VjaFBvaW50UmFkaXVzKDEwLDEwKTsKICAgICBldmVudFNlbmRlci5hZGRUb3VjaFBvaW50 KDEwLCAxMCk7CiAgICAgZXZlbnRTZW5kZXIudG91Y2hTdGFydCgpOwogCisgICAgaWYgKGV2ZW50 U2VuZGVyLnNldFRvdWNoUG9pbnRSYWRpdXMpCisgICAgICAgIGV2ZW50U2VuZGVyLnNldFRvdWNo UG9pbnRSYWRpdXMoMTIsMTIpOwogICAgIGV2ZW50U2VuZGVyLnVwZGF0ZVRvdWNoUG9pbnQoMCwg NTAsIDUwKTsKICAgICBldmVudFNlbmRlci5zZXRUb3VjaE1vZGlmaWVyKCJzaGlmdCIsIHRydWUp OwogICAgIGV2ZW50U2VuZGVyLnNldFRvdWNoTW9kaWZpZXIoImFsdCIsIHRydWUpOwo= 138364 2012-04-23 09:30:25 -0700 2012-04-23 10:37:15 -0700 Patch for landing bug-84434-20120423183032.patch text/plain 13007 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTdmZTFlYzg5YjVmZTkz YjUyN2FhMzgzYWRmZmY0YTdmMmVhZDZmNS4uNWQ1ODJiYjQ2NDYxYmE2NzZkMWVlNzUzMGIzMTM0 NGI5Nzg2NzUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTIwICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF1bV0syXSBDb252ZXJ0IHRvdWNoLXBvaW50IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IEtl bm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIE1pc3NlZCBXZWJLaXQyIGNvbnZl cnNpb24gaW4gY29tbWl0IHIxMDY0NzAuCisKKyAgICAgICAgKiBTaGFyZWQvcXQvV2ViRXZlbnRG YWN0b3J5UXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdl YlRvdWNoRXZlbnQpOgorCiAyMDEyLTA0LTIzICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBBZGQgdGVzdCBmdW5jdGlvbiB0byBnZXQgcGxhY2Vob2xkZXIgc3Ry aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5 UXQuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNwcApp bmRleCBlOTMwYzQ2MWMzYWFmZmJjODY0MjdmODg5NGIyZGEzZDk1ZjRlOTI2Li4zMDkxZDY0Yzk2 NzcwMDc1ZGJhOTUxNzkwZWYxN2E0NzRlOThhNTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHAKQEAgLTIwOSw3ICsyMDksOCBAQCBXZWJUb3Vj aEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViVG91Y2hFdmVudChjb25zdCBRVG91Y2hF dmVudCogZXZlbnQsIGNvbgogICAgICAgICBpZiAodHlwZSA9PSBXZWJFdmVudDo6VG91Y2hDYW5j ZWwpCiAgICAgICAgICAgICBzdGF0ZSA9IFdlYlBsYXRmb3JtVG91Y2hQb2ludDo6VG91Y2hDYW5j ZWxsZWQ7CiAKLSAgICAgICAgbV90b3VjaFBvaW50cy5hcHBlbmQoV2ViUGxhdGZvcm1Ub3VjaFBv aW50KGlkLCBzdGF0ZSwgdG91Y2hQb2ludC5zY3JlZW5Qb3MoKS50b1BvaW50KCksIGZyb21JdGVt VHJhbnNmb3JtLm1hcCh0b3VjaFBvaW50LnBvcygpKS50b1BvaW50KCkpKTsKKyAgICAgICAgSW50 U2l6ZSByYWRpdXModG91Y2hQb2ludC5yZWN0KCkud2lkdGgoKS8gMiwgdG91Y2hQb2ludC5yZWN0 KCkuaGVpZ2h0KCkgLyAyKTsKKyAgICAgICAgbV90b3VjaFBvaW50cy5hcHBlbmQoV2ViUGxhdGZv cm1Ub3VjaFBvaW50KGlkLCBzdGF0ZSwgdG91Y2hQb2ludC5zY3JlZW5Qb3MoKS50b1BvaW50KCks IGZyb21JdGVtVHJhbnNmb3JtLm1hcCh0b3VjaFBvaW50LnBvcygpKS50b1BvaW50KCksIHJhZGl1 cywgMC4wLCB0b3VjaFBvaW50LnByZXNzdXJlKCkpKTsKICAgICB9CiAKICAgICByZXR1cm4gV2Vi VG91Y2hFdmVudCh0eXBlLCBtX3RvdWNoUG9pbnRzLCBtb2RpZmllcnMsIHRpbWVzdGFtcCk7CmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDI0NmJm OTQyYzE0Y2Q3NzU1MTMzZjIwNWJmMzA5N2JmMjI5YTk4Mi4uNDE4ZTI5ZTkyMWEwNDA0NTFiZDU4 MDhlMmM5MzYwYjdhMWRkMzk0NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTIwICBBbGxhbiBTYW5kZmVs ZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBD b252ZXJ0IHRvdWNoLXBvaW50IGFyZWEuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NDQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIEFkZCBmZWF0dXJlIHRvIHNldCB0b3VjaC1wb2lu dCByYWRpdXMgZm9yIGVtaXR0ZWQgdG91Y2gtZXZlbnRzLgorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvcXQvRXZlbnRTZW5kZXJRdC5jcHA6CisgICAgICAgIChFdmVudFNlbmRlcjo6YWRkVG91 Y2hQb2ludCk6CisgICAgICAgIChFdmVudFNlbmRlcjo6dXBkYXRlVG91Y2hQb2ludCk6CisgICAg ICAgIChFdmVudFNlbmRlcjo6c2V0VG91Y2hQb2ludFJhZGl1cyk6CisgICAgICAgIChFdmVudFNl bmRlcjo6Y2xlYXJUb3VjaFBvaW50cyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvRXZl bnRTZW5kZXJRdC5oOgorICAgICAgICAoRXZlbnRTZW5kZXIpOgorCiAyMDEyLTA0LTIzICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBy b2xsaW5nIG91dCByMTE0ODgxLCBiZWNhdXNlIGl0IGJyb2tlIHVwbG9hZCBidWlsZHN0ZXAuCmRp ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNwcCBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL3F0L0V2ZW50U2VuZGVyUXQuY3BwCmluZGV4IDAyMDkwNDliNmZi YzZiNDhkNmI2NDgyMzkzYzA0NzYwM2Q1NjY1MmMuLjRhM2IyNDVhYmVhNjUzMTgyZGU2YmM5NGFj YWQwNDE2N2VmYzE4ZjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0V2ZW50 U2VuZGVyUXQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0V2ZW50U2VuZGVyUXQu Y3BwCkBAIC00MTEsNiArNDExLDggQEAgdm9pZCBFdmVudFNlbmRlcjo6YWRkVG91Y2hQb2ludChp bnQgeCwgaW50IHkpCiAgICAgcG9pbnQuc2V0UG9zKHBvcyk7CiAgICAgcG9pbnQuc2V0U3RhcnRQ b3MocG9zKTsKICAgICBwb2ludC5zZXRTdGF0ZShRdDo6VG91Y2hQb2ludFByZXNzZWQpOworICAg IGlmICghbV90b3VjaFBvaW50UmFkaXVzLmlzTnVsbCgpKQorICAgICAgICBwb2ludC5zZXRSZWN0 KFFSZWN0Rihwb3MgLSBtX3RvdWNoUG9pbnRSYWRpdXMsIHBvcyArIG1fdG91Y2hQb2ludFJhZGl1 cykpOwogICAgIG1fdG91Y2hQb2ludHMuYXBwZW5kKHBvaW50KTsKIH0KIApAQCAtNDE5LDkgKzQy MSwxMiBAQCB2b2lkIEV2ZW50U2VuZGVyOjp1cGRhdGVUb3VjaFBvaW50KGludCBpbmRleCwgaW50 IHgsIGludCB5KQogICAgIGlmIChpbmRleCA8IDAgfHwgaW5kZXggPj0gbV90b3VjaFBvaW50cy5j b3VudCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBRVG91Y2hFdmVudDo6VG91Y2hQb2ludCAm cCA9IG1fdG91Y2hQb2ludHNbaW5kZXhdOwotICAgIHAuc2V0UG9zKFFQb2ludEYoeCwgeSkpOwot ICAgIHAuc2V0U3RhdGUoUXQ6OlRvdWNoUG9pbnRNb3ZlZCk7CisgICAgY29uc3QgUVBvaW50RiBw b3MoeCwgeSk7CisgICAgUVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQgJnBvaW50ID0gbV90b3VjaFBv aW50c1tpbmRleF07CisgICAgcG9pbnQuc2V0UG9zKHBvcyk7CisgICAgcG9pbnQuc2V0U3RhdGUo UXQ6OlRvdWNoUG9pbnRNb3ZlZCk7CisgICAgaWYgKCFtX3RvdWNoUG9pbnRSYWRpdXMuaXNOdWxs KCkpCisgICAgICAgIHBvaW50LnNldFJlY3QoUVJlY3RGKHBvcyAtIG1fdG91Y2hQb2ludFJhZGl1 cywgcG9zICsgbV90b3VjaFBvaW50UmFkaXVzKSk7CiB9CiAKIHZvaWQgRXZlbnRTZW5kZXI6OnNl dFRvdWNoTW9kaWZpZXIoY29uc3QgUVN0cmluZyAmbW9kaWZpZXIsIGJvb2wgZW5hYmxlKQpAQCAt NDQyLDYgKzQ0NywxMSBAQCB2b2lkIEV2ZW50U2VuZGVyOjpzZXRUb3VjaE1vZGlmaWVyKGNvbnN0 IFFTdHJpbmcgJm1vZGlmaWVyLCBib29sIGVuYWJsZSkKICAgICAgICAgbV90b3VjaE1vZGlmaWVy cyAmPSB+bW9kOwogfQogCit2b2lkIEV2ZW50U2VuZGVyOjpzZXRUb3VjaFBvaW50UmFkaXVzKGlu dCByYWRpdXNYLCBpbnQgcmFkaXVzWSkKK3sKKyAgICBtX3RvdWNoUG9pbnRSYWRpdXMgPSBRUG9p bnQocmFkaXVzWCwgcmFkaXVzWSk7Cit9CisKIHZvaWQgRXZlbnRTZW5kZXI6OnRvdWNoU3RhcnQo KQogewogICAgIGlmICghbV90b3VjaEFjdGl2ZSkgewpAQCAtNDgwLDYgKzQ5MCw3IEBAIHZvaWQg RXZlbnRTZW5kZXI6OmNsZWFyVG91Y2hQb2ludHMoKQogICAgIG1fdG91Y2hQb2ludHMuY2xlYXIo KTsKICAgICBtX3RvdWNoTW9kaWZpZXJzID0gUXQ6OktleWJvYXJkTW9kaWZpZXJzKCk7CiAgICAg bV90b3VjaEFjdGl2ZSA9IGZhbHNlOworICAgIG1fdG91Y2hQb2ludFJhZGl1cyA9IFFQb2ludCgp OwogfQogCiB2b2lkIEV2ZW50U2VuZGVyOjpyZWxlYXNlVG91Y2hQb2ludChpbnQgaW5kZXgpCmRp ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmggYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmgKaW5kZXggZTgwOGRiOTU1NGE3ZTBj YTZhOGEwOTIxZjU5MWZlYmUzNTg4NTc1YS4uMmNhMWIxMTg0OTA5ZDRjNGRjNGE5YjZjNTNlMjZj MjgwMWRjYzhhOCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRXZlbnRTZW5k ZXJRdC5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0V2ZW50U2VuZGVyUXQuaApAQCAt NzAsNiArNzAsNyBAQCBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBhZGRUb3VjaFBvaW50KGludCB4 LCBpbnQgeSk7CiAgICAgdm9pZCB1cGRhdGVUb3VjaFBvaW50KGludCBpbmRleCwgaW50IHgsIGlu dCB5KTsKICAgICB2b2lkIHNldFRvdWNoTW9kaWZpZXIoY29uc3QgUVN0cmluZyAmbW9kaWZpZXIs IGJvb2wgZW5hYmxlKTsKKyAgICB2b2lkIHNldFRvdWNoUG9pbnRSYWRpdXMoaW50IHJhZGl1c1gs IGludCByYWRpdXNZKTsKICAgICB2b2lkIHRvdWNoU3RhcnQoKTsKICAgICB2b2lkIHRvdWNoTW92 ZSgpOwogICAgIHZvaWQgdG91Y2hFbmQoKTsKQEAgLTEwMSw2ICsxMDIsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgcmVwbGF5U2F2ZWRFdmVudHMoYm9vbCBmbHVzaCk7CiAgICAgUVBvaW50IG1fbW91 c2VQb3M7CiAgICAgUVBvaW50IG1fY2xpY2tQb3M7CisgICAgUVBvaW50IG1fdG91Y2hQb2ludFJh ZGl1czsKICAgICBRdDo6TW91c2VCdXR0b25zIG1fbW91c2VCdXR0b25zOwogICAgIFFXZWJQYWdl KiBtX3BhZ2U7CiAgICAgaW50IG1fY2xpY2tDb3VudDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMzI1Y2U5MWQ2MzBhZmUw YzExZGFmNDgxNGNhNjNmOThjNGU0ODc1Li4yOTUzNjIzMTY2ZTJjZjIzZWQzZjkzYjQyMTM0YmRj N2JkZTAzZjZmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDQtMjAgIEFsbGFuIFNhbmRm ZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtXSzJd IENvbnZlcnQgdG91Y2gtcG9pbnQgYXJlYS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTg0NDM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBS b2hkZSBDaHJpc3RpYW5zZW4uCisKKyAgICAgICAgRXhwYW5kIHRoZSBiYXNpYyB0b3VjaCB0ZXN0 LCB0byBjaGVjayB0b3VjaC1wb2ludCByYWRpdXMsIGlmIGZlYXR1cmUKKyAgICAgICAgaXMgYXZh aWxhYmxlIGluIEV2ZW50U2VuZGVyLgorCisgICAgICAgICogZmFzdC9ldmVudHMvdG91Y2gvc2Ny aXB0LXRlc3RzL2Jhc2ljLXNpbmdsZS10b3VjaC1ldmVudHMuanM6CisgICAgICAgICh2ZXJpZnlU b3VjaFBvaW50KToKKyAgICAgICAgKHZlcmlmeVRvdWNoKToKKyAgICAgICAgKHNpbmdsZVRvdWNo U2VxdWVuY2UpOgorCiAyMDEyLTA0LTIzICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkIHRlc3QgZXhwZWN0YXRp b25zIHVwZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3Nj cmlwdC10ZXN0cy9iYXNpYy1zaW5nbGUtdG91Y2gtZXZlbnRzLmpzIGIvTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvdG91Y2gvc2NyaXB0LXRlc3RzL2Jhc2ljLXNpbmdsZS10b3VjaC1ldmVudHMuanMK aW5kZXggZTg0YmE3NWNjNjBhMjhhN2QwY2I0Njc3YzQ0MWYyMjdlZjkzYTNhNC4uMzYxYzY5MmE2 MWI3NjgyOWY3MDA1NzdlNmZmODNmMTA2YzUwMjM3NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvdG91Y2gvc2NyaXB0LXRlc3RzL2Jhc2ljLXNpbmdsZS10b3VjaC1ldmVudHMu anMKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvc2NyaXB0LXRlc3RzL2Jhc2lj LXNpbmdsZS10b3VjaC1ldmVudHMuanMKQEAgLTQwLDEzICs0MCwxNyBAQCBmdW5jdGlvbiB2ZXJp ZnlUb3VjaEV2ZW50KHR5cGUsIHRvdGFsVG91Y2hDb3VudCwgY2hhbmdlZFRvdWNoQ291bnQsIHRh cmdldFRvdWNoQwogICAgIHNob3VsZEJlKCJsYXN0RXZlbnQucGFnZVkiLCAiMCIpOwogfQogCi1m dW5jdGlvbiB2ZXJpZnlUb3VjaFBvaW50KGxpc3QsIHBvaW50LCB4LCB5LCBpZCkKK2Z1bmN0aW9u IHZlcmlmeVRvdWNoUG9pbnQobGlzdCwgcG9pbnQsIHgsIHksIGlkLCByeCwgcnkpCiB7CiAgICAg c2hvdWxkQmUoImxhc3RFdmVudC4iICsgbGlzdCArICJbIiArIHBvaW50ICsgIl0ucGFnZVgiLCB4 LnRvU3RyaW5nKCkpOwogICAgIHNob3VsZEJlKCJsYXN0RXZlbnQuIiArIGxpc3QgKyAiWyIgKyBw b2ludCArICJdLnBhZ2VZIiwgeS50b1N0cmluZygpKTsKICAgICBzaG91bGRCZSgibGFzdEV2ZW50 LiIgKyBsaXN0ICsgIlsiICsgcG9pbnQgKyAiXS5jbGllbnRYIiwgeC50b1N0cmluZygpKTsKICAg ICBzaG91bGRCZSgibGFzdEV2ZW50LiIgKyBsaXN0ICsgIlsiICsgcG9pbnQgKyAiXS5jbGllbnRZ IiwgeS50b1N0cmluZygpKTsKICAgICBzaG91bGRCZSgibGFzdEV2ZW50LiIgKyBsaXN0ICsgIlsi ICsgcG9pbnQgKyAiXS5pZGVudGlmaWVyIiwgaWQudG9TdHJpbmcoKSk7CisgICAgaWYgKGV2ZW50 U2VuZGVyLnNldFRvdWNoUG9pbnRSYWRpdXMpIHsKKyAgICAgICAgc2hvdWxkQmUoImxhc3RFdmVu dC4iICsgbGlzdCArICJbIiArIHBvaW50ICsgIl0ud2Via2l0UmFkaXVzWCIsIHJ4LnRvU3RyaW5n KCkpOworICAgICAgICBzaG91bGRCZSgibGFzdEV2ZW50LiIgKyBsaXN0ICsgIlsiICsgcG9pbnQg KyAiXS53ZWJraXRSYWRpdXNZIiwgcnkudG9TdHJpbmcoKSk7CisgICAgfQogfQogCiBmdW5jdGlv biB2ZXJpZnlUb3VjaCh3aGljaCkgewpAQCAtNTUsMTMgKzU5LDEzIEBAIGZ1bmN0aW9uIHZlcmlm eVRvdWNoKHdoaWNoKSB7CiAgICAgICAgICAgIHZlcmlmeVRvdWNoRXZlbnQoInRvdWNoc3RhcnQi LCAxLCAxLCAxKTsKICAgICAgICAgICAgc2hvdWxkQmUoImxhc3RFdmVudC5zaGlmdEtleSIsICJm YWxzZSIpOwogICAgICAgICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImxhc3RFdmVudC50b3Vj aGVzWzBdLnRhcmdldC5pZCIsICJ0b3VjaHRhcmdldCIpOwotICAgICAgICAgICB2ZXJpZnlUb3Vj aFBvaW50KCJ0b3VjaGVzIiwgMCwgMTAsIDEwLCAwKTsKLSAgICAgICAgICAgdmVyaWZ5VG91Y2hQ b2ludCgiY2hhbmdlZFRvdWNoZXMiLCAwLCAxMCwgMTAsIDApOwotICAgICAgICAgICB2ZXJpZnlU b3VjaFBvaW50KCJ0YXJnZXRUb3VjaGVzIiwgMCwgMTAsIDEwLCAwKTsKKyAgICAgICAgICAgdmVy aWZ5VG91Y2hQb2ludCgidG91Y2hlcyIsIDAsIDEwLCAxMCwgMCwgMTAsIDEwKTsKKyAgICAgICAg ICAgdmVyaWZ5VG91Y2hQb2ludCgiY2hhbmdlZFRvdWNoZXMiLCAwLCAxMCwgMTAsIDAsIDEwLCAx MCk7CisgICAgICAgICAgIHZlcmlmeVRvdWNoUG9pbnQoInRhcmdldFRvdWNoZXMiLCAwLCAxMCwg MTAsIDAsIDEwLCAxMCk7CiAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIDE6CiAgICAgICAg ICAgIHZlcmlmeVRvdWNoRXZlbnQoInRvdWNobW92ZSIsIDEsIDEsIDEpOwotICAgICAgICAgICB2 ZXJpZnlUb3VjaFBvaW50KCJ0b3VjaGVzIiwgMCwgNTAsIDUwLCAwKTsKKyAgICAgICAgICAgdmVy aWZ5VG91Y2hQb2ludCgidG91Y2hlcyIsIDAsIDUwLCA1MCwgMCwgMTIsIDEyKTsKICAgICAgICAg ICAgc2hvdWxkQmUoImxhc3RFdmVudC5zaGlmdEtleSIsICJ0cnVlIik7CiAgICAgICAgICAgIHNo b3VsZEJlKCJsYXN0RXZlbnQuYWx0S2V5IiwgInRydWUiKTsKICAgICAgICAgICAgc2hvdWxkQmUo Imxhc3RFdmVudC5jdHJsS2V5IiwgImZhbHNlIik7CkBAIC02OSw3ICs3Myw3IEBAIGZ1bmN0aW9u IHZlcmlmeVRvdWNoKHdoaWNoKSB7CiAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIDI6CiAg ICAgICAgICAgICB2ZXJpZnlUb3VjaEV2ZW50KCJ0b3VjaGVuZCIsIDAsIDEsIDApOwotICAgICAg ICAgICAgdmVyaWZ5VG91Y2hQb2ludCgiY2hhbmdlZFRvdWNoZXMiLCAwLCA1MCwgNTAsIDApOwor ICAgICAgICAgICAgdmVyaWZ5VG91Y2hQb2ludCgiY2hhbmdlZFRvdWNoZXMiLCAwLCA1MCwgNTAs IDAsIDEyLCAxMik7CiAgICAgICAgICAgICBzaG91bGRCZSgibGFzdEV2ZW50LnNoaWZ0S2V5Iiwg ImZhbHNlIik7CiAgICAgICAgICAgICBzaG91bGRCZSgibGFzdEV2ZW50LmFsdEtleSIsICJmYWxz ZSIpOwogICAgICAgICBicmVhazsKQEAgLTg4LDkgKzkyLDEzIEBAIGZ1bmN0aW9uIHZlcmlmeVRv dWNoKHdoaWNoKSB7CiAKIGZ1bmN0aW9uIHNpbmdsZVRvdWNoU2VxdWVuY2UoKQogeworICAgIGlm IChldmVudFNlbmRlci5zZXRUb3VjaFBvaW50UmFkaXVzKQorICAgICAgICBldmVudFNlbmRlci5z ZXRUb3VjaFBvaW50UmFkaXVzKDEwLDEwKTsKICAgICBldmVudFNlbmRlci5hZGRUb3VjaFBvaW50 KDEwLCAxMCk7CiAgICAgZXZlbnRTZW5kZXIudG91Y2hTdGFydCgpOwogCisgICAgaWYgKGV2ZW50 U2VuZGVyLnNldFRvdWNoUG9pbnRSYWRpdXMpCisgICAgICAgIGV2ZW50U2VuZGVyLnNldFRvdWNo UG9pbnRSYWRpdXMoMTIsMTIpOwogICAgIGV2ZW50U2VuZGVyLnVwZGF0ZVRvdWNoUG9pbnQoMCwg NTAsIDUwKTsKICAgICBldmVudFNlbmRlci5zZXRUb3VjaE1vZGlmaWVyKCJzaGlmdCIsIHRydWUp OwogICAgIGV2ZW50U2VuZGVyLnNldFRvdWNoTW9kaWZpZXIoImFsdCIsIHRydWUpOwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvZmFzdC9ldmVudHMvdG91Y2gvYmFzaWMtc2lu Z2xlLXRvdWNoLWV2ZW50cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9m YXN0L2V2ZW50cy90b3VjaC9iYXNpYy1zaW5nbGUtdG91Y2gtZXZlbnRzLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5kNjU5YTJhNDBlMmViOWNkNGZmMzIyZWNlZTA2MzhhMzA1NmE5YzFmCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvZmFzdC9ldmVudHMvdG91Y2gv YmFzaWMtc2luZ2xlLXRvdWNoLWV2ZW50cy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw4NCBAQAor VGhpcyB0ZXN0cyBiYXNpYyBzaW5nbGUgdG91Y2ggZXZlbnQgc3VwcG9ydC4KKworT24gc3VjY2Vz cywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkg IlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgbGFzdEV2ZW50LnR5cGUgaXMgInRvdWNoc3RhcnQi CitQQVNTIGxhc3RFdmVudC50b3VjaGVzLmxlbmd0aCBpcyAxCitQQVNTIGxhc3RFdmVudC5jaGFu Z2VkVG91Y2hlcy5sZW5ndGggaXMgMQorUEFTUyBsYXN0RXZlbnQudGFyZ2V0VG91Y2hlcy5sZW5n dGggaXMgMQorUEFTUyBsYXN0RXZlbnQucGFnZVggaXMgMAorUEFTUyBsYXN0RXZlbnQucGFnZVkg aXMgMAorUEFTUyBsYXN0RXZlbnQuc2hpZnRLZXkgaXMgZmFsc2UKK1BBU1MgbGFzdEV2ZW50LnRv dWNoZXNbMF0udGFyZ2V0LmlkIGlzICJ0b3VjaHRhcmdldCIKK1BBU1MgbGFzdEV2ZW50LnRvdWNo ZXNbMF0ucGFnZVggaXMgMTAKK1BBU1MgbGFzdEV2ZW50LnRvdWNoZXNbMF0ucGFnZVkgaXMgMTAK K1BBU1MgbGFzdEV2ZW50LnRvdWNoZXNbMF0uY2xpZW50WCBpcyAxMAorUEFTUyBsYXN0RXZlbnQu dG91Y2hlc1swXS5jbGllbnRZIGlzIDEwCitQQVNTIGxhc3RFdmVudC50b3VjaGVzWzBdLmlkZW50 aWZpZXIgaXMgMAorUEFTUyBsYXN0RXZlbnQudG91Y2hlc1swXS53ZWJraXRSYWRpdXNYIGlzIDEw CitQQVNTIGxhc3RFdmVudC50b3VjaGVzWzBdLndlYmtpdFJhZGl1c1kgaXMgMTAKK1BBU1MgbGFz dEV2ZW50LmNoYW5nZWRUb3VjaGVzWzBdLnBhZ2VYIGlzIDEwCitQQVNTIGxhc3RFdmVudC5jaGFu Z2VkVG91Y2hlc1swXS5wYWdlWSBpcyAxMAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNb MF0uY2xpZW50WCBpcyAxMAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0uY2xpZW50 WSBpcyAxMAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0uaWRlbnRpZmllciBpcyAw CitQQVNTIGxhc3RFdmVudC5jaGFuZ2VkVG91Y2hlc1swXS53ZWJraXRSYWRpdXNYIGlzIDEwCitQ QVNTIGxhc3RFdmVudC5jaGFuZ2VkVG91Y2hlc1swXS53ZWJraXRSYWRpdXNZIGlzIDEwCitQQVNT IGxhc3RFdmVudC50YXJnZXRUb3VjaGVzWzBdLnBhZ2VYIGlzIDEwCitQQVNTIGxhc3RFdmVudC50 YXJnZXRUb3VjaGVzWzBdLnBhZ2VZIGlzIDEwCitQQVNTIGxhc3RFdmVudC50YXJnZXRUb3VjaGVz WzBdLmNsaWVudFggaXMgMTAKK1BBU1MgbGFzdEV2ZW50LnRhcmdldFRvdWNoZXNbMF0uY2xpZW50 WSBpcyAxMAorUEFTUyBsYXN0RXZlbnQudGFyZ2V0VG91Y2hlc1swXS5pZGVudGlmaWVyIGlzIDAK K1BBU1MgbGFzdEV2ZW50LnRhcmdldFRvdWNoZXNbMF0ud2Via2l0UmFkaXVzWCBpcyAxMAorUEFT UyBsYXN0RXZlbnQudGFyZ2V0VG91Y2hlc1swXS53ZWJraXRSYWRpdXNZIGlzIDEwCitQQVNTIGxh c3RFdmVudC50eXBlIGlzICJ0b3VjaG1vdmUiCitQQVNTIGxhc3RFdmVudC50b3VjaGVzLmxlbmd0 aCBpcyAxCitQQVNTIGxhc3RFdmVudC5jaGFuZ2VkVG91Y2hlcy5sZW5ndGggaXMgMQorUEFTUyBs YXN0RXZlbnQudGFyZ2V0VG91Y2hlcy5sZW5ndGggaXMgMQorUEFTUyBsYXN0RXZlbnQucGFnZVgg aXMgMAorUEFTUyBsYXN0RXZlbnQucGFnZVkgaXMgMAorUEFTUyBsYXN0RXZlbnQudG91Y2hlc1sw XS5wYWdlWCBpcyA1MAorUEFTUyBsYXN0RXZlbnQudG91Y2hlc1swXS5wYWdlWSBpcyA1MAorUEFT UyBsYXN0RXZlbnQudG91Y2hlc1swXS5jbGllbnRYIGlzIDUwCitQQVNTIGxhc3RFdmVudC50b3Vj aGVzWzBdLmNsaWVudFkgaXMgNTAKK1BBU1MgbGFzdEV2ZW50LnRvdWNoZXNbMF0uaWRlbnRpZmll ciBpcyAwCitQQVNTIGxhc3RFdmVudC50b3VjaGVzWzBdLndlYmtpdFJhZGl1c1ggaXMgMTIKK1BB U1MgbGFzdEV2ZW50LnRvdWNoZXNbMF0ud2Via2l0UmFkaXVzWSBpcyAxMgorUEFTUyBsYXN0RXZl bnQuc2hpZnRLZXkgaXMgdHJ1ZQorUEFTUyBsYXN0RXZlbnQuYWx0S2V5IGlzIHRydWUKK1BBU1Mg bGFzdEV2ZW50LmN0cmxLZXkgaXMgZmFsc2UKK1BBU1MgbGFzdEV2ZW50Lm1ldGFLZXkgaXMgZmFs c2UKK1BBU1MgbGFzdEV2ZW50LnR5cGUgaXMgInRvdWNoZW5kIgorUEFTUyBsYXN0RXZlbnQudG91 Y2hlcy5sZW5ndGggaXMgMAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXMubGVuZ3RoIGlz IDEKK1BBU1MgbGFzdEV2ZW50LnRhcmdldFRvdWNoZXMubGVuZ3RoIGlzIDAKK1BBU1MgbGFzdEV2 ZW50LnBhZ2VYIGlzIDAKK1BBU1MgbGFzdEV2ZW50LnBhZ2VZIGlzIDAKK1BBU1MgbGFzdEV2ZW50 LmNoYW5nZWRUb3VjaGVzWzBdLnBhZ2VYIGlzIDUwCitQQVNTIGxhc3RFdmVudC5jaGFuZ2VkVG91 Y2hlc1swXS5wYWdlWSBpcyA1MAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0uY2xp ZW50WCBpcyA1MAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0uY2xpZW50WSBpcyA1 MAorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXNbMF0uaWRlbnRpZmllciBpcyAwCitQQVNT IGxhc3RFdmVudC5jaGFuZ2VkVG91Y2hlc1swXS53ZWJraXRSYWRpdXNYIGlzIDEyCitQQVNTIGxh c3RFdmVudC5jaGFuZ2VkVG91Y2hlc1swXS53ZWJraXRSYWRpdXNZIGlzIDEyCitQQVNTIGxhc3RF dmVudC5zaGlmdEtleSBpcyBmYWxzZQorUEFTUyBsYXN0RXZlbnQuYWx0S2V5IGlzIGZhbHNlCitQ QVNTIGxhc3RFdmVudC50eXBlIGlzICJ0b3VjaHN0YXJ0IgorUEFTUyBsYXN0RXZlbnQudG91Y2hl cy5sZW5ndGggaXMgMQorUEFTUyBsYXN0RXZlbnQuY2hhbmdlZFRvdWNoZXMubGVuZ3RoIGlzIDEK K1BBU1MgbGFzdEV2ZW50LnRhcmdldFRvdWNoZXMubGVuZ3RoIGlzIDEKK1BBU1MgbGFzdEV2ZW50 LnBhZ2VYIGlzIDAKK1BBU1MgbGFzdEV2ZW50LnBhZ2VZIGlzIDAKK1BBU1MgbGFzdEV2ZW50LnRh cmdldFRvdWNoZXNbMF0udGFyZ2V0LnRhZ05hbWUgaXMgIkRJViIKK1BBU1MgbGFzdEV2ZW50LnR5 cGUgaXMgInRvdWNobW92ZSIKK1BBU1MgbGFzdEV2ZW50LnRvdWNoZXMubGVuZ3RoIGlzIDEKK1BB U1MgbGFzdEV2ZW50LmNoYW5nZWRUb3VjaGVzLmxlbmd0aCBpcyAxCitQQVNTIGxhc3RFdmVudC50 YXJnZXRUb3VjaGVzLmxlbmd0aCBpcyAxCitQQVNTIGxhc3RFdmVudC5wYWdlWCBpcyAwCitQQVNT IGxhc3RFdmVudC5wYWdlWSBpcyAwCitQQVNTIGxhc3RFdmVudC50b3VjaGVzWzBdLnRhcmdldC50 YWdOYW1lIGlzICJESVYiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1Qg Q09NUExFVEUKKwo= 138550 2012-04-24 06:46:10 -0700 2012-04-24 09:28:37 -0700 Patch for failing test Patch text/plain 8304 allan.jensen ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3OTkz NWM1Li5kZTVkYzY1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTItMDQtMjQgIEFsbGFuIFNhbmRmZWxkIEplbnNl biAgPGFsbGFuLmplbnNlbkBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtXSzJdIENvbnZlcnQg dG91Y2gtcG9pbnQgYXJlYQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODQ0MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBGaXggZmFpbGluZyB0ZXN0IGFmdGVyIHIxMTQ5MTcgYnkgYWxzbyBhZGRpbmcgdGhl IG5ldyBFdmVudFNlbmRlciBBUEkKKyAgICAgICAgdG8gV2ViS2l0VGVzdFJ1bm5lci4KKworICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvRXZlbnRTZW5kZXJQcm94eS5oOgorICAgICAgICAoRXZl bnRTZW5kZXJQcm94eSk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRs ZS9CaW5kaW5ncy9FdmVudFNlbmRpbmdDb250cm9sbGVyLmlkbDoKKyAgICAgICAgKiBXZWJLaXRU ZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV1RSOjpFdmVudFNlbmRpbmdDb250cm9sbGVyOjpzZXRUb3VjaFBvaW50UmFkaXVzKToK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0V2ZW50U2VuZGluZ0Nv bnRyb2xsZXIuaDoKKyAgICAgICAgKEV2ZW50U2VuZGluZ0NvbnRyb2xsZXIpOgorICAgICAgICAq IFdlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0 Q29udHJvbGxlcjo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRs ZSk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRlclByb3h5UXQuY3Bw OgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5OjphZGRUb3VjaFBvaW50KToKKyAgICAg ICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6dXBkYXRlVG91Y2hQb2ludCk6CisgICAgICAgIChX VFI6OkV2ZW50U2VuZGVyUHJveHk6OnNldFRvdWNoUG9pbnRSYWRpdXMpOgorICAgICAgICAoV1RS OjpFdmVudFNlbmRlclByb3h5OjpjbGVhclRvdWNoUG9pbnRzKToKKwogMjAxMi0wNC0yMyAgRXJp cSBBdWd1c3RpbmUgIDxlYXVndXN0aUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV0dXJuIHZh bHVlIGZyb20gZXhlY3V0ZWQgc2NyaXB0IGluIENocm9taXVtLgpkaWZmIC0tZ2l0IGEvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5LmggYi9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL0V2ZW50U2VuZGVyUHJveHkuaAppbmRleCBlM2E2YjNjLi44MTY4NTEzIDEwMDY0NAotLS0g YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaAorKysgYi9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaApAQCAtNjEsNiArNjEsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBhZGRUb3VjaFBvaW50KGludCB4LCBpbnQgeSk7CiAgICAgdm9pZCB1cGRh dGVUb3VjaFBvaW50KGludCBpbmRleCwgaW50IHgsIGludCB5KTsKICAgICB2b2lkIHNldFRvdWNo TW9kaWZpZXIoV0tFdmVudE1vZGlmaWVycywgYm9vbCBlbmFibGUpOworICAgIHZvaWQgc2V0VG91 Y2hQb2ludFJhZGl1cyhpbnQgcmFkaXVzWCwgaW50IHJhZGl1c1kpOwogICAgIHZvaWQgdG91Y2hT dGFydCgpOwogICAgIHZvaWQgdG91Y2hNb3ZlKCk7CiAgICAgdm9pZCB0b3VjaEVuZCgpOwpAQCAt MTA4LDYgKzEwOSw3IEBAIHByaXZhdGU6CiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKICAgICBR TGlzdDxRVG91Y2hFdmVudDo6VG91Y2hQb2ludD4gbV90b3VjaFBvaW50czsKICAgICBRdDo6S2V5 Ym9hcmRNb2RpZmllcnMgbV90b3VjaE1vZGlmaWVyczsKKyAgICBRUG9pbnQgbV90b3VjaFBvaW50 UmFkaXVzOwogICAgIGJvb2wgbV90b3VjaEFjdGl2ZTsKICNlbmRpZgogI2VuZGlmCmRpZmYgLS1n aXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0JpbmRpbmdzL0V2ZW50 U2VuZGluZ0NvbnRyb2xsZXIuaWRsIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1 bmRsZS9CaW5kaW5ncy9FdmVudFNlbmRpbmdDb250cm9sbGVyLmlkbAppbmRleCBkMWRjNjA1Li45 MzRiZTZkIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxl L0JpbmRpbmdzL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIuaWRsCisrKyBiL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQmluZGluZ3MvRXZlbnRTZW5kaW5nQ29udHJvbGxlci5p ZGwKQEAgLTQ3LDYgKzQ3LDcgQEAgbW9kdWxlIFdUUiB7CiAgICAgICAgIHZvaWQgYWRkVG91Y2hQ b2ludChpbiBsb25nIHgsIGluIGxvbmcgeSk7CiAgICAgICAgIHZvaWQgdXBkYXRlVG91Y2hQb2lu dChpbiBsb25nIGluZGV4LCBpbiBsb25nIHgsIGluIGxvbmcgeSk7CiAgICAgICAgIHZvaWQgc2V0 VG91Y2hNb2RpZmllcihpbiBET01TdHJpbmcgbW9kaWZpZXIsIGluIGJvb2xlYW4gZW5hYmxlKTsK KyAgICAgICAgdm9pZCBzZXRUb3VjaFBvaW50UmFkaXVzKGluIGxvbmcgcmFkaXVzWCwgaW4gbG9u ZyByYWRpdXNZKTsKICAgICAgICAgdm9pZCB0b3VjaFN0YXJ0KCk7CiAgICAgICAgIHZvaWQgdG91 Y2hNb3ZlKCk7CiAgICAgICAgIHZvaWQgdG91Y2hFbmQoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvRXZlbnRTZW5kaW5nQ29udHJvbGxlci5jcHAg Yi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0V2ZW50U2VuZGluZ0NvbnRy b2xsZXIuY3BwCmluZGV4IGU0Y2IwNjkuLjkzNDMxZTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvRXZlbnRTZW5kaW5nQ29udHJvbGxlci5jcHAKKysr IGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9FdmVudFNlbmRpbmdDb250 cm9sbGVyLmNwcApAQCAtMzk4LDYgKzM5OCwyNyBAQCB2b2lkIEV2ZW50U2VuZGluZ0NvbnRyb2xs ZXI6OnNldFRvdWNoTW9kaWZpZXIoY29uc3QgSlNTdHJpbmdSZWYgJm1vZGlmaWVyLCBib29sCiAg ICAgV0tCdW5kbGVQb3N0U3luY2hyb25vdXNNZXNzYWdlKEluamVjdGVkQnVuZGxlOjpzaGFyZWQo KS5idW5kbGUoKSwgRXZlbnRTZW5kZXJNZXNzYWdlTmFtZS5nZXQoKSwgRXZlbnRTZW5kZXJNZXNz YWdlQm9keS5nZXQoKSwgMCk7CiB9CiAKKwordm9pZCBFdmVudFNlbmRpbmdDb250cm9sbGVyOjpz ZXRUb3VjaFBvaW50UmFkaXVzKGludCByYWRpdXNYLCBpbnQgcmFkaXVzWSkKK3sKKyAgICBXS1Jl dGFpblB0cjxXS1N0cmluZ1JlZj4gRXZlbnRTZW5kZXJNZXNzYWdlTmFtZShBZG9wdFdLLCBXS1N0 cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiRXZlbnRTZW5kZXIiKSk7CisgICAgV0tSZXRhaW5Q dHI8V0tNdXRhYmxlRGljdGlvbmFyeVJlZj4gRXZlbnRTZW5kZXJNZXNzYWdlQm9keShBZG9wdFdL LCBXS011dGFibGVEaWN0aW9uYXJ5Q3JlYXRlKCkpOworCisgICAgV0tSZXRhaW5QdHI8V0tTdHJp bmdSZWY+IHN1Yk1lc3NhZ2VLZXkoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJp bmcoIlN1Yk1lc3NhZ2UiKSk7CisgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHN1Yk1lc3Nh Z2VOYW1lKEFkb3B0V0ssIFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJTZXRUb3VjaFBv aW50UmFkaXVzIikpOworICAgIFdLRGljdGlvbmFyeUFkZEl0ZW0oRXZlbnRTZW5kZXJNZXNzYWdl Qm9keS5nZXQoKSwgc3ViTWVzc2FnZUtleS5nZXQoKSwgc3ViTWVzc2FnZU5hbWUuZ2V0KCkpOwor CisgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHhLZXkoQWRvcHRXSywgV0tTdHJpbmdDcmVh dGVXaXRoVVRGOENTdHJpbmcoIlJhZGl1c1giKSk7CisgICAgV0tSZXRhaW5QdHI8V0tVSW50NjRS ZWY+IHhSZWYoQWRvcHRXSywgV0tVSW50NjRDcmVhdGUocmFkaXVzWCkpOworICAgIFdLRGljdGlv bmFyeUFkZEl0ZW0oRXZlbnRTZW5kZXJNZXNzYWdlQm9keS5nZXQoKSwgeEtleS5nZXQoKSwgeFJl Zi5nZXQoKSk7CisKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4geUtleShBZG9wdFdLLCBX S1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiUmFkaXVzWSIpKTsKKyAgICBXS1JldGFpblB0 cjxXS1VJbnQ2NFJlZj4geVJlZihBZG9wdFdLLCBXS1VJbnQ2NENyZWF0ZShyYWRpdXNZKSk7Cisg ICAgV0tEaWN0aW9uYXJ5QWRkSXRlbShFdmVudFNlbmRlck1lc3NhZ2VCb2R5LmdldCgpLCB5S2V5 LmdldCgpLCB5UmVmLmdldCgpKTsKKworICAgIFdLQnVuZGxlUG9zdFN5bmNocm9ub3VzTWVzc2Fn ZShJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkuYnVuZGxlKCksIEV2ZW50U2VuZGVyTWVzc2FnZU5h bWUuZ2V0KCksIEV2ZW50U2VuZGVyTWVzc2FnZUJvZHkuZ2V0KCksIDApOworfQorCiB2b2lkIEV2 ZW50U2VuZGluZ0NvbnRyb2xsZXI6OnRvdWNoU3RhcnQoKQogewogICAgIFdLUmV0YWluUHRyPFdL U3RyaW5nUmVmPiBFdmVudFNlbmRlck1lc3NhZ2VOYW1lKEFkb3B0V0ssIFdLU3RyaW5nQ3JlYXRl V2l0aFVURjhDU3RyaW5nKCJFdmVudFNlbmRlciIpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvRXZlbnRTZW5kaW5nQ29udHJvbGxlci5oIGIvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9FdmVudFNlbmRpbmdDb250cm9sbGVy LmgKaW5kZXggMDI2NzMwMi4uOGVhMmRiMCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9FdmVudFNlbmRpbmdDb250cm9sbGVyLmgKKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9FdmVudFNlbmRpbmdDb250cm9sbGVyLmgK QEAgLTY3LDYgKzY3LDcgQEAgcHVibGljOgogICAgIHZvaWQgYWRkVG91Y2hQb2ludChpbnQgeCwg aW50IHkpOwogICAgIHZvaWQgdXBkYXRlVG91Y2hQb2ludChpbnQgaW5kZXgsIGludCB4LCBpbnQg eSk7CiAgICAgdm9pZCBzZXRUb3VjaE1vZGlmaWVyKGNvbnN0IEpTU3RyaW5nUmVmICZtb2RpZmll ciwgYm9vbCBlbmFibGUpOworICAgIHZvaWQgc2V0VG91Y2hQb2ludFJhZGl1cyhpbnQgcmFkaXVz WCwgaW50IHJhZGl1c1kpOwogICAgIHZvaWQgdG91Y2hTdGFydCgpOwogICAgIHZvaWQgdG91Y2hN b3ZlKCk7CiAgICAgdm9pZCB0b3VjaEVuZCgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RD b250cm9sbGVyLmNwcAppbmRleCBlMzI0ZjU3Li5iM2I5Mzk2IDEwMDY0NAotLS0gYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcApAQCAtNzA3LDYgKzcwNywxNyBAQCBXS1JldGFpblB0 cjxXS1R5cGVSZWY+IFRlc3RDb250cm9sbGVyOjpkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdl RnJvbUluamVjdGVkQgogICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIH0KIAorICAgICAg ICBpZiAoV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhzdWJNZXNzYWdlTmFtZSwgIlNldFRv dWNoUG9pbnRSYWRpdXMiKSkgeworICAgICAgICAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+ IHhLZXkgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJSYWRpdXNYIikp OworICAgICAgICAgICAgaW50IHggPSBzdGF0aWNfY2FzdDxpbnQ+KFdLVUludDY0R2V0VmFsdWUo c3RhdGljX2Nhc3Q8V0tVSW50NjRSZWY+KFdLRGljdGlvbmFyeUdldEl0ZW1Gb3JLZXkobWVzc2Fn ZUJvZHlEaWN0aW9uYXJ5LCB4S2V5LmdldCgpKSkpKTsKKworICAgICAgICAgICAgV0tSZXRhaW5Q dHI8V0tTdHJpbmdSZWY+IHlLZXkgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3Ry aW5nKCJSYWRpdXNZIikpOworICAgICAgICAgICAgaW50IHkgPSBzdGF0aWNfY2FzdDxpbnQ+KFdL VUludDY0R2V0VmFsdWUoc3RhdGljX2Nhc3Q8V0tVSW50NjRSZWY+KFdLRGljdGlvbmFyeUdldEl0 ZW1Gb3JLZXkobWVzc2FnZUJvZHlEaWN0aW9uYXJ5LCB5S2V5LmdldCgpKSkpKTsKKworICAgICAg ICAgICAgbV9ldmVudFNlbmRlclByb3h5LT5zZXRUb3VjaFBvaW50UmFkaXVzKHgsIHkpOworICAg ICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0KKwogICAgICAgICBpZiAoV0tTdHJpbmdJc0Vx dWFsVG9VVEY4Q1N0cmluZyhzdWJNZXNzYWdlTmFtZSwgIlRvdWNoU3RhcnQiKSkgewogICAgICAg ICAgICAgV0tQYWdlU2V0U2hvdWxkU2VuZEV2ZW50c1N5bmNocm9ub3VzbHkobWFpbldlYlZpZXco KS0+cGFnZSgpLCB0cnVlKTsKICAgICAgICAgICAgIG1fZXZlbnRTZW5kZXJQcm94eS0+dG91Y2hT dGFydCgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRl clByb3h5UXQuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRlclByb3h5 UXQuY3BwCmluZGV4IGM5MWI3YWYuLmVkYjYzNTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvcXQvRXZlbnRTZW5kZXJQcm94eVF0LmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL3F0L0V2ZW50U2VuZGVyUHJveHlRdC5jcHAKQEAgLTMxOCwxNSArMzE4LDIwIEBAIHZv aWQgRXZlbnRTZW5kZXJQcm94eTo6YWRkVG91Y2hQb2ludChpbnQgeCwgaW50IHkpCiAgICAgcG9p bnQuc2V0UG9zKHBvcyk7CiAgICAgcG9pbnQuc2V0U3RhcnRQb3MocG9zKTsKICAgICBwb2ludC5z ZXRTdGF0ZShRdDo6VG91Y2hQb2ludFByZXNzZWQpOworICAgIGlmICghbV90b3VjaFBvaW50UmFk aXVzLmlzTnVsbCgpKQorICAgICAgICBwb2ludC5zZXRSZWN0KFFSZWN0Rihwb3MgLSBtX3RvdWNo UG9pbnRSYWRpdXMsIHBvcyArIG1fdG91Y2hQb2ludFJhZGl1cykpOwogICAgIG1fdG91Y2hQb2lu dHMuYXBwZW5kKHBvaW50KTsKIH0KIAogdm9pZCBFdmVudFNlbmRlclByb3h5Ojp1cGRhdGVUb3Vj aFBvaW50KGludCBpbmRleCwgaW50IHgsIGludCB5KQogewogICAgIEFTU0VSVChpbmRleCA+PSAw ICYmIGluZGV4IDwgbV90b3VjaFBvaW50cy5jb3VudCgpKTsKKyAgICBRUG9pbnRGIHBvcyh4LCB5 KTsKICAgICBRVG91Y2hFdmVudDo6VG91Y2hQb2ludCAmcCA9IG1fdG91Y2hQb2ludHNbaW5kZXhd OwotICAgIHAuc2V0UG9zKFFQb2ludEYoeCwgeSkpOworICAgIHAuc2V0UG9zKHBvcyk7CiAgICAg cC5zZXRTdGF0ZShRdDo6VG91Y2hQb2ludE1vdmVkKTsKKyAgICBpZiAoIW1fdG91Y2hQb2ludFJh ZGl1cy5pc051bGwoKSkKKyAgICAgICAgcC5zZXRSZWN0KFFSZWN0Rihwb3MgLSBtX3RvdWNoUG9p bnRSYWRpdXMsIHBvcyArIG1fdG91Y2hQb2ludFJhZGl1cykpOwogfQogCiB2b2lkIEV2ZW50U2Vu ZGVyUHJveHk6OnNldFRvdWNoTW9kaWZpZXIoV0tFdmVudE1vZGlmaWVycyBtb2RpZmllciwgYm9v bCBlbmFibGUpCkBAIC0zMzksNiArMzQ0LDExIEBAIHZvaWQgRXZlbnRTZW5kZXJQcm94eTo6c2V0 VG91Y2hNb2RpZmllcihXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVyLCBib29sIGVuYWJsZSkKICAg ICAgICAgbV90b3VjaE1vZGlmaWVycyAmPSB+bW9kOwogfQogCit2b2lkIEV2ZW50U2VuZGVyUHJv eHk6OnNldFRvdWNoUG9pbnRSYWRpdXMoaW50IHJhZGl1c1gsIGludCByYWRpdXNZKQoreworICAg IG1fdG91Y2hQb2ludFJhZGl1cyA9IFFQb2ludChyYWRpdXNYLCByYWRpdXNZKTsKK30KKwogdm9p ZCBFdmVudFNlbmRlclByb3h5Ojp0b3VjaFN0YXJ0KCkKIHsKICAgICBpZiAoIW1fdG91Y2hBY3Rp dmUpIHsKQEAgLTM3Niw2ICszODYsNyBAQCB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OmNsZWFyVG91 Y2hQb2ludHMoKQogICAgIG1fdG91Y2hQb2ludHMuY2xlYXIoKTsKICAgICBtX3RvdWNoTW9kaWZp ZXJzID0gUXQ6OktleWJvYXJkTW9kaWZpZXJzKCk7CiAgICAgbV90b3VjaEFjdGl2ZSA9IGZhbHNl OworICAgIG1fdG91Y2hQb2ludFJhZGl1cyA9IFFQb2ludCgpOwogfQogCiB2b2lkIEV2ZW50U2Vu ZGVyUHJveHk6OnJlbGVhc2VUb3VjaFBvaW50KGludCBpbmRleCkK