granicus.if.org Git

Fix regression introduce in fix for bug #67118

The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6

This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
which is check by DATE_CHECK_INITIALIZED by later method call

Will restore consistency with other date classes in master.

commit | commitdiff | tree

Stanislav Malyshev [Wed, 4 Jun 2014 08:11:07 +0000 (01:11 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  update NEWS
  fix gcov data with some locales (again)

commit | commitdiff | tree

Stanislav Malyshev [Wed, 4 Jun 2014 08:10:45 +0000 (01:10 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 4 Jun 2014 08:10:12 +0000 (01:10 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Wed, 4 Jun 2014 08:09:37 +0000 (01:09 -0700)]

commit | commitdiff | tree

Bob Weinand [Wed, 4 Jun 2014 00:18:39 +0000 (02:18 +0200)]

Merge sapi/phpdbg into PHP-5.6

commit | commitdiff | tree

Bob Weinand [Wed, 4 Jun 2014 00:15:50 +0000 (02:15 +0200)]

commit | commitdiff | tree

Bob Weinand [Wed, 4 Jun 2014 00:15:34 +0000 (02:15 +0200)]

Fix possible segfault depending on memory location...

commit | commitdiff | tree

Nuno Lopes [Tue, 3 Jun 2014 21:22:16 +0000 (17:22 -0400)]

fix gcov data with some locales (again)

commit | commitdiff | tree

Nuno Lopes [Tue, 3 Jun 2014 21:21:45 +0000 (17:21 -0400)]

fix gcov data with some locales (again)

commit | commitdiff | tree

Bob Weinand [Tue, 3 Jun 2014 21:18:24 +0000 (21:18 +0000)]

commit | commitdiff | tree

Bob Weinand [Tue, 3 Jun 2014 21:15:02 +0000 (21:15 +0000)]

Merge sapi/phpdbg into PHP-5.6

commit | commitdiff | tree

Bob Weinand [Tue, 3 Jun 2014 21:00:45 +0000 (21:00 +0000)]

Fixed startup segfault in non-debug builds
Fixes issue #87

commit | commitdiff | tree

Anatol Belski [Tue, 3 Jun 2014 18:51:51 +0000 (20:51 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed regression introduced by patch for bug #67072

commit | commitdiff | tree

Anatol Belski [Tue, 3 Jun 2014 18:51:18 +0000 (20:51 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed regression introduced by patch for bug #67072

commit | commitdiff | tree

Anatol Belski [Tue, 3 Jun 2014 18:43:58 +0000 (20:43 +0200)]

Fixed regression introduced by patch for bug #67072

This applies to 5.4 and 5.5 only as a legacy fix.

commit | commitdiff | tree

Anatol Belski [Tue, 3 Jun 2014 09:37:20 +0000 (11:37 +0200)]

Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files

commit | commitdiff | tree

Remi Collet [Tue, 3 Jun 2014 09:28:43 +0000 (11:28 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
(re)add cve number in NEWS, from 5.4.29

commit | commitdiff | tree

Remi Collet [Tue, 3 Jun 2014 09:28:21 +0000 (11:28 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
(re)add cve number in NEWS, from 5.4.29

commit | commitdiff | tree

Remi Collet [Tue, 3 Jun 2014 09:28:07 +0000 (11:28 +0200)]

(re)add cve number in NEWS, from 5.4.29

commit | commitdiff | tree

Remi Collet [Tue, 3 Jun 2014 09:09:52 +0000 (11:09 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 3 Jun 2014 09:09:29 +0000 (11:09 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check

commit | commitdiff | tree

Remi Collet [Tue, 3 Jun 2014 09:09:18 +0000 (11:09 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 3 Jun 2014 09:09:04 +0000 (11:09 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check

commit | commitdiff | tree

Remi Collet [Tue, 3 Jun 2014 09:08:46 +0000 (11:08 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 3 Jun 2014 09:05:00 +0000 (11:05 +0200)]

Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check

Upstream fix https://github.com/file/file/commit/6d209c1c489457397a5763bca4b28e43aac90391.patch
Only revelant part applied

commit | commitdiff | tree

Ferenc Kovacs [Tue, 3 Jun 2014 08:27:42 +0000 (10:27 +0200)]

add NEWS block for 5.6.0RC1

commit | commitdiff | tree

Xinchen Hui [Sun, 1 Jun 2014 11:42:39 +0000 (19:42 +0800)]

commit | commitdiff | tree

Xinchen Hui [Sun, 1 Jun 2014 11:42:20 +0000 (19:42 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Sun, 1 Jun 2014 11:42:01 +0000 (19:42 +0800)]

commit | commitdiff | tree

Xinchen Hui [Sun, 1 Jun 2014 11:41:35 +0000 (19:41 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Sun, 1 Jun 2014 11:41:01 +0000 (19:41 +0800)]

Fixed bug #67359 (Segfault in recursiveDirectoryIterator)

commit | commitdiff | tree

Adam Harvey [Thu, 29 May 2014 17:56:32 +0000 (17:56 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS

commit | commitdiff | tree

Adam Harvey [Thu, 29 May 2014 17:53:28 +0000 (17:53 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Check for zero-length keys in spl_array_skip_protected and don't skip them.

commit | commitdiff | tree

Adam Harvey [Thu, 29 May 2014 17:49:32 +0000 (17:49 +0000)]

Check for zero-length keys in spl_array_skip_protected and don't skip them.

Fixes bug #67360 (Missing element after ArrayObject::getIterator).

commit | commitdiff | tree

Julien Pauli [Wed, 28 May 2014 08:59:57 +0000 (10:59 +0200)]

commit | commitdiff | tree

Anatol Belski [Tue, 27 May 2014 20:39:54 +0000 (22:39 +0200)]

updated libmagic.patch for 5.6+

commit | commitdiff | tree

Anatol Belski [Tue, 27 May 2014 20:38:30 +0000 (22:38 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated libmagic.patch for 5.4+

commit | commitdiff | tree

Anatol Belski [Tue, 27 May 2014 20:38:02 +0000 (22:38 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated libmagic.patch for 5.4+

Conflicts:
ext/fileinfo/libmagic.patch

commit | commitdiff | tree

Anatol Belski [Tue, 27 May 2014 20:36:12 +0000 (22:36 +0200)]

updated libmagic.patch for 5.4+

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 19:11:07 +0000 (12:11 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
  5.5.13 release date

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 19:10:03 +0000 (12:10 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
update NEWS
Fix bug #67249: printf out-of-bounds read

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 18:26:24 +0000 (11:26 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 12 May 2014 01:44:14 +0000 (18:44 -0700)]

Fix bug #67249: printf out-of-bounds read

commit | commitdiff | tree

Julien Pauli [Tue, 27 May 2014 12:21:16 +0000 (14:21 +0200)]

commit | commitdiff | tree

Matteo Beccati [Tue, 27 May 2014 10:04:26 +0000 (12:04 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Escape non-printable characters in the junit XML output

commit | commitdiff | tree

Matteo Beccati [Tue, 27 May 2014 10:04:17 +0000 (12:04 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Escape non-printable characters in the junit XML output

commit | commitdiff | tree

Matteo Beccati [Tue, 27 May 2014 09:54:34 +0000 (11:54 +0200)]

Escape non-printable characters in the junit XML output

XML doesn't allow most of the characters < 0x20 and binary output
breaks XML parsers. Such characters are not allowed as entities
either, so the generated entities are escaped in order to be printed
as text.

commit | commitdiff | tree

Matteo Beccati [Tue, 27 May 2014 09:07:32 +0000 (11:07 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed broken XML junit output due to escaping of CDATA sections

commit | commitdiff | tree

Matteo Beccati [Tue, 27 May 2014 09:07:19 +0000 (11:07 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed broken XML junit output due to escaping of CDATA sections

commit | commitdiff | tree

Matteo Beccati [Tue, 27 May 2014 09:04:48 +0000 (11:04 +0200)]

Fixed broken XML junit output due to escaping of CDATA sections

I've removed CDATA and used htmlspecialchars as the output might not be UTF-8 safe, as pointed out by ircmaxell in 26b37f1792dfaf9b0b30f81e492c8f68b9ece571

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 05:18:08 +0000 (22:18 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix #50444: PDO-ODBC changes for 64-bit

commit | commitdiff | tree

Andrew Kehrig [Mon, 24 Feb 2014 17:01:58 +0000 (12:01 -0500)]

Fix #50444: PDO-ODBC changes for 64-bit

This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 01:11:07 +0000 (18:11 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 01:06:58 +0000 (18:06 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
  fix my last commit with some locales

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 01:05:59 +0000 (18:05 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
backport this piece from 5.6, related to the #66307 fix
Fixed bug #66307 Fileinfo crashes with powerpoint files

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:50:23 +0000 (19:50 +0200)]

backport this piece from 5.6, related to the #66307 fix

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:30:34 +0000 (19:30 +0200)]

Fixed bug #66307 Fileinfo crashes with powerpoint files

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 01:03:01 +0000 (18:03 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 00:50:14 +0000 (17:50 -0700)]

Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)

Upstream patch: https://github.com/file/file/commit/b8acc83781d5a24cc5101e525d15efe0482c280d

commit | commitdiff | tree

Stanislav Malyshev [Tue, 27 May 2014 00:42:18 +0000 (17:42 -0700)]

Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS

Upstream fix: https://github.com/file/file/commit/f97486ef5dc3e8735440edc4fc8808c63e1a3ef0

commit | commitdiff | tree

Nuno Lopes [Mon, 26 May 2014 19:09:10 +0000 (15:09 -0400)]

fix my last commit with some locales

commit | commitdiff | tree

Nuno Lopes [Mon, 26 May 2014 19:08:00 +0000 (15:08 -0400)]

fix my last commit with some locales

commit | commitdiff | tree

Xinchen Hui [Mon, 26 May 2014 07:40:50 +0000 (15:40 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Mon, 26 May 2014 07:40:26 +0000 (15:40 +0800)]

Update NEWs and add a test

commit | commitdiff | tree

Dmitry Stogov [Mon, 26 May 2014 06:12:10 +0000 (10:12 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed issue #183 (TMP_VAR is not only used once)

commit | commitdiff | tree

Dmitry Stogov [Mon, 26 May 2014 06:10:59 +0000 (10:10 +0400)]

Fixed issue #183 (TMP_VAR is not only used once)

commit | commitdiff | tree

Matteo Beccati [Sat, 24 May 2014 22:08:41 +0000 (00:08 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix broken Junit output with --disable-cgi

commit | commitdiff | tree

Matteo Beccati [Sat, 24 May 2014 22:08:32 +0000 (00:08 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix broken Junit output with --disable-cgi

commit | commitdiff | tree

Matteo Beccati [Sat, 24 May 2014 22:07:52 +0000 (00:07 +0200)]

Fix broken Junit output with --disable-cgi

commit | commitdiff | tree

Xinchen Hui [Sat, 24 May 2014 13:11:13 +0000 (21:11 +0800)]

commit | commitdiff | tree

Matteo Beccati [Sat, 24 May 2014 06:06:53 +0000 (08:06 +0200)]

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.

commit | commitdiff | tree

Adam Harvey [Fri, 23 May 2014 15:23:15 +0000 (15:23 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Further test fixes for the fdb2709 breakage.
Fix broken test caused by fdb2709.

commit | commitdiff | tree

Adam Harvey [Fri, 23 May 2014 15:22:26 +0000 (15:22 +0000)]

Further test fixes for the fdb2709 breakage.

commit | commitdiff | tree

Adam Harvey [Fri, 23 May 2014 15:14:00 +0000 (15:14 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix broken test caused by fdb2709.

Conflicts:
ext/intl/tests/dateformat_format.phpt

commit | commitdiff | tree

Adam Harvey [Fri, 23 May 2014 15:07:19 +0000 (15:07 +0000)]

Fix broken test caused by fdb2709.

commit | commitdiff | tree

Adam Harvey [Thu, 22 May 2014 22:37:57 +0000 (22:37 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix run-tests.php with Valgrind >= 3.10.0.

commit | commitdiff | tree

Adam Harvey [Thu, 22 May 2014 22:37:47 +0000 (22:37 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix run-tests.php with Valgrind >= 3.10.0.

Conflicts:
run-tests.php

commit | commitdiff | tree

Adam Harvey [Thu, 22 May 2014 22:36:55 +0000 (22:36 +0000)]

Fix run-tests.php with Valgrind >= 3.10.0.

The version test that we had in run-tests.php assumed that the major and minor
version numbers were always single digits. This removes that assumption and
also uses version_compare() for the comparison instead of naively converting it
to an integer.

commit | commitdiff | tree

Adam Harvey [Wed, 21 May 2014 20:05:08 +0000 (15:05 -0500)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Add microseconds to the serialised form of DateTime objects.

commit | commitdiff | tree

Adam Harvey [Wed, 21 May 2014 20:03:24 +0000 (15:03 -0500)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Add microseconds to the serialised form of DateTime objects.