[PHP-CVS] com php-src: Fix bug #63173: Crash when invoking invalid array callback: Zend/tests/bug63173.phpt Zend/zend_vm_def.h Zend/zend_vm_execute.h

Commit:592b232e834ed2698fa97ad4dd58e5ab21f257be Author:Nikita Popov ni...@php.net Thu, 27 Sep 2012 18:40:00 +0200 Parents: 8cdd6bc1e7dedd4733374b62feb09b88c5ca02db Branches: PHP-5.4 master Link:

[PHP-CVS] com php-src: Merge branch 'PHP-5.4': Zend/zend_vm_def.h Zend/zend_vm_execute.h

Commit:aaabac2473e53327bf0587876799ca4aed6c9c19 Author:Nikita Popov ni...@php.net Thu, 27 Sep 2012 18:46:27 +0200 Parents: da96aa848fc4845399d4d7a7c396fa31ffb9ffba 592b232e834ed2698fa97ad4dd58e5ab21f257be Branches: master Link:

[PHP-CVS] com php-src: fix unix/win dir separators: ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt

Commit:6a50a8640c562a41d90c7ab46affa767b97d2621 Author:Anatoliy Belsky a...@php.net Thu, 27 Sep 2012 19:52:34 +0200 Parents: 592b232e834ed2698fa97ad4dd58e5ab21f257be Branches: master Link:

[PHP-CVS] com php-src: - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup): NEWS sapi/fpm/fpm/fpm.c sapi/fpm/fpm/fpm.h sapi/fpm/fpm/fpm_main.c

Commit:b5eb1456aa17e83b7b734dfc2316d632c9adcc6c Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 00:05:48 +0200 Parents: 0bffdd723fb1acbc8b1ef62768fa2f33c2d02bbc Branches: PHP-5.4 master Link:

[PHP-CVS] com php-src: - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup): NEWS sapi/fpm/fpm/fpm.c sapi/fpm/fpm/fpm.h sapi/fpm/fpm/fpm_main.c

Commit:75c63c5503b1c6b72e5e1daf5b4bfd02c68a4b79 Author:Jerome Loyet f...@php.net Thu, 27 Sep 2012 23:54:35 +0200 Parents: a9db9efa0c98c5fa344432fc7b939e895296256e Branches: PHP-5.3 Link:

[PHP-CVS] com php-src: - fix merge (fucking git merging system ... :( ): sapi/fpm/config.m4

Commit:c8b7ea0f57819e675fa2e8c1dfebabb8b3f62ca6 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 00:55:06 +0200 Parents: 9e4c0b8142af8d2ca4999277a741534f020a488d Branches: master Link:

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

Commit:b2f4e686f0947217ee70953ecbafa84f173770c2 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 00:39:29 +0200 Parents: b5eb1456aa17e83b7b734dfc2316d632c9adcc6c 851a04bb7b680954249e825ea3fef420f7d66bb7 Branches: PHP-5.4 master Link:

[PHP-CVS] com php-src: - add missing php-fpm.service.in: sapi/fpm/php-fpm.service.in

Commit:2259a8f18b1f25c175c486f54849fcd9e61ecde1 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 00:47:56 +0200 Parents: 851a04bb7b680954249e825ea3fef420f7d66bb7 Branches: PHP-5.3 Link:

[PHP-CVS] com php-src: - Fixed bug #63085 (Systemd integration and daemonize): NEWS sapi/fpm/config.m4 sapi/fpm/fpm/fpm.c sapi/fpm/fpm/fpm.h sapi/fpm/fpm/fpm_conf.c sapi/fpm/fpm/fpm_conf.h sapi/fpm/fp

Commit:851a04bb7b680954249e825ea3fef420f7d66bb7 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 00:33:05 +0200 Parents: 75c63c5503b1c6b72e5e1daf5b4bfd02c68a4b79 Branches: PHP-5.3 PHP-5.4 master Link:

[PHP-CVS] com php-src: - Fixed bug #62947 (Unneccesary warnings on FPM): sapi/fpm/fpm/fpm_unix.c

Commit:9ed421e3d7333bf68c0252000b98400cc6bc0cbf Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 01:09:31 +0200 Parents: c8b7ea0f57819e675fa2e8c1dfebabb8b3f62ca6 Branches: master Link:

[PHP-CVS] com php-src: - Fixed bug #62947 (Unneccesary warnings on FPM): NEWS sapi/fpm/fpm/fpm_unix.c

Commit:e31553c2042f2a5e05d9ad1ba77b888c63e4c36f Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 01:08:08 +0200 Parents: 2259a8f18b1f25c175c486f54849fcd9e61ecde1 Branches: PHP-5.3 Link:

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

Commit:be043ab6d00e9747727aefcb0dde12a40ddb4e8d Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 01:19:01 +0200 Parents: b2f4e686f0947217ee70953ecbafa84f173770c2 72f3457161aaf8c6bd0980aff855beca20d63404 Branches: PHP-5.4 Link:

[PHP-CVS] com php-src: - Fixed bug #62947 (Unneccesary warnings on FPM): NEWS sapi/fpm/fpm/fpm_unix.c

Commit:72f3457161aaf8c6bd0980aff855beca20d63404 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 01:08:48 +0200 Parents: 64a0e7cdc2a90a13dd238068a7ff3d357de284b4 Branches: PHP-5.4 Link:

[PHP-CVS] com php-src: - Fixed bug #63085 (Systemd integration and daemonize): NEWS sapi/fpm/config.m4 sapi/fpm/fpm/fpm.c sapi/fpm/fpm/fpm.h sapi/fpm/fpm/fpm_conf.c sapi/fpm/fpm/fpm_conf.h sapi/fpm/fp

Commit:64a0e7cdc2a90a13dd238068a7ff3d357de284b4 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 00:53:05 +0200 Parents: b5eb1456aa17e83b7b734dfc2316d632c9adcc6c Branches: PHP-5.4 Link:

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

Commit:9ef925b3519e5b1a54b930035f347e4d0f61a210 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 01:25:51 +0200 Parents: be043ab6d00e9747727aefcb0dde12a40ddb4e8d Branches: PHP-5.4 Link:

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

Commit:151b16cf7ff6ddbf2e11932949aaa2ecb0f22724 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 01:24:52 +0200 Parents: e31553c2042f2a5e05d9ad1ba77b888c63e4c36f Branches: PHP-5.3 Link:

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

Commit:68eb608f3c639b2f03304e5794cd99f1074b67c0 Author:Jerome Loyet f...@php.net Fri, 28 Sep 2012 01:26:20 +0200 Parents: 9ed421e3d7333bf68c0252000b98400cc6bc0cbf Branches: master Link:

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

fat: you don't need to push to three branches individually, you should push to the 5.3, then merge them to 5.4 otherwise, we will got unmerged branches: https://github.com/php/php-src/network :) thanks On Fri, Sep 28, 2012 at 7:26 AM, Jérôme Loyet f...@php.net wrote: Commit: