1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Commit Graph

336 Commits

Author SHA1 Message Date
Xinchen Hui aba76f09fa Revert accidented committed php_version.h 2013-12-27 14:10:55 +08:00
Xinchen Hui 2938329ce1 Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
And also fixed the bug: arguments are altered after some calls
2013-12-27 14:04:59 +08:00
Julien Pauli e9c6a1cfd2 5.5.8-dev now 2013-11-27 09:34:40 +01:00
Julien Pauli 1984919ddc 5.5.7 now 2013-11-12 18:20:09 +01:00
Adam Harvey 70c3a722e2 Increment version number, since this will be 5.5.6. 2013-10-23 12:36:27 -07:00
Julien Pauli 0e10f26e27 5.5.5 now 2013-09-04 11:22:23 +02:00
Stanislav Malyshev 53d9643431 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  bump version
  Update NEWS

Conflicts:
	configure.in
	main/php_version.h
2013-08-19 23:23:21 -07:00
Stanislav Malyshev d487f5e9ac bump version 2013-08-19 23:19:51 -07:00
Stanislav Malyshev 2c23004a1e next is 5.5.2 2013-07-21 21:16:39 -07:00
Stanislav Malyshev b9e3f737d9 5.4.19 is next 2013-07-17 13:51:15 -07:00
David Soria Parra 83fc53acb9 Bump version 2013-06-19 22:11:52 +02:00
Stanislav Malyshev dda3f404ec 5.4.18 next 2013-06-18 22:58:11 -07:00
Stanislav Malyshev c53058763a 5.4.17 is next 2013-05-21 23:36:28 -07:00
Stanislav Malyshev a58a279d7b 5.4.16-dev 2013-04-24 10:15:35 -07:00
Stanislav Malyshev f982aaafa7 will be 5.4.15 2013-03-27 14:00:12 -07:00
Stanislav Malyshev 31a6f8b7f4 5.4.13 branched, now it's 5.4.14 2013-02-26 22:25:33 -08:00
Stanislav Malyshev 09b6e33b40 branched 5.4.12 2013-01-29 12:33:45 -08:00
Stanislav Malyshev 5894aa0950 5.4.12-dev 2013-01-03 17:25:56 -08:00
Stanislav Malyshev c3b6f6feed 5.4.11-dev 2012-12-04 21:30:50 -08:00
Stanislav Malyshev 7262bf67a2 5.4.10-dev 2012-11-24 16:24:05 -08:00
Stanislav Malyshev 9e3396b85d 5.4.9-dev 2012-10-03 18:36:17 -07:00
Stanislav Malyshev 55b3386a81 update version id too 2012-08-28 22:10:34 -07:00
Stanislav Malyshev 78cffe0c4d 5.4.7 branched 2012-08-28 22:07:08 -07:00
Adam Harvey 14847af41d Update version numbers to 5.4.7-dev. 2012-08-17 23:07:54 +08:00
Nikita Popov d372b33c9b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt
2012-06-27 12:28:55 +02:00
Johannes Schlüter 72a9b595ca PHP 5.3.15-dev 2012-05-16 16:49:35 +02:00
Stanislav Malyshev be8b1c74cf to 5.4.5-dev 2012-05-15 22:46:49 -07:00
Christopher Jones d9788dd73f Bump to 5.4.4-dev 2012-05-14 12:43:36 -07:00
Johannes Schlüter e120a0c7f3 This will be PHP 5.3.14 2012-05-08 11:28:15 +02:00
Christopher Jones 31ab04ee25 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
2012-05-03 12:22:39 -07:00
Christopher Jones 0956c00af9 Bump to next version
Bump PHP version number
2012-05-03 12:03:49 -07:00
Christopher Jones 701332ce30 Update to 5.4.2-dev
After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.
2012-04-19 10:45:21 -07:00
Johannes Schlüter fb124764de This will be PHP 5.3.12 2012-03-29 11:22:44 +02:00
Stanislav Malyshev 23c62eb080 back to dev 2012-02-29 07:24:27 +00:00
Stanislav Malyshev bfd72d0386 5.4.0 2012-02-29 07:22:43 +00:00
Stanislav Malyshev 6561d47e55 back to dev 2012-02-16 07:47:02 +00:00
Stanislav Malyshev c1d415f798 5.4.0rc8 2012-02-16 07:45:08 +00:00
Stanislav Malyshev 9e9683b6b0 back to dev 2012-02-02 17:29:00 +00:00
Stanislav Malyshev 29e2f050f5 retag 5.4.0 rc7 2012-02-02 17:28:03 +00:00
Johannes Schlüter 1e16c821aa This will be PHP 5.3.11, 5.3.10 will be released from other branch 2012-02-02 17:25:23 +00:00
Stanislav Malyshev 3a95557cc3 back to dev 2012-02-02 06:09:50 +00:00
Stanislav Malyshev 9e9d6d3aaf 5.4.0 rc7 2012-02-02 06:08:29 +00:00
Stanislav Malyshev cbdfc93154 back to dev 2012-01-19 06:29:15 +00:00
Stanislav Malyshev 44c773120e 5.4.0RC6 2012-01-19 06:27:56 +00:00
Johannes Schlüter 93ee94adb6 We should be back to -dev ... 2012-01-15 19:51:36 +00:00
Johannes Schlüter c7904620d1 - Fix version number as used in Windows builds for 5.3.9 2012-01-10 13:27:39 +00:00
Johannes Schlüter 3eb4b024ee PHP 5.3.9 2012-01-10 11:21:57 +00:00
Stanislav Malyshev 64a9019171 back to dev 2012-01-05 07:24:26 +00:00
Stanislav Malyshev 6cb0b66053 5.4.0rc5 2012-01-05 07:22:29 +00:00
Johannes Schlüter af07705f97 Back to -dev 2011-12-22 12:36:40 +00:00