Re: com php-src: Fixed a bug that causes crash when environment variable is access while parsing php.ini: sapi/litespeed/lsapi_main.c

From: Date: Fri, 21 Nov 2014 00:27:56 +0000
Subject: Re: com php-src: Fixed a bug that causes crash when environment variable is access while parsing php.ini: sapi/litespeed/lsapi_main.c
References: 1  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83202@lists.php.net to get a copy of this message
Hi George, On 3 November 2014 09:31, George Wang <gwang@php.net> wrote: > Commit: c6237f554fc4229615666953b6d2f615c7c217fb > Author: George Wang <gwang@php.net> Fri, 3 Oct 2014 16:41:32 -0400 > Parents: 01ef77d000efc2b56a1cf3e7d6ef191be5601ac5 > Branches: phpng Please note that the phpng branch is no longer in use, so committing onto it is unnecessary. With regards to the other commits today: please remember to merge upwards from the lowest branch that you're committing to (in this case, PHP-5.4) per the workflow: https://wiki.php.net/vcs/gitworkflow. It should go 5.4 -> 5.5 -> 5.6 -> master. It's not a big deal for these commits, since they're all the same on each branch (I've already performed the merges and pushed them back up), but if you end up making commits that differ across branches, not merging makes life harder for the next person who commits. Finally, in terms of the 5.4 commits: have you talked to Stas about them? 5.4 is now in security fix only mode. Thanks, Adam

« previous php.cvs (#83202) next »