granicus.if.org Git

Adam Harvey [Fri, 13 Jun 2014 00:56:10 +0000 (17:56 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Add 308 and 426 to the HTTP response code map in the CLI server.

Adam Harvey [Fri, 13 Jun 2014 00:54:29 +0000 (17:54 -0700)]

Add 308 and 426 to the HTTP response code map in the CLI server.

Implements FR #67429 (CLI server is missing some new HTTP response codes).

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:38:52 +0000 (17:38 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Keep 308-399 HTTP response codes when header('Location:') is called.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 00:35:05 +0000 (17:35 -0700)]

Keep 308-399 HTTP response codes when header('Location:') is called.

Fixes bug #67428 (header('Location: foo') will override a 308-399 response
code).

commit | commitdiff | tree

Adam Harvey [Wed, 11 Jun 2014 21:42:26 +0000 (21:42 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS entry for "Fix potential segfault in dns_get_record()"

commit | commitdiff | tree

Sara Golemon [Wed, 11 Jun 2014 21:20:36 +0000 (14:20 -0700)]

NEWS entry for "Fix potential segfault in dns_get_record()"

commit | commitdiff | tree

Sara Golemon [Wed, 11 Jun 2014 21:22:59 +0000 (14:22 -0700)]

NEWS entry for Fix potential segfault in dns_get_record(

commit | commitdiff | tree

Sara Golemon [Wed, 11 Jun 2014 20:37:40 +0000 (13:37 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix potential segfault in dns_get_record()

commit | commitdiff | tree

Sara Golemon [Tue, 10 Jun 2014 18:18:02 +0000 (11:18 -0700)]

Fix potential segfault in dns_get_record()

If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.

commit | commitdiff | tree

Julien Pauli [Wed, 11 Jun 2014 08:21:26 +0000 (10:21 +0200)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:23:37 +0000 (23:23 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:19:21 +0000 (23:19 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:17:30 +0000 (23:17 -0700)]

Fix bug #66127 (Segmentation fault with ArrayObject unset)

commit | commitdiff | tree

Stanislav Malyshev [Wed, 11 Jun 2014 06:03:40 +0000 (23:03 -0700)]

commit | commitdiff | tree

Xinchen Hui [Tue, 10 Jun 2014 13:56:30 +0000 (21:56 +0800)]

Remove unused included file

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:35:57 +0000 (14:35 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:35:23 +0000 (14:35 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:35:14 +0000 (14:35 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:33:37 +0000 (14:33 +0200)]

Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec

Upstream:
https://github.com/file/file/commit/93e063ee374b6a75729df9e7201fb511e47e259d

Adapted for C standard.

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:24:00 +0000 (14:24 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:23:37 +0000 (14:23 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:23:31 +0000 (14:23 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:22:04 +0000 (14:22 +0200)]

Bug #67412 fileinfo: cdf_count_chain insufficient boundary check

Upstream:
https://github.com/file/file/commit/40bade80cbe2af1d0b2cd0420cebd5d5905a2382

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:16:32 +0000 (14:16 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:16:07 +0000 (14:16 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:16:00 +0000 (14:16 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:13:14 +0000 (14:13 +0200)]

Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check

Upstream:
https://github.com/file/file/commit/36fadd29849b8087af9f4586f89dbf74ea45be67

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:04:52 +0000 (14:04 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:04:36 +0000 (14:04 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:04:27 +0000 (14:04 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 12:02:36 +0000 (14:02 +0200)]

Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size

Upstream
https://github.com/file/file/commit/27a14bc7ba285a0a5ebfdb55e54001aa11932b08

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 08:32:26 +0000 (10:32 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed bug #67406 built-in web-server segfaults on startup

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 08:32:15 +0000 (10:32 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 08:31:17 +0000 (10:31 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 10 Jun 2014 08:28:34 +0000 (10:28 +0200)]

Fixed bug #67406 built-in web-server segfaults on startup

Reproduce on aarch64.

From select man page:
"select() may update the timeout argument to indicate how much time was left."
So "const" is not ok.

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 06:09:37 +0000 (23:09 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]

Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]

Fixed bug #67399 (putenv with empty variable may lead to crash)

commit | commitdiff | tree

Matteo Beccati [Mon, 9 Jun 2014 05:07:07 +0000 (07:07 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191

commit | commitdiff | tree

Matteo Beccati [Wed, 4 Jun 2014 11:26:24 +0000 (13:26 +0200)]

Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191

DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:44:49 +0000 (19:44 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add news
Bug 49898 __getCookies() method implementation

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:38:07 +0000 (19:38 -0700)]

commit | commitdiff | tree

Boro Sitnikovski [Thu, 26 Sep 2013 00:03:48 +0000 (02:03 +0200)]

Bug 49898
__getCookies() method implementation

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:04:35 +0000 (19:04 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix order

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:04:21 +0000 (19:04 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 02:03:50 +0000 (19:03 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 9 Jun 2014 01:59:55 +0000 (18:59 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug 666222

commit | commitdiff | tree

Levi Morrison [Tue, 13 May 2014 03:53:08 +0000 (21:53 -0600)]

Fix bug 666222

This also adds some smaller, isolated tests related to bug 66622.

commit | commitdiff | tree

Levi Morrison [Tue, 13 May 2014 03:53:08 +0000 (21:53 -0600)]

Fix bug 666222

This also adds some smaller, isolated tests related to bug 66622.

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 22:53:26 +0000 (15:53 -0700)]

Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
Fixed identation on file
Fix align indentation

commit | commitdiff | tree

Jefersson Nathan [Tue, 23 Apr 2013 11:24:15 +0000 (08:24 -0300)]

Fixed identation on file

commit | commitdiff | tree

Jefersson Nathan [Mon, 12 May 2014 16:37:47 +0000 (13:37 -0300)]

Fix align indentation

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 21:18:24 +0000 (14:18 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Added support for parsing ssl certificates using GeneralizedTime format.

commit | commitdiff | tree

Paul Oehler [Tue, 13 May 2014 17:38:25 +0000 (13:38 -0400)]

Added support for parsing ssl certificates using GeneralizedTime format.

fix bug #65698
fix bug #66636

commit | commitdiff | tree

Stanislav Malyshev [Sun, 8 Jun 2014 20:50:41 +0000 (13:50 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Remove superfluous echos.

commit | commitdiff | tree

Jeff Welch [Sun, 8 Jun 2014 08:09:14 +0000 (04:09 -0400)]

Remove superfluous echos.

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:18:29 +0000 (14:18 +0200)]

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:18:17 +0000 (14:18 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fix bug #67390 insecure temporary file use in the configure script

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:17:54 +0000 (14:17 +0200)]

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 12:16:04 +0000 (14:16 +0200)]

Fix bug #67390 insecure temporary file use in the configure script

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:45:41 +0000 (17:45 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
drop exec perm on doc files

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:45:22 +0000 (17:45 +0200)]

drop exec perm on doc files

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:34:09 +0000 (17:34 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test for 5.4/5.5

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 15:33:40 +0000 (17:33 +0200)]

fix test for 5.4/5.5

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 12:00:15 +0000 (14:00 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add test for previous fix

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 12:00:00 +0000 (14:00 +0200)]

add test for previous fix

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:46:13 +0000 (13:46 +0200)]

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:45:57 +0000 (13:45 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fix regression introduce in fix for bug #67118

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:45:25 +0000 (13:45 +0200)]

commit | commitdiff | tree

Remi Collet [Thu, 5 Jun 2014 11:39:46 +0000 (13:39 +0200)]

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: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

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

fix gcov data with some locales (again)

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

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: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

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: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: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: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: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: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

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: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