1
0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Commit Graph

373 Commits

Author SHA1 Message Date
Stanislav Malyshev e21f87e957 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix type in fix for #69085
  fix CVE num

Conflicts:
	configure.in
	main/php_version.h
2015-04-14 00:34:02 -07:00
Stanislav Malyshev e10272c628 5.4.41 next 2015-04-14 00:30:58 -07:00
Julien Pauli 8e3e034469 5.5.24RC1 2015-03-31 16:03:52 +02:00
Stanislav Malyshev 4c3b73b6df 5.4.40 next 2015-03-17 22:37:16 -07:00
Julien Pauli 0f334a1265 5.5.24 now 2015-03-05 14:13:39 +01:00
Stanislav Malyshev 24f8a68d0a 5.4.39 next 2015-02-17 07:34:00 +01:00
Julien Pauli b86529f751 5.5.23 now 2015-02-04 16:35:32 +01:00
Stanislav Malyshev 8825311ce1 5.4.38 next 2015-01-20 10:38:33 -08:00
Julien Pauli 3f1d1892c9 5.5.22 now 2015-01-07 10:42:53 +01:00
Stanislav Malyshev 8fe4cc6d28 5.4.37 2014-12-16 11:44:41 -08:00
Julien Pauli 3656349990 5.5.21 now 2014-11-26 11:31:58 +01:00
Stanislav Malyshev 98b22864ff 5.4.36-dev 2014-11-11 16:31:38 -08:00
Julien Pauli 71e200b338 PHP 5.5.20 now 2014-10-28 15:01:53 +01:00
Stanislav Malyshev 4d54c4bdf0 fix NEWS & version 2014-10-22 13:16:29 -07:00
Julien Pauli cfe8a8b968 5.5.19 now 2014-10-01 16:16:05 +02:00
Julien Pauli 9266227402 5.5.18 now 2014-09-03 10:18:51 +02:00
Stanislav Malyshev 5e95b61639 5.4.34 is next 2014-09-02 15:03:04 -07:00
Julien Pauli 05baed522f 5.5.17 now 2014-08-06 10:20:31 +02:00
Stanislav Malyshev 65cf73c931 5.4.33-dev now 2014-08-05 21:24:55 -07:00
Keyur Govande ab6c1d21f9 Undo inadvertent commit of php_version 2014-07-30 02:34:21 +00:00
Keyur Govande 65364fe7d0 Corrected patch for bug #60616
For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
2014-07-30 02:28:31 +00:00
Stanislav Malyshev b93ea59665 5.4.31 2014-07-08 21:26:39 -07:00
Julien Pauli a6e0751079 5.5.15 now 2014-06-11 10:21:26 +02:00
Stanislav Malyshev 979eed5c6b 5.4.31 next 2014-06-10 23:03:40 -07:00
Julien Pauli b4c92f31ad 5.5.14 now 2014-05-14 10:24:32 +02:00
Stanislav Malyshev b1c944dfd2 5.4.30 next 2014-05-13 22:20:15 -07:00
Stanislav Malyshev 1d34d82231 5.4.29 is next 2014-04-15 16:51:38 -07:00
Julien Pauli b8d029435d 5.5.12RC1 setup 2014-04-15 17:57:27 +02:00
Julien Pauli c4145619be 5.5.11RC1 preparation 2014-03-19 10:43:32 +01:00
Stanislav Malyshev 9b88bc494e prep for 5.4.27 rc1 2014-03-18 23:19:09 -07:00
Julien Pauli 0afcbb0ba9 5.5.11-dev next 2014-02-18 16:45:48 +01:00
Stanislav Malyshev c612440e0f 5.4.27 now 2014-02-17 21:19:25 -08:00
Stanislav Malyshev ac6bd1e346 5.4.26 next 2014-01-21 12:13:42 -08:00
Julien Pauli 277895717c 5.5.9-dev now 2014-01-10 10:01:30 +01:00
Stanislav Malyshev 8e5048f9fb 5.4.25 next 2013-12-24 22:22:04 -08:00
Julien Pauli e9c6a1cfd2 5.5.8-dev now 2013-11-27 09:34:40 +01:00
Stanislav Malyshev 63f3ff7b5f 5.4.24-dev now 2013-11-27 00:13:45 -08:00
Julien Pauli 1984919ddc 5.5.7 now 2013-11-12 18:20:09 +01:00
Stanislav Malyshev 4ded6ee971 5.4.23-dev 2013-10-29 18:11:02 -07:00
Adam Harvey 70c3a722e2 Increment version number, since this will be 5.5.6. 2013-10-23 12:36:27 -07:00
Stanislav Malyshev b2f8f35a88 5.4.22-dev now 2013-10-01 22:25:56 -07:00
Julien Pauli 0e10f26e27 5.5.5 now 2013-09-04 11:22:23 +02:00
Stanislav Malyshev 7beef74a82 5.4.21 now 2013-09-03 13:38:15 -07: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