Re: com php-src: Fixed Bug #65171 imagescale() fails: ext/gd/gd.c
| From: | Ferenc Kovacs | Date: | Wed, 15 Oct 2014 17:44:43 +0000 |
| Subject: | Re: com php-src: Fixed Bug #65171 imagescale() fails: ext/gd/gd.c | ||
| References: | 1 2 3 4 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-82361@lists.php.net to get a copy of this message | ||
On Wed, Oct 15, 2014 at 7:39 PM, Ferenc Kovacs <tyra3l@gmail.com> wrote:
>
>
> On Wed, Oct 15, 2014 at 7:23 PM, Remi Collet <remi@fedoraproject.org>
> wrote:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Le 15/10/2014 19:21, Remi Collet a écrit :
>> > Le 15/10/2014 19:13, Remi Collet a écrit :
>> >> Commit: 2728e6f01798b1146b41587d38bf84cdf9988d17 Author:
>> >> Remi Collet <remi@php.net> Wed, 15 Oct 2014 19:13:25
>> >> +0200 Parents: 6d9c9f8f0468f8d90dc233d6fc70dc949349e6da
>> >> Branches: PHP-5.5
>> >
>> >> Link:
>> >>
>>
>> http://git.php.net/?p=php-src.git;a=commitdiff;h=2728e6f01798b1146b41587d38bf84cdf9988d17
>> >
>> >>
>> >
>> > Can someone check 5.6 ?
>> >
>> > I cannot merge this fix up in 5.6 / master because of merge
>> > conflicts on ext/openssl/xp_ssl.c
>>
>> I think this is related to
>>
>>
>> http://git.php.net/?p=php-src.git;a=commitdiff;h=6d9c9f8f0468f8d90dc233d6fc70dc949349e6da
>>
>> Julien ?
>>
>
> hi,
>
> it seems that Julien forgot to merge this commit upwards, and I haven't
> reverted that botched fix from the PHP-5.6 branch(was expecting Daniel to
> finish the proper fix it already), let me also revert this from 5.6 and
> resolve the merges.
>
> --
> Ferenc Kovács
> @Tyr43l - http://tyrael.hu
>
should be fixed, I also merged your fix up to master, but I did not added
the NEWS entry for 5.6, please do that for me!
--
Ferenc Kovács
@Tyr43l - http://tyrael.hu