delta/php-git.git, branch php-5.5.13 git.php.net: repository/php-src.git Merge branch 'PHP-5.4' into PHP-5.5 2014-05-28T09:06:28+00:00 Stanislav Malyshev stas@php.net 2014-05-27T01:03:01+00:00 c48169cc31c6b263a4942295fa15f141ecf28cd5 * PHP-5.4: Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation) Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS 
* PHP-5.4:
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
Updated NEWS to reflect imported commits 2014-05-28T08:37:29+00:00 Julien Pauli jpauli@php.net 2014-05-28T08:37:29+00:00 432c063b3e8c47ffe3d8188b0244a1020e71350c 






Merge branch 'PHP-5.4' into PHP-5.5
2014-05-28T08:03:24+00:00

Anatol Belski
ab@php.net

2014-05-27T20:38:02+00:00

cddf2c5dcd5ee23bd175826889d25de52c97b119

* PHP-5.4:
  updated libmagic.patch for 5.4+

Conflicts:
	ext/fileinfo/libmagic.patch





* PHP-5.4:
  updated libmagic.patch for 5.4+

Conflicts:
	ext/fileinfo/libmagic.patch







Merge branch 'PHP-5.4' into PHP-5.5
2014-05-28T08:00:33+00:00

Stanislav Malyshev
stas@php.net

2014-05-27T19:10:03+00:00

8a904ba8a5bd3b0c3feda1dfed6fd3b3072e5af6

* PHP-5.4:
  update NEWS
  Fix bug #67249: printf out-of-bounds read





* PHP-5.4:
  update NEWS
  Fix bug #67249: printf out-of-bounds read







Prepare 5.5.13 final
2014-05-27T12:17:53+00:00

Julien Pauli
jpauli@php.net

2014-05-27T12:17:53+00:00

3ef354e4cf225e171333b27346f344982103ca94












Prepare for 5.5.13RC1
2014-05-14T08:17:52+00:00

Julien Pauli
jpauli@php.net

2014-05-14T08:17:52+00:00

0c24fdb4640578c038f34216a1e807518ebec130












Merge branch 'PHP-5.4' into PHP-5.5
2014-05-14T05:21:50+00:00

Stanislav Malyshev
stas@php.net

2014-05-14T05:21:50+00:00

b17efe82ff8f0b3c4fd80fc693c914a436e1ebb6

* PHP-5.4:
  5.4.30 next

Conflicts:
	configure.in
	main/php_version.h





* PHP-5.4:
  5.4.30 next

Conflicts:
	configure.in
	main/php_version.h







5.4.30 next
2014-05-14T05:20:15+00:00

Stanislav Malyshev
stas@php.net

2014-05-14T05:20:15+00:00

b1c944dfd2889e3a3517c404812d20abe5ce92e6












enable email notifications
2014-05-14T00:14:06+00:00

Stanislav Malyshev
stas@php.net

2014-05-14T00:14:06+00:00

6b6a58c9043e22576832c9532e74ab6a835871e0

[skip ci]





[skip ci]







Merge branch 'PHP-5.4' into PHP-5.5
2014-05-14T00:08:06+00:00

Stanislav Malyshev
stas@php.net

2014-05-14T00:08:06+00:00

de95dc7297bb882227497919eb9e47e5a10f5a95

* PHP-5.4:
  update NEWS





* PHP-5.4:
  update NEWS