Re: [PHP-CVS] com php-src: - Fixed bug #62887 (Only /status?plainfull gives last request cpu): sapi/fpm/fpm/fpm_status.c

2012-09-28 Thread Jérôme Loyet
laurence: I know, sorry, but merging never works gently. Each time, I'm in a situation from which I can never exit cleanly. I spend more time dealing with git than working on the patch ... you can easly understand I'm not continuing this way :( for me, it's a pain in the ass since php sources

Re: [PHP-CVS] com php-src: Merge branch 'fuckgit' into PHP-5.4: sapi/fpm/config.m4

2012-09-28 Thread Pierre Joye
hi Jérôme, Could you please keep msg log sane? Thanks, On Fri, Sep 28, 2012 at 1:19 AM, Jérôme Loyet f...@php.net wrote: Commit:be043ab6d00e9747727aefcb0dde12a40ddb4e8d Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 01:19:01 +0200 Parents:

Re: [PHP-CVS] com php-src: Merge branch 'fuckgit' into PHP-5.4: sapi/fpm/config.m4

2012-09-28 Thread Jérôme Loyet
2012/9/28 Pierre Joye pierre@gmail.com hi Jérôme, hi pierre, Could you please keep msg log sane? Yes, my mistake Thanks, On Fri, Sep 28, 2012 at 1:19 AM, Jérôme Loyet f...@php.net wrote: Commit:be043ab6d00e9747727aefcb0dde12a40ddb4e8d Author:Jerome Loyet f...@php.net

Re: [PHP-CVS] com php-src: - Fixed bug #62887 (Only /status?plainfull gives last request cpu): sapi/fpm/fpm/fpm_status.c

2012-09-28 Thread Christopher Jones
On 09/27/2012 11:25 PM, Jérôme Loyet wrote: laurence: I know, sorry, but merging never works gently. Each time, I'm in a situation from which I can never exit cleanly. I spend more time dealing with git than working on the patch ... you can easly understand I'm not continuing this way :( for

[PHP-CVS] com php-src: Add missing NEWS entry: NEWS

2012-09-28 Thread Jérôme Loyet
Commit:34c3985979cb27cd1fff1ca767b3162357da7b0b Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 11:22:16 +0200 Parents: b530f53c67da40dfa132d9cf68449ccc6d34daf7 Branches: PHP-5.4 master Link:

[PHP-CVS] com php-src: Fixed bug #62216: NEWS sapi/fpm/init.d.php-fpm.in

2012-09-28 Thread Jérôme Loyet
Commit:bb02fd5772070f00a7d26f2a64f34b55f6eea326 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 11:18:08 +0200 Parents: 151b16cf7ff6ddbf2e11932949aaa2ecb0f22724 Branches: PHP-5.3 PHP-5.4 master Link:

[PHP-CVS] com php-src: fix login failure with empty password. This is 5.5 specific - new code: ext/mysqlnd/mysqlnd.c

2012-09-28 Thread Andrey Hristov
Commit:c540fe2064d23e7e9de665f12d5452ce914991ff Author:Andrey Hristov and...@php.net Fri, 28 Sep 2012 11:58:41 +0200 Parents: da96aa848fc4845399d4d7a7c396fa31ffb9ffba Branches: master Link:

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/curl/streams.c

2012-09-28 Thread Pierrick Charron
Commit:a2a82201277259a50f064c5b46983cf99e974198 Author:Pierrick Charron pierr...@php.net Fri, 28 Sep 2012 15:21:33 -0400 Parents: 34c3985979cb27cd1fff1ca767b3162357da7b0b 936553d666405bc783511979b17d78d51905b9cd Branches: PHP-5.4 master Link:

[PHP-CVS] com php-src: FD_ZERO file descriptors before calling curl_multi_fdset: ext/curl/streams.c

2012-09-28 Thread Pierrick Charron
Commit:936553d666405bc783511979b17d78d51905b9cd Author:Pierrick Charron pierr...@php.net Fri, 28 Sep 2012 15:19:03 -0400 Parents: 4358e90a8f4fc7b3eaf6f42315b5d71b953391c6 Branches: PHP-5.3 PHP-5.4 master Link:

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS

2012-09-28 Thread Pierrick Charron
Commit:f495e9305716a6b2ce448e56cf463169b196d08c Author:Pierrick Charron pierr...@php.net Fri, 28 Sep 2012 15:28:37 -0400 Parents: a2a82201277259a50f064c5b46983cf99e974198 ec3619239025979977e4bbe0998e03eff0afacf4 Branches: PHP-5.4 master Link:

[PHP-CVS] com php-src: Update NEWS: NEWS

2012-09-28 Thread Pierrick Charron
Commit:ec3619239025979977e4bbe0998e03eff0afacf4 Author:Pierrick Charron pierr...@php.net Fri, 28 Sep 2012 15:26:53 -0400 Parents: 936553d666405bc783511979b17d78d51905b9cd Branches: PHP-5.3 PHP-5.4 master Link: