diff options
| author | Christopher Jones <sixd@php.net> | 2012-09-26 16:31:18 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-09-26 16:31:18 -0700 |
| commit | f0c65bc0e3bb4565101a9dadb8fb01ef2a760d49 (patch) | |
| tree | 554d82a87a9682c4c23af07824b95d29931da862 /ext/mysql/php_mysql.c | |
| parent | 2141c502ae41c78710f334b36f1c986c1cb6e005 (diff) | |
| parent | 8cdd6bc1e7dedd4733374b62feb09b88c5ca02db (diff) | |
| download | php-git-f0c65bc0e3bb4565101a9dadb8fb01ef2a760d49.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Correct the test summary
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Avoid calling select if maxfd returned by curl_multi_fdset is -1
Fixing NEWS file
Fixed bug #63111 (is_callable() lies for abstract static method)
updated lib versions
Fix folding
fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions