From: Johannes Schlüter <johannes@php.net>
Date: Wed, 27 Jun 2012 21:35:07 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.5RC1~14^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2996eeeed094f66d57d79552d642129d60937c6d;p=php

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
---

2996eeeed094f66d57d79552d642129d60937c6d