delta/php-git.git, branch php-5.5.17 git.php.net: repository/php-src.git 5.5.17 2014-09-16T12:52:45+00:00 Julien Pauli jpauli@php.net 2014-09-16T12:52:45+00:00 f89ee8040a8b8d93981c9df85a79592ceac02f1f 






backported 2775dc2b443fc8abc3ae0a659c3a8a800ab90035
2014-09-16T12:30:39+00:00

Remi Collet
remi@php.net

2014-09-15T06:24:10+00:00

e1f52b5af98488442208180cee0d4d6b22eddea3












5.5.17RC1
2014-09-03T08:15:48+00:00

Julien Pauli
jpauli@php.net

2014-09-03T08:15:48+00:00

3e0ab2a6f30875eb5b894ae3f4ff97b43b507cd6












Merge branch 'PHP-5.4' into PHP-5.5
2014-09-03T07:44:59+00:00

Matteo Beccati
mbeccati@php.net

2014-09-03T07:44:59+00:00

72c9b0e12b55433b892b82ff74aeba90840c8cb0

* PHP-5.4:
  Fixed test with freetype >= 2.4.12





* PHP-5.4:
  Fixed test with freetype >= 2.4.12







Fixed test with freetype >= 2.4.12
2014-09-03T07:43:29+00:00

Matteo Beccati
mbeccati@php.net

2014-09-03T07:43:29+00:00

592df890276604c790d02be26b1b3c3710b3b888












Merge branch 'PHP-5.4' into PHP-5.5
2014-09-02T22:03:54+00:00

Stanislav Malyshev
stas@php.net

2014-09-02T22:03:54+00:00

a734acd4398abcbf6130b3d091bcb8a6ce7ec70d

* PHP-5.4:
  5.4.34 is next

Conflicts:
	configure.in
	main/php_version.h





* PHP-5.4:
  5.4.34 is next

Conflicts:
	configure.in
	main/php_version.h







5.4.34 is next
2014-09-02T22:03:04+00:00

Stanislav Malyshev
stas@php.net

2014-09-02T22:03:04+00:00

5e95b61639911f84f0cb16fb0a968f8c246d8a20












Merge branch 'PHP-5.4' into PHP-5.5
2014-09-02T21:18:05+00:00

Stanislav Malyshev
stas@php.net

2014-09-02T21:16:17+00:00

70f92aa97e75a9bfa6a0377f9ef0574efcbe6280

* PHP-5.4:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"





* PHP-5.4:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"







Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02T21:15:39+00:00

Stanislav Malyshev
stas@php.net

2014-09-02T21:15:39+00:00

fe551c089a7d309e3fa08513f1d1e287141cd202

This reverts commit 53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff.
The change breaks tests, so not putting it into 5.4.





This reverts commit 53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff.
The change breaks tests, so not putting it into 5.4.







Merge branch 'PHP-5.4' into PHP-5.5
2014-09-02T19:32:03+00:00

Stanislav Malyshev
stas@php.net

2014-09-02T19:31:29+00:00

af85eff5b6c77681e7e4f9440fa35dbe5c1529ae

* PHP-5.4:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback





* PHP-5.4:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback