delta/php-git.git, branch php-5.5.7 git.php.net: repository/php-src.git 5.5.7 2013-12-10T23:31:06+00:00 Julien Pauli jpauli@php.net 2013-12-10T23:31:06+00:00 6daaf1103b9ea36ecf04c5cffee9e8287fdf39c7 






Merge branch 'PHP-5.4' into PHP-5.5
2013-12-10T23:03:32+00:00

Stanislav Malyshev
stas@php.net

2013-12-10T19:35:26+00:00

073d24bb50eeab6b592d044c71e530afac0a474a

* PHP-5.4:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse





* PHP-5.4:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse







5.5.7RC1
2013-11-27T08:22:41+00:00

Julien Pauli
jpauli@php.net

2013-11-27T08:22:41+00:00

bdb901b64a5d6ea6842dfb58d215af021668ef1b












Merge branch 'PHP-5.4' into PHP-5.5
2013-11-27T08:14:42+00:00

Stanislav Malyshev
stas@php.net

2013-11-27T08:14:42+00:00

5cd8ff9885e041e8bb31bd86f44183ed2aeecfde

* PHP-5.4:
  5.4.24-dev now

Conflicts:
	configure.in
	main/php_version.h





* PHP-5.4:
  5.4.24-dev now

Conflicts:
	configure.in
	main/php_version.h







5.4.24-dev now
2013-11-27T08:13:45+00:00

Stanislav Malyshev
stas@php.net

2013-11-27T08:13:45+00:00

63f3ff7b5f89f50eb9df76c3d0860c04cc6e0f66












Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-11-26T18:10:30+00:00

Andrey Hristov
andrey@php.net

2013-11-26T18:10:30+00:00

0fc90b100dab0f480153e5166d31488b42c808f8












Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26T17:57:32+00:00

Dmitry Stogov
dmitry@zend.com

2013-11-26T17:57:32+00:00

de658171360cc480105eaf932f94c15b24687a83












Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-11-26T17:44:54+00:00

Dmitry Stogov
dmitry@zend.com

2013-11-26T17:44:54+00:00

2381b817aa850f08e67e338ec4a430b01d935e88

* 'PHP-5.5' of git.php.net:php-src:
  Fixed a wrong test





* 'PHP-5.5' of git.php.net:php-src:
  Fixed a wrong test







Merge branch 'PHP-5.4' into PHP-5.5
2013-11-26T17:15:43+00:00

Andrey Hristov
andrey@php.net

2013-11-26T17:15:43+00:00

9a6b72a05ad6be151e5952e9a5fa6e645fb17a5f












merge fix
2013-11-26T17:15:30+00:00

Andrey Hristov
andrey@php.net

2013-11-26T17:15:30+00:00

5a3886f15c010584eecd0ff21eeca72359539fea