Hi:
the fix is bad smell, I knew. maybe you can find a better fix :) ?
the problem is explained in #55544:
" here is the confusion(assuming -d output_handler=ob_gzhandler -d
zlib.output_compression=0) :
1. php.output_handler will change the ZLIGB(output_compression) before the zlib
RINIT
2.
Commit:ddc8d1624525e500c593f4cbd30b3358ad4ad95e
Author:Florian Anderiasch Tue, 24 Jul 2012 14:29:25
+0200
Parents: 9fe8c58130ac82d2b52b35a290b71569abe50d18
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=ddc8d1624525e500c593f4cbd30b3358ad
Commit:81de31884d219645e4128e3dd57db8edbf5c
Author:Florian Anderiasch Tue, 24 Jul 2012 14:34:41
+0200
Parents: 45d596ea1e32792c7b7b7f28be220dea861b6708
ddc8d1624525e500c593f4cbd30b3358ad4ad95e
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=
Commit:45d596ea1e32792c7b7b7f28be220dea861b6708
Author:Florian Anderiasch Tue, 24 Jul 2012 13:15:16
+0200
Parents: dd9d64b21e4bbc8a106a6156dc6ffefbcc33ec02
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=45d596ea1e32792c7b7b7f28be220dea861b6708
Commit:f2cef8afc499ede08e935449030595933d070c5e
Author:Florian Anderiasch Tue, 24 Jul 2012 14:46:19
+0200
Parents: ddc8d1624525e500c593f4cbd30b3358ad4ad95e
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f2cef8afc499ede08e935449030595933d070c5e
Commit:54cba5aa91c58e2bcfa7957f72d5f4553c0dd265
Author:Felipe Pena Tue, 24 Jul 2012 10:02:32
-0300
Parents: f2cef8afc499ede08e935449030595933d070c5e
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=54cba5aa91c58e2bcfa7957f72d5f4553c0dd265
Commit:f356be68c244dd0dd70894ac4a5c9b4e3a882e04
Author:Gustavo André dos Santos Lopes Tue, 24
Jul 2012 15:13:02 +0200
Parents: 777160f7b544971f7e73932482735af69bc42ec7
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f356be68c244dd0dd70894ac4a5c9b
rasmus Tue, 24 Jul 2012 18:56:50 +
Revision: http://svn.php.net/viewvc?view=revision&revision=326797
Log:
karma
Changed paths:
U SVNROOT/global_avail
Modified: SVNROOT/global_avail
===
--
Commit:5f224412fa6892645ca548ac75f20ff8743ed916
Author:Rasmus Lerdorf Tue, 24 Jul 2012 16:28:49
-0700
Parents: 54cba5aa91c58e2bcfa7957f72d5f4553c0dd265
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=5f224412fa6892645ca548ac75f20ff8743ed916
Log
Commit:a05e07ea1f75b8021c9b64bf93ff970873375d97
Author:Rasmus Lerdorf Tue, 24 Jul 2012 16:28:49
-0700
Parents: f356be68c244dd0dd70894ac4a5c9b4e3a882e04
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=a05e07ea1f75b8021c9b64bf93ff970873375d97
Log
Commit:0fbc8561e687689f796d95584cea1fa959eee83b
Author:Rasmus Lerdorf Tue, 24 Jul 2012 16:28:49
-0700
Parents: f356be68c244dd0dd70894ac4a5c9b4e3a882e04
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=0fbc8561e687689f796d95584cea1fa959eee83b
Log:
Commit:5799ebdb0cafb2de1dbb18cfe780976c98dbaeac
Author:Rasmus Lerdorf Tue, 24 Jul 2012 16:28:49
-0700
Committer: Gustavo André dos Santos Lopes Wed, 25 Jul
2012 02:03:47 +0200
Parents: ffa8461bfebebd8158cdb26ad5f3439c527545f7
Branches: PHP-5.3
Link:
http://git.ph
johannes Wed, 25 Jul 2012 00:10:14 +
Revision: http://svn.php.net/viewvc?view=revision&revision=326802
Log:
Give myself access to karma.git
Changed paths:
U SVNROOT/global_avail
Modified: SVNROOT/global_avail
Commit:870bde4b24538cf7b64f0dd01b630241c5a53109
Author:Johannes Schlüter Wed, 25 Jul 2012
02:08:05 +0200
Parents: d1884840e7108c098ce75e7bbe204fb77b5fc975
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=870bde4b24538cf7b64f0dd01b630241c5a53109
Log
Hi!
On 7/24/12 5:15 PM, Johannes Schlüter wrote:
> Branch: PHP-5.4
> Deleted commits count: 2298
> User: Johannes Schlüter Wed, 25 Jul 2012 00:15:30
> +
>
What does this push do?
--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227
Hi,
for some reason master was merged into the PHP-5.4 branch. I undid this
change in the repo. If you pulled in between your next pull should
result in an error. Use
git reset --hard origin/PHP-5.4
to reset your local checkout to the current version on the server.
johannes
On Wed, 2012-07-
On 07/24/2012 05:18 PM, Stas Malyshev wrote:
> Hi!
>
> On 7/24/12 5:15 PM, Johannes Schlüter wrote:
>> Branch: PHP-5.4
>> Deleted commits count: 2298
>> User: Johannes Schlüter Wed, 25 Jul 2012 00:15:30
>> +
>>
>
> What does this push do?
>
It reverses the mess I caused. I had no
> Use
> git reset --hard origin/PHP-5.4
> to reset your local checkout to the current version on the server.
It should be noted that when you `reset --hard`, you'll lose local changes
(including branch commits, except in the reflog). You'll probably want to stash
first, reset, then stash pop
On Tue, 2012-07-24 at 20:34 -0400, Sean Coates wrote:
> > Use
> > git reset --hard origin/PHP-5.4
> > to reset your local checkout to the current version on the server.
>
> It should be noted that when you `reset --hard`, you'll lose local
> changes (including branch commits, except in the refl
Commit:3f9aeb02ef1bde0d2f3c25c3a297bb872964c99a
Author:Johannes Schlüter Wed, 25 Jul 2012
03:09:52 +0200
Parents: 870bde4b24538cf7b64f0dd01b630241c5a53109
Branches: master
Link:
http://git.php.net/?p=karma.git;a=commitdiff;h=3f9aeb02ef1bde0d2f3c25c3a297bb872964c99a
Log
Hi!
> I wonder if anybody can suggest a way to detect such commits
> automatically so we can catch them. `git diff` and others show nothing
> of relevance.
We could get some commit that is only in master (like NEWS edits, for
example) and check for it - if it's ever pushed into 5.4 that's trouble
21 matches
Mail list logo
