Jerome Loyet 1fa8ecd082 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 ... * 'PHP-5.4' of git.php.net:php-src: (27 commits) Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant) sort NEWS fix bug #55042 - erealloc without updating pointer Fix bug #62186 readline fails to compile fix unchecked emalloc (cherry picked from commit 158d8a6b08) fix test fix test Typofix in comment in proc_open.c fix CVE-2012-2143 updated the libmagic patch after Felipes regex fix Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt Bug #62177 deactivate the linux test version on win Fix bug #62177 Test Bug - finfo_file_regex.phpt Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt fix unchecked emalloc add CVE add bug 62146 add bug #62082 sync with HEAD sync with HEAD ...		2012-06-01 11:30:49 +02:00
..
aolserver	- Year++	2012-01-01 13:15:04 +00:00
apache	- Year++	2012-01-01 13:15:04 +00:00
apache2filter	Fixed bug #61172 (Add Apache 2.4 support)	2012-03-02 00:07:41 +00:00
apache2handler	Fixed bug #61172 (Add Apache 2.4 support)	2012-03-02 00:07:41 +00:00
apache_hooks	- Year++	2012-01-01 13:15:04 +00:00
caudium	- Year++	2012-01-01 13:15:04 +00:00
cgi	Fix broken apache_request_headers test	2012-05-23 17:38:23 -07:00
cli	Merge branch 'PHP-5.3' into PHP-5.4	2012-05-29 12:19:20 +02:00
continuity	Merge branch 'PHP-5.3' into PHP-5.4	2012-03-20 17:58:58 +01:00
embed	- Year++	2012-01-01 13:15:04 +00:00
fpm	- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))	2012-06-01 11:23:01 +02:00
isapi	- Year++	2012-01-01 13:15:04 +00:00
litespeed	fixed a crash in cli mode when apache_request_headers() is called	2011-12-31 18:15:22 +00:00
milter	- Year++	2012-01-01 13:15:04 +00:00
nsapi	Merge branch 'PHP-5.3' into PHP-5.4	2012-03-20 17:58:58 +01:00
phttpd	- Year++	2012-01-01 13:15:04 +00:00
pi3web	- Year++	2012-01-01 13:15:04 +00:00
roxen	- Year++	2012-01-01 13:15:04 +00:00
tests	- Rewrite scanner to be based on re2c instead of flex	2008-03-16 21:06:55 +00:00
thttpd	- Year++	2012-01-01 13:15:04 +00:00
tux	- Year++	2012-01-01 13:15:04 +00:00
webjames	- Year++	2012-01-01 13:15:04 +00:00