On Thu, Sep 25, 2014 at 7:28 AM, Daniel Lowrey <rdlow...@php.net> wrote:
> > FYI: I've tagged 5.6.1 and I had to revert the following commits for > this: > > 372844918a318ad712e16f9ec636682424a65403 > > f86b2193a483f56b0bd056570a0cdb57ebe66e2f > > 30a73658c63a91c413305a4c4d49882fda4dab3e > > 84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf > > 98e67add15a6b889efe152c23ed15a61f022a63a > > > > 98e67add15a6b889efe152c23ed15a61f022a63a and > 30a73658c63a91c413305a4c4d49882fda4dab3e were merge commits with conflict > resolution > > > > Could you review that the current status of ext/openssl/xp_ssl.c is > proper in the tag? > > Thanks! > > > > -- > > Ferenc Kovács > > Please also revert the following commit or we will still have problems: > > 6569db88081562f68a4f79e52cba83482bdf05fc > there is no need for that, that commit was merged with 98e67add15a6b889efe152c23ed15a61f022a63a, which I've already reverted, and it was better to revert the merge commit, because it contained modifications (because of conflict resolution back when you merged it). > > Other than this commit everything else looks good. I *have* verified a new > patch with the horde folks as solving the problem. However, I'm travelling > for the next week (starting in a couple of hours) and I don't want to rush > a (potentially) half-baked fix into the next 5.4 and 5.5 releases without > comprehensive testing. If tags must be created before the end of next week > then the best course of action is to revert these same commits for 5.4/5.5. > I will be able to respond to any correspondence if you have questions in > the coming days. Otherwise, I'll resolve this once and for all when I'm > back in the office. > have a safe trip! -- Ferenc Kovács @Tyr43l - http://tyrael.hu
