granicus.if.org Git

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 21:11:35 +0000 (00:11 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 20:57:20 +0000 (23:57 +0300)]

Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Tue, 17 Jun 2014 20:56:46 +0000 (23:56 +0300)]

Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:30:44 +0000 (23:30 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:28:36 +0000 (23:28 +0300)]

Update copyright year for re2c generated files

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:27:45 +0000 (23:27 +0300)]

Update copyright year to 2014

commit | commitdiff | tree

Lior Kaplan [Mon, 16 Jun 2014 20:26:50 +0000 (23:26 +0300)]

Update copyright year for re2c files as well

commit | commitdiff | tree

Bob Weinand [Mon, 16 Jun 2014 09:16:33 +0000 (11:16 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Mon, 16 Jun 2014 09:10:50 +0000 (11:10 +0200)]

Fix patch for bug #67436

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 22:41:46 +0000 (00:41 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 22:35:20 +0000 (00:35 +0200)]

Merge branch 'pull-request/695' into PHP-5.4

commit | commitdiff | tree

Levi Morrison [Sun, 15 Jun 2014 22:10:40 +0000 (16:10 -0600)]

Added tests for bug 67436

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 21:54:05 +0000 (23:54 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 21:51:51 +0000 (23:51 +0200)]

Fixed wrong XFAIL test - already fixed

commit | commitdiff | tree

Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]

Fix typo in Bug #67406 NEWS entry

commit | commitdiff | tree

Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]

Fix typo in Bug #67406 NEWS entry

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 20:36:13 +0000 (22:36 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 20:32:47 +0000 (22:32 +0200)]

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 20:24:44 +0000 (22:24 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Bob Weinand [Sun, 15 Jun 2014 20:18:25 +0000 (22:18 +0200)]

commit | commitdiff | tree

Stanislav Malyshev [Sun, 15 Jun 2014 08:06:46 +0000 (01:06 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 15 Jun 2014 08:06:37 +0000 (01:06 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Sun, 15 Jun 2014 07:46:31 +0000 (00:46 -0700)]

commit | commitdiff | tree

Derick Rethans [Fri, 13 Jun 2014 22:26:43 +0000 (23:26 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Fri, 13 Jun 2014 22:26:42 +0000 (23:26 +0100)]

- Updated to version 2014.5 (2014e)

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 01:15:07 +0000 (18:15 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Follow 308 Permanent Redirect responses.

commit | commitdiff | tree

Adam Harvey [Fri, 13 Jun 2014 01:12:53 +0000 (18:12 -0700)]

Follow 308 Permanent Redirect responses.

Fixes bug #67430 (http:// wrapper doesn't follow 308 redirects).

commit | commitdiff | tree

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.

commit | commitdiff | tree

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)]