Everything
php
Learn Community Releases The PHP Project
Home » Project » Newsgroups » php.internals » Changes on zend head »

Changes on zend head

php.internals

Peter Bowen

23 years ago
I noticed that there have been a few checkins on Zend HEAD after the branch for 4.3. Are these being explicitly dropped, or have they just been forgotten? Thanks. Peter

(Marcus Börger)

23 years ago
At 22:23 28.04.2003, Peter Bowen wrote:
>I noticed that there have been a few checkins on Zend HEAD after the >branch for 4.3. Are these being explicitly dropped, or have they just >been forgotten?
4.3 => ZE1 5/HEAD => ZE2 regards marcus

Peter Bowen

23 years ago
On Mon, 2003-04-28 at 18:42, Marcus Börger wrote:
> At 22:23 28.04.2003, Peter Bowen wrote: > >I noticed that there have been a few checkins on Zend HEAD after the > >branch for 4.3. Are these being explicitly dropped, or have they just > >been forgotten? > > 4.3 => ZE1 > 5/HEAD => ZE2
I understand the branch situation for the php4 module, and what you say is very true. My question is about the Zend module in CVS. It has checkins that were made after the PHP_4_3 branch was created, and that have not been merged into the branch. ZE2 is in its own module, so Zend HEAD is in limbo, from what I can tell. There appear to be a couple of feature additions to ZE1 after the branch, including backtrace functionality, and several minor bug fixes. Is there a chance these will get ported to the 4.3 branch? Thanks. Peter

Derick Rethans

23 years ago
On Tue, 28 Apr 2003, Peter Bowen wrote:
> On Mon, 2003-04-28 at 18:42, Marcus Börger wrote: > > At 22:23 28.04.2003, Peter Bowen wrote: > > >I noticed that there have been a few checkins on Zend HEAD after the > > >branch for 4.3. Are these being explicitly dropped, or have they just > > >been forgotten? > > > > 4.3 => ZE1 > > 5/HEAD => ZE2 > > I understand the branch situation for the php4 module, and what you say > is very true. My question is about the Zend module in CVS. It has > checkins that were made after the PHP_4_3 branch was created, and that > have not been merged into the branch. ZE2 is in its own module, so Zend > HEAD is in limbo, from what I can tell. > > There appear to be a couple of feature additions to ZE1 after the > branch, including backtrace functionality, and several minor bug fixes. > Is there a chance these will get ported to the 4.3 branch?
I know I ported atleast one fix... it would help a lot if you could make a list of the patches. Derick
-- "my other box is your windows PC" ------------------------------------------------------------------------- Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ -------------------------------------------------------------------------

Peter Bowen

23 years ago
On Tue, 2003-04-29 at 02:31, Derick Rethans wrote:
> On Tue, 28 Apr 2003, Peter Bowen wrote: > > There appear to be a couple of feature additions to ZE1 after the > > branch, including backtrace functionality, and several minor bug fixes. > > Is there a chance these will get ported to the 4.3 branch? > > I know I ported atleast one fix... it would help a lot if you could make > a list of the patches.
Attached is the combined patch for all the smallish changes/fixes on ZE1 HEAD. I have a separate patch for the debug_backtrace functionality, as it is a significant amount of code. The changes include fixes for bugs 16137, 20969, and lineno handling, a more streamlined version of the leak fix, a fix for Netware includes, and George Schlossnagle's lexer enhancement to not tokenize on whitespace unnecessarily. I can break up the patch into the individual patches, if necessary, but I think that it is fairly manageable as-is. Thanks. Peter

Jani Taskinen

23 years ago
On 29 Apr 2003, Peter Bowen wrote:
>On Tue, 2003-04-29 at 02:31, Derick Rethans wrote: >> On Tue, 28 Apr 2003, Peter Bowen wrote: >> > There appear to be a couple of feature additions to ZE1 after the >> > branch, including backtrace functionality, and several minor bug fixes. >> > Is there a chance these will get ported to the 4.3 branch? >> >> I know I ported atleast one fix... it would help a lot if you could make >> a list of the patches. > >Attached is the combined patch for all the smallish changes/fixes on ZE1 >HEAD. I have a separate patch for the debug_backtrace functionality, as >it is a significant amount of code.
debug_backtrace() is in 4.3 branch.
>The changes include fixes for bugs 16137, 20969, and lineno handling, a >more streamlined version of the leak fix, a fix for Netware includes,
AFAIK all these are in, maybe not just done the same way.
>and George Schlossnagle's lexer enhancement to not tokenize on >whitespace unnecessarily.
This was reverted because it broke backwards compatibility. --Jani

Derick Rethans

23 years ago
On Tue, 29 Apr 2003, Jani Taskinen wrote:
> On 29 Apr 2003, Peter Bowen wrote: > > >Attached is the combined patch for all the smallish changes/fixes on ZE1 > >HEAD. I have a separate patch for the debug_backtrace functionality, as > >it is a significant amount of code. > > debug_backtrace() is in 4.3 branch. > > >The changes include fixes for bugs 16137, 20969, and lineno handling, a > >more streamlined version of the leak fix, a fix for Netware includes, > > AFAIK all these are in, maybe not just done the same way. > > >and George Schlossnagle's lexer enhancement to not tokenize on > >whitespace unnecessarily. > > This was reverted because it broke backwards compatibility.
Yeah, afaics all patches that needed merging are merged... Derick
-- "my other box is your windows PC" ------------------------------------------------------------------------- Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ -------------------------------------------------------------------------

Peter Bowen

23 years ago
On Tue, 2003-04-29 at 07:40, Jani Taskinen wrote:
> On 29 Apr 2003, Peter Bowen wrote: > > >On Tue, 2003-04-29 at 02:31, Derick Rethans wrote: > >> On Tue, 28 Apr 2003, Peter Bowen wrote: > >> > There appear to be a couple of feature additions to ZE1 after the > >> > branch, including backtrace functionality, and several minor bug fixes. > >> > Is there a chance these will get ported to the 4.3 branch? > >> > >> I know I ported atleast one fix... it would help a lot if you could make > >> a list of the patches. > > > >Attached is the combined patch for all the smallish changes/fixes on ZE1 > >HEAD. I have a separate patch for the debug_backtrace functionality, as > >it is a significant amount of code. > > debug_backtrace() is in 4.3 branch.
Ugh. I meant debug_print_backtrace. debug_backtrace is somewhat helpful, but, unless I'm missing something, there isn't a convenient way to print the backtrace. The second attached patch adds debug_print_backtrace().
> >The changes include fixes for bugs 16137, 20969, and lineno handling, a > >more streamlined version of the leak fix, a fix for Netware includes, > > AFAIK all these are in, maybe not just done the same way.
I know that 20969 is still broken in 4.3, as that is what sent me on this quest in the first place. I have attached just the relevant part of the patch. Thanks. Peter

Jani Taskinen

23 years ago
On 29 Apr 2003, Peter Bowen wrote:
>On Tue, 2003-04-29 at 07:40, Jani Taskinen wrote: >> On 29 Apr 2003, Peter Bowen wrote: >> >> >On Tue, 2003-04-29 at 02:31, Derick Rethans wrote: >> >> On Tue, 28 Apr 2003, Peter Bowen wrote: >> >> > There appear to be a couple of feature additions to ZE1 after the >> >> > branch, including backtrace functionality, and several minor bug fixes. >> >> > Is there a chance these will get ported to the 4.3 branch? >> >> >> >> I know I ported atleast one fix... it would help a lot if you could make >> >> a list of the patches. >> > >> >Attached is the combined patch for all the smallish changes/fixes on ZE1 >> >HEAD. I have a separate patch for the debug_backtrace functionality, as >> >it is a significant amount of code. >> >> debug_backtrace() is in 4.3 branch. > >Ugh. I meant debug_print_backtrace. debug_backtrace is somewhat >helpful, but, unless I'm missing something, there isn't a convenient way >to print the backtrace. The second attached patch adds >debug_print_backtrace().
Yes, it will be in PHP 5. This is a maintenance release. (bug fix)
>> >The changes include fixes for bugs 16137, 20969, and lineno handling, a >> >more streamlined version of the leak fix, a fix for Netware includes, >> >> AFAIK all these are in, maybe not just done the same way. > >I know that 20969 is still broken in 4.3, as that is what sent me on >this quest in the first place. I have attached just the relevant part >of the patch.
According to the bug #20969 last comments, it's not even a bug. --Jani