granicus.if.org Git

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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.

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:43:39 +0000 (21:43 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  5.5.15 now

Conflicts:
configure.in
main/php_version.h

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:24:50 +0000 (14:24 -0700)]

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:51:53 +0000 (13:51 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
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

Ferenc Kovacs [Wed, 11 Jun 2014 12:43:09 +0000 (14:43 +0200)]

Revert "Add optional second arg to unserialize()"

This reverts commit cfd104582220d578ab1b78a5991065d038e1f931.

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:24:02 +0000 (23:24 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
update NEWS

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:20:07 +0000 (23:20 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

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

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:58:16 +0000 (21:58 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_execute_API.c

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:36:31 +0000 (14:36 +0200)]

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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:22 +0000 (14:24 +0200)]

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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:58 +0000 (14:16 +0200)]

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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:05:34 +0000 (14:05 +0200)]

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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:38:39 +0000 (10:38 +0200)]

fix merge from php 5.5 (already fixed, differently)

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

Ferenc Kovacs [Mon, 9 Jun 2014 13:30:09 +0000 (15:30 +0200)]

enable phpdbg for the travis build, and also run the testsuite for it

commit | commitdiff | tree

Bob Weinand [Mon, 9 Jun 2014 08:06:29 +0000 (10:06 +0200)]

Merge sapi/phpdbg into PHP-5.6

commit | commitdiff | tree

Bob Weinand [Mon, 9 Jun 2014 07:49:21 +0000 (09:49 +0200)]

Finish fixing phpdbg on ZTS build

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #67399 (putenv with empty variable may lead to crash)
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: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:17 +0000 (07:07 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

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

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:47:38 +0000 (19:47 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

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

commit | commitdiff | tree

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

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

Sobak [Sat, 10 May 2014 11:30:54 +0000 (13:30 +0200)]

Removed another cvsclean file

commit | commitdiff | tree

Sobak [Sat, 10 May 2014 11:16:48 +0000 (13:16 +0200)]

Removed cvsclean and svnclean tools

commit | commitdiff | tree

Boro Sitnikovski [Fri, 20 Sep 2013 00:58:11 +0000 (02:58 +0200)]

Bug 64744
Show the type of the non-object for more descriptive errors

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix order
fix order

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 02:03:31 +0000 (19:03 -0700)]

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug 666222
Fix bug 666222

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:54:32 +0000 (15:54 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed identation on file
Fix align indentation

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

Bob Weinand [Sun, 8 Jun 2014 22:38:06 +0000 (00:38 +0200)]

Fix segfault in tests with lexer
There's still a bug in parsing commands

commit | commitdiff | tree

Bob Weinand [Sun, 8 Jun 2014 22:02:10 +0000 (00:02 +0200)]

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:19:25 +0000 (14:19 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

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

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

krakjoe [Sun, 8 Jun 2014 21:16:06 +0000 (22:16 +0100)]

remove phpdbg directory from source tree on travis

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Remove superfluous echos.

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

Bob Weinand [Sun, 8 Jun 2014 20:34:30 +0000 (20:34 +0000)]

Updated parser & leer to be usable with re2c
Fixes some weird temporary compilation errors too

commit | commitdiff | tree

Ferenc Kovacs [Sat, 7 Jun 2014 22:01:01 +0000 (00:01 +0200)]

use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL

commit | commitdiff | tree

Ferenc Kovacs [Sat, 7 Jun 2014 13:27:54 +0000 (15:27 +0200)]

Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL token

commit | commitdiff | tree

Remi Collet [Fri, 6 Jun 2014 15:19:35 +0000 (17:19 +0200)]

move NEWS entry in the right place

commit | commitdiff | tree

Nikita Popov [Fri, 6 Jun 2014 15:09:49 +0000 (17:09 +0200)]

Fix bug #67392: dtrace breaks argument unpack

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom