Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:42861
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain sci.fi from 63.208.196.178 cause and error)
Message-ID: <49801726.80905@sci.fi>
Date: Wed, 28 Jan 2009 10:28:22 +0200
Reply-To: jani.taskinen@iki.fi
User-Agent: Thunderbird 2.0.0.19 (X11/20090105)
MIME-Version: 1.0
To: shire <shire@tekrat.com>
CC: PHP Internals List <internals@lists.php.net>, helly@php.net
References: <497F7A42.6020509@tekrat.com>
In-Reply-To: <497F7A42.6020509@tekrat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] PHP_5_3 missed merge from PHP_5_2 for write_func callback
From: jani.taskinen@sci.fi (Jani Taskinen)

Whitespace fixes are evil. Especially when NOT done in every branch like 
they should. And then this happens.. thanks.

Marcus can fix it himself while checking every single file against every 
branch in /Zend that they're in sync..

--Jani


shire wrote:
> 
> I came across a problem in PHP_5_3 and HEAD because I was using a 
> feature added in PHP_5_2.  It doesn't look like it was merged to HEAD to 
> me, and then due to a merge from HEAD->PHP_5_3 it removed the changes 
> made in PHP_5_2.  This was for the write_func call back in print_zval_r_ex.
> 
> Original commit to PHP_5_2: 
> http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.10&r2=1.308.2.12.2.11 
> 
> 
> The merge from HEAD to PHP_5_3 that reverted it: 
> http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.35.2.2&r2=1.308.2.12.2.35.2.3& 
> 
> 
> Let me know if I missed something or if it would help if I put together 
> a patch to rectify it.  I'm currently using this to print out values in 
> the xLog extension (http://tekrat.com/php/xlog/)
> 
> Thanks,
> -shire
>