diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-06-27 23:35:07 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-06-27 23:35:07 +0200 |
| commit | 2996eeeed094f66d57d79552d642129d60937c6d (patch) | |
| tree | c79ac04eddb9ffedf9ec3a2be57886e339f11776 /ext/standard/info.h | |
| parent | d372b33c9b941be9a795bf3705bd22dc5f6092c3 (diff) | |
| parent | b025b9d0cf9921d26fc4dad43cf26390d0a8c5dd (diff) | |
| download | php-git-2996eeeed094f66d57d79552d642129d60937c6d.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix #62432 ReflectionMethod random corrupt memory on high concurrent
Conflicts:
ext/date/php_date.c
ext/fileinfo/fileinfo.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/reflection/php_reflection.c
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/spl/spl_dllist.c
ext/spl/spl_fixedarray.c
ext/spl/spl_heap.c
ext/spl/spl_iterators.c
ext/spl/spl_observer.c
ext/sqlite/sqlite.c
ext/sqlite3/sqlite3.c
ext/tidy/tidy.c
ext/xmlreader/php_xmlreader.c
ext/xmlwriter/php_xmlwriter.c
ext/xsl/php_xsl.c
ext/zip/php_zip.c
Diffstat (limited to 'ext/standard/info.h')
0 files changed, 0 insertions, 0 deletions