jabouillei/php-src — pull request #1 by jabouillei (2012-06-07 22:05:32+00:00)
Title: Issue 43177

I changed main.c and Zend.c to address bug #43177. The php.net description of eval() states:
"If there is a parse error in the evaluated code, eval() returns FALSE and execution of the following code continues normally."
That statement is almost true. The exit status and http response code were made 255 and 500. Even thought the script proceeds normally and the webpage may be perfectly constructed, the results may be discarded (e.g. by wget or an ajax framework) because of the 255/500. The changes to main.c and Zend.c in this request prevent an eval() error from affecting the exit status and http response code.

This is my second attempt to submit this change. For my first attempt, I followed the instructions at https://wiki.php.net/vcs/gitworkflow carefully and received an error when attempting "git pull --rebase upstream/PHP-5.4". I guess that's why there were other people's commits showing up in my pull request. Since then, I've executed the following commands. Some portion of these command seemed to fix things and others may have done nothing or messed something up. If anyone reads this that has the knowledge and permission to update https://wiki.php.net/vcs/gitworkflow, please make the appropriate updates so other people don't experience the problems I hit. Here are the additional commands that seemed to help:

git fetch upstream
git merge upstream/master
git push origin issue-43177
git checkout master
git merge upstream/master
git push origin master