I will merge this before tagging the RC4 later today if nobody objects. /cc @jpauli

If this fixes something, I have no objection :-)

I've merged it.

Whoop 👍

Now we should get it backported to 5.5 and 5.4 soon, eh, @jpauli ? :)

Was the original patch (introducing the bug) merged against 5.5 ? I'm not sure about this.

@jpauli nope, the decision was to only merge it to 5.6 and backport it later. and @dzuelke seems to think that the revisited patch(eg. this pull request) is ready to be backported.
personally I would wait for the patch to be first shipped with 5.6.0 stable and see the feedback before backporting it.

Ok. But isn't the current discussion about a fix for a commit that has not been applied to 5.5 ?
So we won't need to merge this against 5.5 right ?

@jpauli
the original fix (#694) was only merged to 5.6(we decided that together, including you) so that it can be tested a bit more before backporting.
an issue was reported with the fix after it was merged to 5.6(http://bugs.php.net/67606), this PR fixes that bug via reverting the original fix and introducing a less intrusive fix not affecting anybody else (hopefully).
@dzuelke is asking if we are ready to backport the improved fix, and as I mentioned before I would prefer backporting it after the 5.6.0 stable release, but it is your call for 5.5 ofc.

Yep OK I see. Thx for refreshing my mind which often needs refreshing.
So, sure : let's wait to see how this works into 5.6 codebase before backporting to lower branches, which are in stable state.

Yup, exactly; the new fix (this whole thing addresses mod_proxy_fcgi issues) is a lot less intrusive as it keeps the stuff I originally removed in place, but skips them if mod_proxy_fcgi is detected (and for that it relies on routines that were already there for mod_proxy_fcgi handling).

This patch is much safer, but I agree it's still a good idea to have it in 5.6.0RC4 before thinking about merges to 5.5/5.4 for final validation it fixes the breakage mod_fastcgi saw since RC2 (I know it does, I tested that part this time, but better safe than sorry :))

@Tyrael or @jpauli, can you close https://bugs.php.net/bug.php?id=67606 please?

I closed it

@dzuelke @jpauli Are you guys aware of a workaround for this issue in 5.4.30?

No, @Freeaqingme, but I think the change will/should get merged to 5.5 and 5.4 soon; Apache with mod_proxy_fcgi is broken otherwise and this new change is a lot less intrusive and risky.

/cc @jpauli @Tyrael @smalyshev

For what it's worth, applying the patch didn't yield any changes for me. Instead I've now used a PHP script that's included via the auto_prepend_file directive with the following contents, which seems to work:
$_SERVER['PHP_SELF'] = $_SERVER['SCRIPT_URL'];
$_SERVER['SCRIPT_NAME'] = substr($_SERVER['SCRIPT_FILENAME'], strlen($_SERVER['DOCUMENT_ROOT']));

Ported to 5.4 in ee275e3 / b206b0e and merged to 5.5 in e55c641