[PHP-CVS] com php-src: Re-fix bug #55544: ext/zlib/php_zlib.h ext/zlib/tests/bug55544.phpt ext/zlib/zlib.c

2012-07-24 Thread Xinchen Hui
Commit:4c1e2bbd6f744b4048d4e0540ecc5dbe005494fe Author:Xinchen Hui larue...@php.net Tue, 24 Jul 2012 14:43:53 +0800 Parents: 2abc4c2f6fabfc81d12380170dc5ec7be9314a61 Branches: PHP-5.4 Link:

[PHP-CVS] com php-src: binary compatibility: ext/zlib/php_zlib.h

2012-07-24 Thread Xinchen Hui
Commit:9fe8c58130ac82d2b52b35a290b71569abe50d18 Author:Xinchen Hui larue...@php.net Tue, 24 Jul 2012 14:45:13 +0800 Parents: 4c1e2bbd6f744b4048d4e0540ecc5dbe005494fe Branches: PHP-5.4 Link:

Re: [PHP-CVS] com php-src: Re-fix bug #55544: ext/zlib/php_zlib.h ext/zlib/tests/bug55544.phpt ext/zlib/zlib.c

2012-07-24 Thread Laruence
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.

[PHP-CVS] com php-src: Add syslog support to mail.log #62356: ext/standard/mail.c php.ini-development php.ini-production

2012-07-24 Thread Florian Anderiasch
Commit:ddc8d1624525e500c593f4cbd30b3358ad4ad95e Author:Florian Anderiasch f...@php.net Tue, 24 Jul 2012 14:29:25 +0200 Parents: 9fe8c58130ac82d2b52b35a290b71569abe50d18 Branches: PHP-5.4 master Link:

[PHP-CVS] com php-src: Merge branch 'PHP-5.4': php.ini-development php.ini-production

2012-07-24 Thread Florian Anderiasch
Commit:81de31884d219645e4128e3dd57db8edbf5c Author:Florian Anderiasch f...@php.net Tue, 24 Jul 2012 14:34:41 +0200 Parents: 45d596ea1e32792c7b7b7f28be220dea861b6708 ddc8d1624525e500c593f4cbd30b3358ad4ad95e Branches: master Link:

[PHP-CVS] com php-src: Add optional depth parameter to json_encode #62369: ext/json/json.c ext/json/php_json.h ext/json/tests/bug62369.phpt

2012-07-24 Thread Florian Anderiasch
Commit:45d596ea1e32792c7b7b7f28be220dea861b6708 Author:Florian Anderiasch f...@php.net Tue, 24 Jul 2012 13:15:16 +0200 Parents: dd9d64b21e4bbc8a106a6156dc6ffefbcc33ec02 Branches: master Link:

[PHP-CVS] com php-src: Updated NES: NEWS

2012-07-24 Thread Florian Anderiasch
Commit:f2cef8afc499ede08e935449030595933d070c5e Author:Florian Anderiasch f...@php.net Tue, 24 Jul 2012 14:46:19 +0200 Parents: ddc8d1624525e500c593f4cbd30b3358ad4ad95e Branches: PHP-5.4 Link:

[PHP-CVS] com php-src: - Fixed ZTS build: ext/standard/mail.c

2012-07-24 Thread Felipe Pena
Commit:54cba5aa91c58e2bcfa7957f72d5f4553c0dd265 Author:Felipe Pena felipe...@gmail.com Tue, 24 Jul 2012 10:02:32 -0300 Parents: f2cef8afc499ede08e935449030595933d070c5e Branches: PHP-5.4 master Link:

[PHP-CVS] com php-src: ini intl.explicit_cleanup - INTL_EXPLICIT_CLEANUP: ext/intl/php_intl.c

2012-07-24 Thread Gustavo André dos Santos Lopes
Commit:f356be68c244dd0dd70894ac4a5c9b4e3a882e04 Author:Gustavo André dos Santos Lopes cataphr...@php.net Tue, 24 Jul 2012 15:13:02 +0200 Parents: 777160f7b544971f7e73932482735af69bc42ec7 Branches: master Link:

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-07-24 Thread Rasmus Lerdorf
rasmus Tue, 24 Jul 2012 18:56:50 + Revision: http://svn.php.net/viewvc?view=revisionrevision=326797 Log: karma Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail ===

[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c

2012-07-24 Thread Rasmus Lerdorf
Commit:5f224412fa6892645ca548ac75f20ff8743ed916 Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49 -0700 Parents: 54cba5aa91c58e2bcfa7957f72d5f4553c0dd265 Branches: PHP-5.4 Link:

[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c

2012-07-24 Thread Rasmus Lerdorf
Commit:a05e07ea1f75b8021c9b64bf93ff970873375d97 Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49 -0700 Parents: f356be68c244dd0dd70894ac4a5c9b4e3a882e04 Branches: PHP-5.4 Link:

[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c

2012-07-24 Thread Rasmus Lerdorf
Commit:0fbc8561e687689f796d95584cea1fa959eee83b Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49 -0700 Parents: f356be68c244dd0dd70894ac4a5c9b4e3a882e04 Branches: master Link:

[PHP-CVS] com php-src: Fix bug #62654: sapi/fpm/fpm/fpm_sockets.c

2012-07-24 Thread Gustavo André dos Santos Lopes
Commit:5799ebdb0cafb2de1dbb18cfe780976c98dbaeac Author:Rasmus Lerdorf ras...@php.net Tue, 24 Jul 2012 16:28:49 -0700 Committer: Gustavo André dos Santos Lopes cataphr...@php.net Wed, 25 Jul 2012 02:03:47 +0200 Parents: ffa8461bfebebd8158cdb26ad5f3439c527545f7 Branches:

[PHP-CVS] svn: /SVNROOT/ global_avail

2012-07-24 Thread Johannes Schlüter
johannes Wed, 25 Jul 2012 00:10:14 + Revision: http://svn.php.net/viewvc?view=revisionrevision=326802 Log: Give myself access to karma.git Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail

[PHP-CVS] com karma: Allow myself to do forced pushes.: hooks/pre-receive

2012-07-24 Thread Johannes Schlüter
Commit:870bde4b24538cf7b64f0dd01b630241c5a53109 Author:Johannes Schlüter johan...@schlueters.de Wed, 25 Jul 2012 02:08:05 +0200 Parents: d1884840e7108c098ce75e7bbe204fb77b5fc975 Branches: master Link:

Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.phpt Zend/tests/const_de

2012-07-24 Thread Stas Malyshev
Hi! On 7/24/12 5:15 PM, Johannes Schlüter wrote: Branch: PHP-5.4 Deleted commits count: 2298 User: Johannes Schlüter johan...@php.net Wed, 25 Jul 2012 00:15:30 + What does this push do? -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/

Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.phpt Zend/tests/const_de

2012-07-24 Thread Johannes Schlüter
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,

Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.phpt Zend/tests/const_de

2012-07-24 Thread Rasmus Lerdorf
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 johan...@php.net Wed, 25 Jul 2012 00:15:30 + What does this push do? It reverses the mess I caused. I had no

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.

2012-07-24 Thread Sean Coates
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

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.

2012-07-24 Thread Johannes Schlüter
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 reflog).

[PHP-CVS] com karma: Fix error message: hooks/pre-receive

2012-07-24 Thread Johannes Schlüter
Commit:3f9aeb02ef1bde0d2f3c25c3a297bb872964c99a Author:Johannes Schlüter johan...@schlueters.de Wed, 25 Jul 2012 03:09:52 +0200 Parents: 870bde4b24538cf7b64f0dd01b630241c5a53109 Branches: master Link:

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] del php-src: .travis.yml LICENSE Makefile.gcov NEWS README.md UPGRADING UPGRADING.INTERNALS Zend/tests/bug18556.phpt Zend/tests/bug60738.phpt Zend/tests/bug61681.

2012-07-24 Thread Stas Malyshev
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.