delta/php-git.git, branch php-5.5.11 git.php.net: repository/php-src.git 5.5.11 final 2014-04-01T12:32:03+00:00 Julien Pauli jpauli@php.net 2014-04-01T12:32:03+00:00 8f155eae867aacd79bec46391277100189d95a3a 






Fixed bug #66946 extensive backtracking in awk rule regular expression
2014-04-01T10:53:54+00:00

Remi Collet
remi@php.net

2014-03-25T09:58:50+00:00

c11d5ae290eb13eb04a12569431f7a44e05a385c

CVE-2013-7345

Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c

Add the magicdata.patch to track patches applied to upstream data file.





CVE-2013-7345

Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c

Add the magicdata.patch to track patches applied to upstream data file.







Fixed bug #66946 extensive backtracking in awk rule regular expression
2014-04-01T10:53:31+00:00

Remi Collet
remi@php.net

2014-03-25T10:00:33+00:00

080d463a76a875745fa47892ed2e3d675ae4719d

CVE-2013-7345

Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c

Add the magicdata.patch to track patches applied to upstream data file.





CVE-2013-7345

Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c

Add the magicdata.patch to track patches applied to upstream data file.







5.5.11RC1
2014-03-19T10:17:08+00:00

Julien Pauli
jpauli@php.net

2014-03-19T10:17:08+00:00

079548829fbeb3a082ebb8885f65dff74e979792












Merge branch 'PHP-5.4' into PHP-5.5
2014-03-19T06:24:09+00:00

Stanislav Malyshev
stas@php.net

2014-03-19T06:24:09+00:00

1ff28cd0ec954fc3ab69c239a945a99d4f09c5b1

* PHP-5.4:
  prep for 5.4.27 rc1

Conflicts:
	configure.in
	main/php_version.h





* PHP-5.4:
  prep for 5.4.27 rc1

Conflicts:
	configure.in
	main/php_version.h







prep for 5.4.27 rc1
2014-03-19T06:19:09+00:00

Stanislav Malyshev
stas@php.net

2014-03-19T06:14:18+00:00

9b88bc494e5e749039bd0166723b6b0a35de5a3e












Merge branch 'PHP-5.4' into PHP-5.5
2014-03-18T14:48:56+00:00

Derick Rethans
github@derickrethans.nl

2014-03-18T14:48:56+00:00

2dfb8fbdf4f73f7a1f7f3abf86aff0425637bc0a












- Updated to version 2014.1 (2014a)
2014-03-18T14:48:55+00:00

Derick Rethans
github@derickrethans.nl

2014-03-18T14:48:55+00:00

b30304fb78a9720b02e2b2f7cc1564ac1445a64b












Add a test
2014-03-18T13:42:38+00:00

Andrey Hristov
andrey@php.net

2014-03-18T13:42:38+00:00

2b811a5aec81595a9f3c704e3a5b813636ede1b4












Merge branch 'PHP-5.4' into PHP-5.5
2014-03-18T07:57:30+00:00

Mateusz Kocielski
shm@php.net

2014-03-18T07:57:30+00:00

156cc39e21cb5badbad11d42b5aa37e7b917f2a5

* PHP-5.4:
  Fixed off-by-one in php_url_parse_ex





* PHP-5.4:
  Fixed off-by-one in php_url_parse_ex