145472 2015-05-29 14:42:16 -0700 NavigationAction constructor cleanup 2015-05-30 18:32:31 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson commit-queue japhet oldest_to_newest 1098188 0 beidson 2015-05-29 14:42:16 -0700 NavigationAction constructor cleanup Lot's of NavigationAction constructors, all subtley different. An upcoming patch I'm working on will add another one. Seemed like a good time to re-route them all to a central constructor via c'tor delegation. 1098190 1 253916 beidson 2015-05-29 14:44:36 -0700 Created attachment 253916 More red than green. 1098198 2 253916 achristensen 2015-05-29 14:54:49 -0700 Comment on attachment 253916 More red than green. View in context: https://bugs.webkit.org/attachment.cgi?id=253916&action=review > Source/WebCore/loader/NavigationAction.h:47 > + NavigationAction(const ResourceRequest&, NavigationType, PassRefPtr<Event>, ShouldOpenExternalURLsPolicy); The new constructor could be private right now, but it might need to be public in a following patch. Ok either way. 1098203 3 beidson 2015-05-29 15:01:55 -0700 http://trac.webkit.org/changeset/185007 1098337 4 ap 2015-05-30 10:22:08 -0700 This broke four tests on Windows: <https://build.webkit.org/results/Apple%20Win%207%20Release%20(Tests)/r185031%20(52131)/results.html>. Brady, are you available to investigate today? 1098340 5 beidson 2015-05-30 13:47:23 -0700 (In reply to comment #4) > This broke four tests on Windows: > <https://build.webkit.org/results/Apple%20Win%207%20Release%20(Tests)/ > r185031%20(52131)/results.html>. > > Brady, are you available to investigate today? ...WHAT...? 1098341 6 beidson 2015-05-30 13:51:25 -0700 Okay, without actually being able to reproduce because I can't get to a windows setup right now... 4 tests all fail because NavigationType::LinkClicked became NavigationType::Other. Why on Windows and not Mac? Who knows. The only way this patch could've made LinkClicked become Other is if: static NavigationType navigationType(FrameLoadType frameLoadType, bool isFormSubmission, bool haveEvent) ... is giving different results. The only way it gives LinkClicked is if "haveEvent" is true. So previously a called had an event, and now they don't. Will explore... 1098342 7 beidson 2015-05-30 13:54:05 -0700 Only two of the ctor's called navigationType(). One was navigationType(frameLoadType, isFormSubmission, 0) (and is identical after the patch), and that call never could've given LinkClicked. So it must be the other, which passes a PassRefPtr<Event>: navigationType(frameLoadType, isFormSubmission, event) It's identical afterwards, too. But maybe there's some weird PassRefPtr automatic assignment stuff that's killing the event ptr? 1098344 8 beidson 2015-05-30 13:58:34 -0700 Are constructor arguments evaluated in reverse, right to left? If so, the call to: + : NavigationAction(resourceRequest, navigationType(frameLoadType, isFormSubmission, event), event, ShouldOpenExternalURLsPolicy::ShouldNotAllow) ...might null-out the PassRefPtr for "event" before passing it into navigationType() as a bool argument...? That's really my only guess here. 1098346 9 beidson 2015-05-30 14:05:51 -0700 Holy crap, I think that's totally it. C++ spec says arguments in the order they appear, but non-clang compilers have gotten it wrong. According to http://stackoverflow.com/questions/14060264/order-of-evaluation-of-elements-in-list-initialization gcc had it wrong for awhile... And visual studio still does in the context of initializer lists: https://connect.microsoft.com/VisualStudio/feedbackdetail/view/976911/braced-initializer-list-not-evaluated-left-to-right I'm guessing the VS bug is not strictly limited to initializer lists? Unless there's something obvious that somebody else is seeing that I'm not, I think that might be it. o_O 1098348 10 beidson 2015-05-30 14:20:20 -0700 Actually, maybe this is bogus for all C++... The C++11 standard demands in §8.5.4/4 that the items in a braced initializer list are evaluated left-to-right: "Within the initializer-list of a braced-init-list, the initializer-clauses, including any that result from pack expansions (14.5.3), are evaluated in the order in which they appear. That is, every value computation and side effect associated with a given initializer-clause is sequenced before every value computation and side effect associated with any initializer-clause that follows it in the comma-separated list of the initializer-list. [Note: This evaluation ordering holds regardless of the semantics of the initialization; for example, it applies when the elements of the initializer-list are interpreted as arguments of a constructor call, even though ordinarily there are no sequencing constraints on the arguments of a call. — end note]" The left-to-right evaluation sequencing is required for braced initialization lists, but not for "normal" constructor calls - "ordinarily there are no sequencing constraints on the arguments of a call." So I wonder if clang just does LTR, but it's not required to be LTR. Maybe VS isn't "wrong" here, even if they are weird. 1098349 11 253962 beidson 2015-05-30 14:25:24 -0700 Created attachment 253962 Proposed windows test fix This is my proposed fix that I'm building on Mac right now. Pros - It's not a dirty hack to work around a possible "weirdness" in the VS C++ compiler, it's cross platform, it simply turns these into braced initializer lists which the C++ spec requires to be evaluated left-to-right Cons - If there *IS* a VS bug in evaluating initializer lists LTR... this still won't fix it. 1098352 12 beidson 2015-05-30 14:33:18 -0700 I'm not even going to mess with the initializer list version of this. In reality, nobody should actually be passing ownership of the event, so a PassRefPtr makes no sense. Raw ptrs make much more sense, and won't have this issue. 1098354 13 253965 beidson 2015-05-30 14:55:40 -0700 Created attachment 253965 Alternate fix that should definitely work. 1098355 14 beidson 2015-05-30 15:05:30 -0700 Reopening for commit queue to work 1098356 15 253966 beidson 2015-05-30 15:05:55 -0700 Created attachment 253966 Fix for landing 1098357 16 beidson 2015-05-30 15:06:59 -0700 NM, stupid commit queue... 1098358 17 beidson 2015-05-30 15:08:58 -0700 http://trac.webkit.org/changeset/185033 1098365 18 beidson 2015-05-30 18:20:43 -0700 Just for posterity, the even crazier thing was VS had this behavior in release builds, but not debug - the debug tests never broke! Sigh All fixed. 1098368 19 ap 2015-05-30 18:24:40 -0700 Nice fix! We should eliminate PassRefPtr<Event> from the callers too, we have atrocities there like frame->loader().urlSelected(url, target(), PassRefPtr<Event>(&event), LockHistory::No, LockBackForwardList::No, MaybeSendReferrer); 1098370 20 ap 2015-05-30 18:26:33 -0700 It is not very surprising that the failure was release only - evaluation reordering is an optimization. I wouldn't be too surprised if clang decided to do the same in some cases. 1098371 21 beidson 2015-05-30 18:32:31 -0700 (In reply to comment #19) > Nice fix! > > We should eliminate PassRefPtr<Event> from the callers too, we have > atrocities there like > > frame->loader().urlSelected(url, target(), PassRefPtr<Event>(&event), > LockHistory::No, LockBackForwardList::No, MaybeSendReferrer); Yup, definitely noticed that while deciding on the right fix, but it was out of scope from a test fix. I will followup some point soon! 253916 2015-05-29 14:44:36 -0700 2015-05-29 14:54:49 -0700 More red than green. patch text/plain 5752 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmYTQ2ZGViLi44ZGQ4NTNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkg QEAKIDIwMTUtMDUtMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIE5hdmlnYXRpb25BY3Rpb24gY29uc3RydWN0b3IgY2xlYW51cC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTQ3MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoUmVmYWN0b3Is IG5vIGNoYW5nZSBpbiBiZWhhdmlvcikuCisKKyAgICAgICAgKiBsb2FkZXIvTmF2aWdhdGlvbkFj dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOYXZpZ2F0aW9uQWN0aW9uOjpOYXZpZ2F0aW9u QWN0aW9uKTogRGVsZWdhdGUgbWFueSBvZiB0aGUgdmFyaW91cyBjb25zdHJ1Y3RvcnMKKyAgICAg ICAgICB0byBhIHNpbmdsZSBmdWxsLWZlYXR1cmVkIGNvbnN0cnVjdG9yLgorICAgICAgICAqIGxv YWRlci9OYXZpZ2F0aW9uQWN0aW9uLmg6CisKKzIwMTUtMDUtMjkgIEJyYWR5IEVpZHNvbiAgPGJl aWRzb25AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYlNRTCBkZWZhdWx0IGZ1bmN0aW9ucyBjYW4g YnlwYXNzIGF1dGhvcml6ZXIuCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMTA0ODk5ND4gYW5k IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU0NjMKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25BY3Rpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25BY3Rpb24uY3BwCmluZGV4IGM3N2ZiZDAuLjY5OTc3 NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5jcHAKQEAgLTQ4 LDU1ICs0OCw0NyBAQCBzdGF0aWMgTmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5cGUoRnJhbWVM b2FkVHlwZSBmcmFtZUxvYWRUeXBlLCBib29sIGlzRm9ybVN1YgogICAgIHJldHVybiBOYXZpZ2F0 aW9uVHlwZTo6T3RoZXI7CiB9CiAKLU5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24o KQotICAgIDogbV90eXBlKE5hdmlnYXRpb25UeXBlOjpPdGhlcikKK05hdmlnYXRpb25BY3Rpb246 Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3Qs IE5hdmlnYXRpb25UeXBlIHR5cGUsIFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50LCBTaG91bGRPcGVu RXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kpCisgICAgOiBt X3Jlc291cmNlUmVxdWVzdChyZXNvdXJjZVJlcXVlc3QpCisgICAgLCBtX3R5cGUodHlwZSkKKyAg ICAsIG1fZXZlbnQoZXZlbnQpCiAgICAgLCBtX3Byb2Nlc3NpbmdVc2VyR2VzdHVyZShTY3JpcHRD b250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSkKKyAgICAsIG1fc2hvdWxkT3BlbkV4 dGVybmFsVVJMc1BvbGljeShzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5KQoreworfQorCitO YXZpZ2F0aW9uQWN0aW9uOjpOYXZpZ2F0aW9uQWN0aW9uKCkKKyAgICA6IE5hdmlnYXRpb25BY3Rp b24oUmVzb3VyY2VSZXF1ZXN0KCksIE5hdmlnYXRpb25UeXBlOjpPdGhlciwgbnVsbHB0ciwgU2hv dWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cpCiB7CiB9CiAKIE5hdmln YXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNv dXJjZVJlcXVlc3QpCi0gICAgOiBtX3Jlc291cmNlUmVxdWVzdChyZXNvdXJjZVJlcXVlc3QpCi0g ICAgLCBtX3R5cGUoTmF2aWdhdGlvblR5cGU6Ok90aGVyKQotICAgICwgbV9wcm9jZXNzaW5nVXNl ckdlc3R1cmUoU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkpCisgICAg OiBOYXZpZ2F0aW9uQWN0aW9uKHJlc291cmNlUmVxdWVzdCwgTmF2aWdhdGlvblR5cGU6Ok90aGVy LCBudWxscHRyLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdykK IHsKIH0KIAogTmF2aWdhdGlvbkFjdGlvbjo6TmF2aWdhdGlvbkFjdGlvbihjb25zdCBSZXNvdXJj ZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCwgTmF2aWdhdGlvblR5cGUgdHlwZSkKLSAgICA6IG1f cmVzb3VyY2VSZXF1ZXN0KHJlc291cmNlUmVxdWVzdCkKLSAgICAsIG1fdHlwZSh0eXBlKQotICAg ICwgbV9wcm9jZXNzaW5nVXNlckdlc3R1cmUoU2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1Vz ZXJHZXN0dXJlKCkpCisgICAgOiBOYXZpZ2F0aW9uQWN0aW9uKHJlc291cmNlUmVxdWVzdCwgdHlw ZSwgbnVsbHB0ciwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cp CiB7CiB9CiAKLU5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIEZyYW1lTG9hZFR5cGUgZnJhbWVMb2FkVHlwZSwK LSAgICAgICAgYm9vbCBpc0Zvcm1TdWJtaXNzaW9uKQotICAgIDogbV9yZXNvdXJjZVJlcXVlc3Qo cmVzb3VyY2VSZXF1ZXN0KQotICAgICwgbV90eXBlKG5hdmlnYXRpb25UeXBlKGZyYW1lTG9hZFR5 cGUsIGlzRm9ybVN1Ym1pc3Npb24sIDApKQotICAgICwgbV9wcm9jZXNzaW5nVXNlckdlc3R1cmUo U2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkpCitOYXZpZ2F0aW9uQWN0 aW9uOjpOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1 ZXN0LCBGcmFtZUxvYWRUeXBlIGZyYW1lTG9hZFR5cGUsIGJvb2wgaXNGb3JtU3VibWlzc2lvbikK KyAgICA6IE5hdmlnYXRpb25BY3Rpb24ocmVzb3VyY2VSZXF1ZXN0LCBuYXZpZ2F0aW9uVHlwZShm cmFtZUxvYWRUeXBlLCBpc0Zvcm1TdWJtaXNzaW9uLCAwKSwgbnVsbHB0ciwgU2hvdWxkT3BlbkV4 dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cpCiB7CiB9CiAKIE5hdmlnYXRpb25BY3Rp b246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVl c3QsIE5hdmlnYXRpb25UeXBlIHR5cGUsIFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQotICAgIDog bV9yZXNvdXJjZVJlcXVlc3QocmVzb3VyY2VSZXF1ZXN0KQotICAgICwgbV90eXBlKHR5cGUpCi0g ICAgLCBtX2V2ZW50KGV2ZW50KQotICAgICwgbV9wcm9jZXNzaW5nVXNlckdlc3R1cmUoU2NyaXB0 Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkpCisgICAgOiBOYXZpZ2F0aW9uQWN0 aW9uKHJlc291cmNlUmVxdWVzdCwgdHlwZSwgZXZlbnQsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQ b2xpY3k6OlNob3VsZE5vdEFsbG93KQogewogfQogCiBOYXZpZ2F0aW9uQWN0aW9uOjpOYXZpZ2F0 aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBOYXZpZ2F0 aW9uVHlwZSB0eXBlLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3kpCi0gICAgOiBtX3Jlc291cmNlUmVxdWVzdChyZXNvdXJjZVJlcXVlc3Qp Ci0gICAgLCBtX3R5cGUodHlwZSkKLSAgICAsIG1fc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eShzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5KQorICAgIDogTmF2aWdhdGlvbkFjdGlvbihy ZXNvdXJjZVJlcXVlc3QsIHR5cGUsIG51bGxwdHIsIHNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xp Y3kpCiB7CiB9CiAKLU5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIEZyYW1lTG9hZFR5cGUgZnJhbWVMb2FkVHlw ZSwKLSAgICAgICAgYm9vbCBpc0Zvcm1TdWJtaXNzaW9uLCBQYXNzUmVmUHRyPEV2ZW50PiBldmVu dCkKLSAgICA6IG1fcmVzb3VyY2VSZXF1ZXN0KHJlc291cmNlUmVxdWVzdCkKLSAgICAsIG1fdHlw ZShuYXZpZ2F0aW9uVHlwZShmcmFtZUxvYWRUeXBlLCBpc0Zvcm1TdWJtaXNzaW9uLCBldmVudCkp Ci0gICAgLCBtX2V2ZW50KGV2ZW50KQotICAgICwgbV9wcm9jZXNzaW5nVXNlckdlc3R1cmUoU2Ny aXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkpCitOYXZpZ2F0aW9uQWN0aW9u OjpOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0 LCBGcmFtZUxvYWRUeXBlIGZyYW1lTG9hZFR5cGUsIGJvb2wgaXNGb3JtU3VibWlzc2lvbiwgUGFz c1JlZlB0cjxFdmVudD4gZXZlbnQpCisgICAgOiBOYXZpZ2F0aW9uQWN0aW9uKHJlc291cmNlUmVx dWVzdCwgbmF2aWdhdGlvblR5cGUoZnJhbWVMb2FkVHlwZSwgaXNGb3JtU3VibWlzc2lvbiwgZXZl bnQpLCBldmVudCwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cp CiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0 aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5oCmluZGV4IGNm Y2NjYzMuLmRlMzA4OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0 aW9uQWN0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25BY3Rpb24u aApAQCAtNDQsNiArNDQsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgTmF2aWdhdGlv bkFjdGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBOYXZpZ2F0aW9uVHlwZSk7CiAgICAgV0VC Q09SRV9FWFBPUlQgTmF2aWdhdGlvbkFjdGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBGcmFt ZUxvYWRUeXBlLCBib29sIGlzRm9ybVN1Ym1pc3Npb24pOwogICAgIE5hdmlnYXRpb25BY3Rpb24o Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgTmF2aWdhdGlvblR5cGUsIFBhc3NSZWZQdHI8RXZlbnQ+ KTsKKyAgICBOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIE5hdmlnYXRp b25UeXBlLCBQYXNzUmVmUHRyPEV2ZW50PiwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSk7 CiAgICAgTmF2aWdhdGlvbkFjdGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBOYXZpZ2F0aW9u VHlwZSwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSk7CiAgICAgTmF2aWdhdGlvbkFjdGlv bihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBGcmFtZUxvYWRUeXBlLCBib29sIGlzRm9ybVN1Ym1p c3Npb24sIFBhc3NSZWZQdHI8RXZlbnQ+KTsKIApAQCAtNjUsNyArNjYsNyBAQCBwcml2YXRlOgog ICAgIE5hdmlnYXRpb25UeXBlIG1fdHlwZTsKICAgICBSZWZQdHI8RXZlbnQ+IG1fZXZlbnQ7CiAg ICAgYm9vbCBtX3Byb2Nlc3NpbmdVc2VyR2VzdHVyZTsKLSAgICBTaG91bGRPcGVuRXh0ZXJuYWxV UkxzUG9saWN5IG1fc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSB7IFNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3k6OlNob3VsZE5vdEFsbG93IH07CisgICAgU2hvdWxkT3BlbkV4dGVybmFs VVJMc1BvbGljeSBtX3Nob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k7CiB9OwogCiB9Cg== 253962 2015-05-30 14:25:24 -0700 2015-05-30 14:25:24 -0700 Proposed windows test fix patch text/plain 2827 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0aW9uLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0aW9uLmNwcAppbmRleCA2OTk3NzU5 Li45ZWFjZGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvbkFj dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25BY3Rpb24uY3Bw CkBAIC01OCwzNyArNTgsMzcgQEAgTmF2aWdhdGlvbkFjdGlvbjo6TmF2aWdhdGlvbkFjdGlvbihj b25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCwgTmF2aWcKIH0KIAogTmF2aWdh dGlvbkFjdGlvbjo6TmF2aWdhdGlvbkFjdGlvbigpCi0gICAgOiBOYXZpZ2F0aW9uQWN0aW9uKFJl c291cmNlUmVxdWVzdCgpLCBOYXZpZ2F0aW9uVHlwZTo6T3RoZXIsIG51bGxwdHIsIFNob3VsZE9w ZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZE5vdEFsbG93KQorICAgIDogTmF2aWdhdGlvbkFj dGlvbnsgUmVzb3VyY2VSZXF1ZXN0KCksIE5hdmlnYXRpb25UeXBlOjpPdGhlciwgbnVsbHB0ciwg U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cgfQogewogfQogCiBO YXZpZ2F0aW9uQWN0aW9uOjpOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYg cmVzb3VyY2VSZXF1ZXN0KQotICAgIDogTmF2aWdhdGlvbkFjdGlvbihyZXNvdXJjZVJlcXVlc3Qs IE5hdmlnYXRpb25UeXBlOjpPdGhlciwgbnVsbHB0ciwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1Bv bGljeTo6U2hvdWxkTm90QWxsb3cpCisgICAgOiBOYXZpZ2F0aW9uQWN0aW9ueyByZXNvdXJjZVJl cXVlc3QsIE5hdmlnYXRpb25UeXBlOjpPdGhlciwgbnVsbHB0ciwgU2hvdWxkT3BlbkV4dGVybmFs VVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cgfQogewogfQogCiBOYXZpZ2F0aW9uQWN0aW9uOjpO YXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBO YXZpZ2F0aW9uVHlwZSB0eXBlKQotICAgIDogTmF2aWdhdGlvbkFjdGlvbihyZXNvdXJjZVJlcXVl c3QsIHR5cGUsIG51bGxwdHIsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZE5v dEFsbG93KQorICAgIDogTmF2aWdhdGlvbkFjdGlvbnsgcmVzb3VyY2VSZXF1ZXN0LCB0eXBlLCBu dWxscHRyLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdyB9CiB7 CiB9CiAKIE5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIEZyYW1lTG9hZFR5cGUgZnJhbWVMb2FkVHlwZSwgYm9v bCBpc0Zvcm1TdWJtaXNzaW9uKQotICAgIDogTmF2aWdhdGlvbkFjdGlvbihyZXNvdXJjZVJlcXVl c3QsIG5hdmlnYXRpb25UeXBlKGZyYW1lTG9hZFR5cGUsIGlzRm9ybVN1Ym1pc3Npb24sIDApLCBu dWxscHRyLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdykKKyAg ICA6IE5hdmlnYXRpb25BY3Rpb257IHJlc291cmNlUmVxdWVzdCwgbmF2aWdhdGlvblR5cGUoZnJh bWVMb2FkVHlwZSwgaXNGb3JtU3VibWlzc2lvbiwgMCksIG51bGxwdHIsIFNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3k6OlNob3VsZE5vdEFsbG93IH0KIHsKIH0KIAogTmF2aWdhdGlvbkFjdGlv bjo6TmF2aWdhdGlvbkFjdGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVz dCwgTmF2aWdhdGlvblR5cGUgdHlwZSwgUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQpCi0gICAgOiBO YXZpZ2F0aW9uQWN0aW9uKHJlc291cmNlUmVxdWVzdCwgdHlwZSwgZXZlbnQsIFNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZE5vdEFsbG93KQorICAgIDogTmF2aWdhdGlvbkFjdGlv bnsgcmVzb3VyY2VSZXF1ZXN0LCB0eXBlLCBldmVudCwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1Bv bGljeTo6U2hvdWxkTm90QWxsb3cgfQogewogfQogCiBOYXZpZ2F0aW9uQWN0aW9uOjpOYXZpZ2F0 aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBOYXZpZ2F0 aW9uVHlwZSB0eXBlLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5IHNob3VsZE9wZW5FeHRl cm5hbFVSTHNQb2xpY3kpCi0gICAgOiBOYXZpZ2F0aW9uQWN0aW9uKHJlc291cmNlUmVxdWVzdCwg dHlwZSwgbnVsbHB0ciwgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSkKKyAgICA6IE5hdmln YXRpb25BY3Rpb257IHJlc291cmNlUmVxdWVzdCwgdHlwZSwgbnVsbHB0ciwgc2hvdWxkT3BlbkV4 dGVybmFsVVJMc1BvbGljeSB9CiB7CiB9CiAKIE5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25B Y3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIEZyYW1lTG9hZFR5 cGUgZnJhbWVMb2FkVHlwZSwgYm9vbCBpc0Zvcm1TdWJtaXNzaW9uLCBQYXNzUmVmUHRyPEV2ZW50 PiBldmVudCkKLSAgICA6IE5hdmlnYXRpb25BY3Rpb24ocmVzb3VyY2VSZXF1ZXN0LCBuYXZpZ2F0 aW9uVHlwZShmcmFtZUxvYWRUeXBlLCBpc0Zvcm1TdWJtaXNzaW9uLCBldmVudCksIGV2ZW50LCBT aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdykKKyAgICA6IE5hdmln YXRpb25BY3Rpb257IHJlc291cmNlUmVxdWVzdCwgbmF2aWdhdGlvblR5cGUoZnJhbWVMb2FkVHlw ZSwgaXNGb3JtU3VibWlzc2lvbiwgZXZlbnQpLCBldmVudCwgU2hvdWxkT3BlbkV4dGVybmFsVVJM c1BvbGljeTo6U2hvdWxkTm90QWxsb3cgfQogewogfQogCg== 253965 2015-05-30 14:55:40 -0700 2015-05-30 15:05:55 -0700 Alternate fix that should definitely work. patch text/plain 6070 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMGI0ZGQzLi45Y2VjN2I0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTUtMDUtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIEZpeCBXaW5kb3dzIHRlc3RzIGJyb2tlbiBieSByMTg1MDA3LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NDcyCisKKyAgICAgICAgVW5yZXZp ZXdlZC4gRGlzY3Vzc2VkIHdpdGggQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICBObyBu ZXcgdGVzdHMgKEZpeGluZyB0aGUgZm91ciBicm9rZW4gb25lcyBzaG91bGQgc3VmZmljZSkuCisK KyAgICAgICAgVGhlIGJ1ZyB3YXMgdGhhdCBldmFsdWF0aW5nIGFyZ3VtZW50cyBpbiBhIG1ldGhv ZC9jb25zdHJ1Y3RvciBjYWxsIGhhcyBubyBndWFyYW50ZWVkIHNlcXVlbmNpbmcuCisgICAgICAg IAorICAgICAgICBDbGFuZyBzZWVtcyB0byBhbHdheXMgZG8gTFRSLCBhbGxvd2luZyB0aGUgUGFz c1JlZlB0ciB0byBiZSBldmFsdWF0ZWQgYXMgYSBib29sIGluIHRoZSBjYWxsIHRvCisgICAgICAg IG5hdmlnYXRpb25UeXBlKCkgYmVmb3JlIGl0IGlzICJjb25zdW1lZCIgYnkgdGhlIFBhc3NSZWZQ dHIgYXJndW1lbnQuCisgICAgICAgIAorICAgICAgICBJbiBWaXN1YWwgU3R1ZGlvIHRoZSBQYXNz UmVmUHRyIGNvbnN1bXB0aW9uIGhhcHBlbmVkIGJlZm9yZSB0aGUgYm9vbCBldmFsdWF0aW9uLCBt ZWFuaW5nIGBmYWxzZWAKKyAgICAgICAgd2FzIGFsd2F5cyBwYXNzZWQgaW4gdG8gbmF2aWdhdGlv blR5cGUoKSwgYnJlYWtpbmcgdGhlIGZvdXIgdGVzdHMuCisgICAgICAgIAorICAgICAgICBUaGUg Zml4PyBVc2luZyBQYXNzUmVmUHRyIGhlcmUgd2FzIHNpbGx5IGluIHRoZSBmaXJzdCBwbGFjZS4K KyAgICAgICAgTm8gb3duZXJzaGlwIGlzIGJlaW5nIHRyYW5zZmVycmVkLgorICAgICAgICBSYXcg cG9pbnRlcnMgaXQgaXMuCisgICAgICAgIAorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFVSTCk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFBvc3RSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIv TmF2aWdhdGlvbkFjdGlvbi5jcHA6CisKKyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRpb25BY3Rp b246Ok5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAqIGxvYWRlci9OYXZpZ2F0aW9uQWN0aW9u Lmg6IE5vYm9keSBpcyBhY3R1YWxseSB0cmFuc2ZlcnJpbmcgb3duZXJzaGlwIG9mIHRoZXNlIEV2 ZW50cy4KKyAgICAgICAgICBSYXcgcG9pbnRlcnMgd2lsbCB3b3JrIGp1c3QgZmluZSwgdGhhbmtz LgorCiAyMDE1LTA1LTI5ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAg ICAgICBbaU9TXSBSZWR1Y2UgdGlsaW5nIGNvdmVyYWdlIHdoZW4gZG9pbmcgYSBwdXJlIHBpbmNo IHpvb20gd2l0aCBubyBwYW5uaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK aW5kZXggOTdiNjIwYi4uMjViMDg2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCkBAIC0xMjMwLDcgKzEyMzAsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkVVJMKGNvbnN0 IEZyYW1lTG9hZFJlcXVlc3QmIGZyYW1lTG9hZFJlcXVlc3QsIGNvbnN0IFN0cmluZwogICAgIGlm IChtX3BhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCAhPSBOb0Rpc21pc3NhbCkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgTmF2aWdhdGlvbkFjdGlvbiBhY3Rpb24ocmVxdWVzdCwgbmV3 TG9hZFR5cGUsIGlzRm9ybVN1Ym1pc3Npb24sIGV2ZW50KTsKKyAgICBOYXZpZ2F0aW9uQWN0aW9u IGFjdGlvbihyZXF1ZXN0LCBuZXdMb2FkVHlwZSwgaXNGb3JtU3VibWlzc2lvbiwgZXZlbnQuZ2V0 KCkpOwogCiAgICAgaWYgKCF0YXJnZXRGcmFtZSAmJiAhZnJhbWVOYW1lLmlzRW1wdHkoKSkgewog ICAgICAgICBwb2xpY3lDaGVja2VyKCkuY2hlY2tOZXdXaW5kb3dQb2xpY3koYWN0aW9uLCByZXF1 ZXN0LCBmb3JtU3RhdGUucmVsZWFzZSgpLCBmcmFtZU5hbWUsIFt0aGlzLCBhbGxvd05hdmlnYXRp b25Ub0ludmFsaWRVUkwsIG9wZW5lclBvbGljeV0oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBQYXNzUmVmUHRyPEZvcm1TdGF0ZT4gZm9ybVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1l TmFtZSwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYgYWN0aW9uLCBib29sIHNob3VsZENvbnRpbnVl KSB7CkBAIC0yNjQzLDcgKzI2NDMsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkUG9zdFJlcXVl c3QoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU3RyaW5nJgogICAgIHdv cmtpbmdSZXNvdXJjZVJlcXVlc3Quc2V0SFRUUENvbnRlbnRUeXBlKGNvbnRlbnRUeXBlKTsKICAg ICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVzdCh3b3JraW5nUmVzb3VyY2VSZXF1ZXN0LCBsb2FkVHlw ZSwgdHJ1ZSk7CiAKLSAgICBOYXZpZ2F0aW9uQWN0aW9uIGFjdGlvbih3b3JraW5nUmVzb3VyY2VS ZXF1ZXN0LCBsb2FkVHlwZSwgdHJ1ZSwgZXZlbnQpOworICAgIE5hdmlnYXRpb25BY3Rpb24gYWN0 aW9uKHdvcmtpbmdSZXNvdXJjZVJlcXVlc3QsIGxvYWRUeXBlLCB0cnVlLCBldmVudC5nZXQoKSk7 CiAKICAgICBpZiAoIWZyYW1lTmFtZS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gVGhlIHNlYXJj aCBmb3IgYSB0YXJnZXQgZnJhbWUgaXMgZG9uZSBlYXJsaWVyIGluIHRoZSBjYXNlIG9mIGZvcm0g c3VibWlzc2lvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9u QWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0aW9uLmNwcApp bmRleCA2OTk3NzU5Li42ZDNlNDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv TmF2aWdhdGlvbkFjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRp b25BY3Rpb24uY3BwCkBAIC00OCw3ICs0OCw3IEBAIHN0YXRpYyBOYXZpZ2F0aW9uVHlwZSBuYXZp Z2F0aW9uVHlwZShGcmFtZUxvYWRUeXBlIGZyYW1lTG9hZFR5cGUsIGJvb2wgaXNGb3JtU3ViCiAg ICAgcmV0dXJuIE5hdmlnYXRpb25UeXBlOjpPdGhlcjsKIH0KIAotTmF2aWdhdGlvbkFjdGlvbjo6 TmF2aWdhdGlvbkFjdGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCwg TmF2aWdhdGlvblR5cGUgdHlwZSwgUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQsIFNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSkKK05hdmlnYXRp b25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJj ZVJlcXVlc3QsIE5hdmlnYXRpb25UeXBlIHR5cGUsIEV2ZW50KiBldmVudCwgU2hvdWxkT3BlbkV4 dGVybmFsVVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5KQogICAgIDogbV9y ZXNvdXJjZVJlcXVlc3QocmVzb3VyY2VSZXF1ZXN0KQogICAgICwgbV90eXBlKHR5cGUpCiAgICAg LCBtX2V2ZW50KGV2ZW50KQpAQCAtNzcsNyArNzcsNyBAQCBOYXZpZ2F0aW9uQWN0aW9uOjpOYXZp Z2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBGcmFt ZQogewogfQogCi1OYXZpZ2F0aW9uQWN0aW9uOjpOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291 cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBOYXZpZ2F0aW9uVHlwZSB0eXBlLCBQYXNzUmVm UHRyPEV2ZW50PiBldmVudCkKK05hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIE5hdmlnYXRpb25UeXBlIHR5cGUs IEV2ZW50KiBldmVudCkKICAgICA6IE5hdmlnYXRpb25BY3Rpb24ocmVzb3VyY2VSZXF1ZXN0LCB0 eXBlLCBldmVudCwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cp CiB7CiB9CkBAIC04Nyw3ICs4Nyw3IEBAIE5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rp b24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIE5hdmlnCiB7CiB9CiAK LU5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXNvdXJjZVJlcXVlc3QsIEZyYW1lTG9hZFR5cGUgZnJhbWVMb2FkVHlwZSwgYm9vbCBpc0Zv cm1TdWJtaXNzaW9uLCBQYXNzUmVmUHRyPEV2ZW50PiBldmVudCkKK05hdmlnYXRpb25BY3Rpb246 Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3Qs IEZyYW1lTG9hZFR5cGUgZnJhbWVMb2FkVHlwZSwgYm9vbCBpc0Zvcm1TdWJtaXNzaW9uLCBFdmVu dCogZXZlbnQpCiAgICAgOiBOYXZpZ2F0aW9uQWN0aW9uKHJlc291cmNlUmVxdWVzdCwgbmF2aWdh dGlvblR5cGUoZnJhbWVMb2FkVHlwZSwgaXNGb3JtU3VibWlzc2lvbiwgZXZlbnQpLCBldmVudCwg U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cpCiB7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5oIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25BY3Rpb24uaAppbmRleCBkZTMwODk5Li45YjUwMzBj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0aW9uLmgKQEAgLTQzLDEwICs0 MywxMCBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgZXhwbGljaXQgTmF2aWdhdGlvbkFj dGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBOYXZpZ2F0 aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIE5hdmlnYXRpb25UeXBlKTsKICAgICBX RUJDT1JFX0VYUE9SVCBOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIEZy YW1lTG9hZFR5cGUsIGJvb2wgaXNGb3JtU3VibWlzc2lvbik7Ci0gICAgTmF2aWdhdGlvbkFjdGlv bihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBOYXZpZ2F0aW9uVHlwZSwgUGFzc1JlZlB0cjxFdmVu dD4pOwotICAgIE5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgTmF2aWdh dGlvblR5cGUsIFBhc3NSZWZQdHI8RXZlbnQ+LCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5 KTsKKyAgICBOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIE5hdmlnYXRp b25UeXBlLCBFdmVudCopOworICAgIE5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiwgTmF2aWdhdGlvblR5cGUsIEV2ZW50KiwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eSk7CiAgICAgTmF2aWdhdGlvbkFjdGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBOYXZpZ2F0 aW9uVHlwZSwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSk7Ci0gICAgTmF2aWdhdGlvbkFj dGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBGcmFtZUxvYWRUeXBlLCBib29sIGlzRm9ybVN1 Ym1pc3Npb24sIFBhc3NSZWZQdHI8RXZlbnQ+KTsKKyAgICBOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0 IFJlc291cmNlUmVxdWVzdCYsIEZyYW1lTG9hZFR5cGUsIGJvb2wgaXNGb3JtU3VibWlzc2lvbiwg RXZlbnQqKTsKIAogICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb3VyY2VS ZXF1ZXN0LnVybCgpLmlzRW1wdHkoKTsgfQogCg== 253966 2015-05-30 15:05:55 -0700 2015-05-30 15:06:39 -0700 Fix for landing patch text/plain 6070 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMGI0ZGQzLi45Y2VjN2I0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTUtMDUtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIEZpeCBXaW5kb3dzIHRlc3RzIGJyb2tlbiBieSByMTg1MDA3LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NDcyCisKKyAgICAgICAgVW5yZXZp ZXdlZC4gRGlzY3Vzc2VkIHdpdGggQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICBObyBu ZXcgdGVzdHMgKEZpeGluZyB0aGUgZm91ciBicm9rZW4gb25lcyBzaG91bGQgc3VmZmljZSkuCisK KyAgICAgICAgVGhlIGJ1ZyB3YXMgdGhhdCBldmFsdWF0aW5nIGFyZ3VtZW50cyBpbiBhIG1ldGhv ZC9jb25zdHJ1Y3RvciBjYWxsIGhhcyBubyBndWFyYW50ZWVkIHNlcXVlbmNpbmcuCisgICAgICAg IAorICAgICAgICBDbGFuZyBzZWVtcyB0byBhbHdheXMgZG8gTFRSLCBhbGxvd2luZyB0aGUgUGFz c1JlZlB0ciB0byBiZSBldmFsdWF0ZWQgYXMgYSBib29sIGluIHRoZSBjYWxsIHRvCisgICAgICAg IG5hdmlnYXRpb25UeXBlKCkgYmVmb3JlIGl0IGlzICJjb25zdW1lZCIgYnkgdGhlIFBhc3NSZWZQ dHIgYXJndW1lbnQuCisgICAgICAgIAorICAgICAgICBJbiBWaXN1YWwgU3R1ZGlvIHRoZSBQYXNz UmVmUHRyIGNvbnN1bXB0aW9uIGhhcHBlbmVkIGJlZm9yZSB0aGUgYm9vbCBldmFsdWF0aW9uLCBt ZWFuaW5nIGBmYWxzZWAKKyAgICAgICAgd2FzIGFsd2F5cyBwYXNzZWQgaW4gdG8gbmF2aWdhdGlv blR5cGUoKSwgYnJlYWtpbmcgdGhlIGZvdXIgdGVzdHMuCisgICAgICAgIAorICAgICAgICBUaGUg Zml4PyBVc2luZyBQYXNzUmVmUHRyIGhlcmUgd2FzIHNpbGx5IGluIHRoZSBmaXJzdCBwbGFjZS4K KyAgICAgICAgTm8gb3duZXJzaGlwIGlzIGJlaW5nIHRyYW5zZmVycmVkLgorICAgICAgICBSYXcg cG9pbnRlcnMgaXQgaXMuCisgICAgICAgIAorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFVSTCk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFBvc3RSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIv TmF2aWdhdGlvbkFjdGlvbi5jcHA6CisKKyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRpb25BY3Rp b246Ok5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAqIGxvYWRlci9OYXZpZ2F0aW9uQWN0aW9u Lmg6IE5vYm9keSBpcyBhY3R1YWxseSB0cmFuc2ZlcnJpbmcgb3duZXJzaGlwIG9mIHRoZXNlIEV2 ZW50cy4KKyAgICAgICAgICBSYXcgcG9pbnRlcnMgd2lsbCB3b3JrIGp1c3QgZmluZSwgdGhhbmtz LgorCiAyMDE1LTA1LTI5ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAg ICAgICBbaU9TXSBSZWR1Y2UgdGlsaW5nIGNvdmVyYWdlIHdoZW4gZG9pbmcgYSBwdXJlIHBpbmNo IHpvb20gd2l0aCBubyBwYW5uaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK aW5kZXggOTdiNjIwYi4uMjViMDg2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCkBAIC0xMjMwLDcgKzEyMzAsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkVVJMKGNvbnN0 IEZyYW1lTG9hZFJlcXVlc3QmIGZyYW1lTG9hZFJlcXVlc3QsIGNvbnN0IFN0cmluZwogICAgIGlm IChtX3BhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCAhPSBOb0Rpc21pc3NhbCkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgTmF2aWdhdGlvbkFjdGlvbiBhY3Rpb24ocmVxdWVzdCwgbmV3 TG9hZFR5cGUsIGlzRm9ybVN1Ym1pc3Npb24sIGV2ZW50KTsKKyAgICBOYXZpZ2F0aW9uQWN0aW9u IGFjdGlvbihyZXF1ZXN0LCBuZXdMb2FkVHlwZSwgaXNGb3JtU3VibWlzc2lvbiwgZXZlbnQuZ2V0 KCkpOwogCiAgICAgaWYgKCF0YXJnZXRGcmFtZSAmJiAhZnJhbWVOYW1lLmlzRW1wdHkoKSkgewog ICAgICAgICBwb2xpY3lDaGVja2VyKCkuY2hlY2tOZXdXaW5kb3dQb2xpY3koYWN0aW9uLCByZXF1 ZXN0LCBmb3JtU3RhdGUucmVsZWFzZSgpLCBmcmFtZU5hbWUsIFt0aGlzLCBhbGxvd05hdmlnYXRp b25Ub0ludmFsaWRVUkwsIG9wZW5lclBvbGljeV0oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBQYXNzUmVmUHRyPEZvcm1TdGF0ZT4gZm9ybVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1l TmFtZSwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYgYWN0aW9uLCBib29sIHNob3VsZENvbnRpbnVl KSB7CkBAIC0yNjQzLDcgKzI2NDMsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkUG9zdFJlcXVl c3QoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU3RyaW5nJgogICAgIHdv cmtpbmdSZXNvdXJjZVJlcXVlc3Quc2V0SFRUUENvbnRlbnRUeXBlKGNvbnRlbnRUeXBlKTsKICAg ICBhZGRFeHRyYUZpZWxkc1RvUmVxdWVzdCh3b3JraW5nUmVzb3VyY2VSZXF1ZXN0LCBsb2FkVHlw ZSwgdHJ1ZSk7CiAKLSAgICBOYXZpZ2F0aW9uQWN0aW9uIGFjdGlvbih3b3JraW5nUmVzb3VyY2VS ZXF1ZXN0LCBsb2FkVHlwZSwgdHJ1ZSwgZXZlbnQpOworICAgIE5hdmlnYXRpb25BY3Rpb24gYWN0 aW9uKHdvcmtpbmdSZXNvdXJjZVJlcXVlc3QsIGxvYWRUeXBlLCB0cnVlLCBldmVudC5nZXQoKSk7 CiAKICAgICBpZiAoIWZyYW1lTmFtZS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gVGhlIHNlYXJj aCBmb3IgYSB0YXJnZXQgZnJhbWUgaXMgZG9uZSBlYXJsaWVyIGluIHRoZSBjYXNlIG9mIGZvcm0g c3VibWlzc2lvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9u QWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0aW9uLmNwcApp bmRleCA2OTk3NzU5Li42ZDNlNDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv TmF2aWdhdGlvbkFjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRp b25BY3Rpb24uY3BwCkBAIC00OCw3ICs0OCw3IEBAIHN0YXRpYyBOYXZpZ2F0aW9uVHlwZSBuYXZp Z2F0aW9uVHlwZShGcmFtZUxvYWRUeXBlIGZyYW1lTG9hZFR5cGUsIGJvb2wgaXNGb3JtU3ViCiAg ICAgcmV0dXJuIE5hdmlnYXRpb25UeXBlOjpPdGhlcjsKIH0KIAotTmF2aWdhdGlvbkFjdGlvbjo6 TmF2aWdhdGlvbkFjdGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCwg TmF2aWdhdGlvblR5cGUgdHlwZSwgUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQsIFNob3VsZE9wZW5F eHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSkKK05hdmlnYXRp b25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJj ZVJlcXVlc3QsIE5hdmlnYXRpb25UeXBlIHR5cGUsIEV2ZW50KiBldmVudCwgU2hvdWxkT3BlbkV4 dGVybmFsVVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5KQogICAgIDogbV9y ZXNvdXJjZVJlcXVlc3QocmVzb3VyY2VSZXF1ZXN0KQogICAgICwgbV90eXBlKHR5cGUpCiAgICAg LCBtX2V2ZW50KGV2ZW50KQpAQCAtNzcsNyArNzcsNyBAQCBOYXZpZ2F0aW9uQWN0aW9uOjpOYXZp Z2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBGcmFt ZQogewogfQogCi1OYXZpZ2F0aW9uQWN0aW9uOjpOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291 cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBOYXZpZ2F0aW9uVHlwZSB0eXBlLCBQYXNzUmVm UHRyPEV2ZW50PiBldmVudCkKK05hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIE5hdmlnYXRpb25UeXBlIHR5cGUs IEV2ZW50KiBldmVudCkKICAgICA6IE5hdmlnYXRpb25BY3Rpb24ocmVzb3VyY2VSZXF1ZXN0LCB0 eXBlLCBldmVudCwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cp CiB7CiB9CkBAIC04Nyw3ICs4Nyw3IEBAIE5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rp b24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIE5hdmlnCiB7CiB9CiAK LU5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXNvdXJjZVJlcXVlc3QsIEZyYW1lTG9hZFR5cGUgZnJhbWVMb2FkVHlwZSwgYm9vbCBpc0Zv cm1TdWJtaXNzaW9uLCBQYXNzUmVmUHRyPEV2ZW50PiBldmVudCkKK05hdmlnYXRpb25BY3Rpb246 Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3Qs IEZyYW1lTG9hZFR5cGUgZnJhbWVMb2FkVHlwZSwgYm9vbCBpc0Zvcm1TdWJtaXNzaW9uLCBFdmVu dCogZXZlbnQpCiAgICAgOiBOYXZpZ2F0aW9uQWN0aW9uKHJlc291cmNlUmVxdWVzdCwgbmF2aWdh dGlvblR5cGUoZnJhbWVMb2FkVHlwZSwgaXNGb3JtU3VibWlzc2lvbiwgZXZlbnQpLCBldmVudCwg U2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxkTm90QWxsb3cpCiB7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5oIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25BY3Rpb24uaAppbmRleCBkZTMwODk5Li45YjUwMzBj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0aW9uLmgKQEAgLTQzLDEwICs0 MywxMCBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgZXhwbGljaXQgTmF2aWdhdGlvbkFj dGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKICAgICBXRUJDT1JFX0VYUE9SVCBOYXZpZ2F0 aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIE5hdmlnYXRpb25UeXBlKTsKICAgICBX RUJDT1JFX0VYUE9SVCBOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIEZy YW1lTG9hZFR5cGUsIGJvb2wgaXNGb3JtU3VibWlzc2lvbik7Ci0gICAgTmF2aWdhdGlvbkFjdGlv bihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBOYXZpZ2F0aW9uVHlwZSwgUGFzc1JlZlB0cjxFdmVu dD4pOwotICAgIE5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgTmF2aWdh dGlvblR5cGUsIFBhc3NSZWZQdHI8RXZlbnQ+LCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5 KTsKKyAgICBOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIE5hdmlnYXRp b25UeXBlLCBFdmVudCopOworICAgIE5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiwgTmF2aWdhdGlvblR5cGUsIEV2ZW50KiwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eSk7CiAgICAgTmF2aWdhdGlvbkFjdGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBOYXZpZ2F0 aW9uVHlwZSwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSk7Ci0gICAgTmF2aWdhdGlvbkFj dGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBGcmFtZUxvYWRUeXBlLCBib29sIGlzRm9ybVN1 Ym1pc3Npb24sIFBhc3NSZWZQdHI8RXZlbnQ+KTsKKyAgICBOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0 IFJlc291cmNlUmVxdWVzdCYsIEZyYW1lTG9hZFR5cGUsIGJvb2wgaXNGb3JtU3VibWlzc2lvbiwg RXZlbnQqKTsKIAogICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb3VyY2VS ZXF1ZXN0LnVybCgpLmlzRW1wdHkoKTsgfQogCg==