diff options
| author | Jerome Loyet <fat@php.net> | 2012-09-28 00:39:29 +0200 |
|---|---|---|
| committer | Jerome Loyet <fat@php.net> | 2012-09-28 00:39:29 +0200 |
| commit | b2f4e686f0947217ee70953ecbafa84f173770c2 (patch) | |
| tree | 241ac3563d06fe314da9fe6e4876ec4d816cc76d /ext/mysqlnd/mysqlnd_auth.c | |
| parent | b5eb1456aa17e83b7b734dfc2316d632c9adcc6c (diff) | |
| parent | 851a04bb7b680954249e825ea3fef420f7d66bb7 (diff) | |
| download | php-git-b2f4e686f0947217ee70953ecbafa84f173770c2.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Fixed bug #63085 (Systemd integration and daemonize)
- Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
Conflicts:
sapi/fpm/config.m4
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
0 files changed, 0 insertions, 0 deletions