]> granicus.if.org Git - php/log
php
8 years agoAdded array parameter support to mb_convert_encoding()
Yasuo Ohgaki [Tue, 6 Sep 2016 09:20:24 +0000 (18:20 +0900)]
Added array parameter support to mb_convert_encoding()

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Tue, 6 Sep 2016 02:57:49 +0000 (19:57 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix bug #72785 - allowed_classes only applies to outermost unserialize()

8 years agoFix bug #72785 - allowed_classes only applies to outermost unserialize()
Stanislav Malyshev [Tue, 6 Sep 2016 02:56:36 +0000 (19:56 -0700)]
Fix bug #72785 - allowed_classes only applies to outermost unserialize()

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Mon, 5 Sep 2016 23:28:59 +0000 (01:28 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Mon, 5 Sep 2016 23:18:22 +0000 (01:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 5 Sep 2016 23:07:15 +0000 (01:07 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #70752: Depacking with wrong password leaves 0 length files
Christoph M. Becker [Mon, 5 Sep 2016 22:28:28 +0000 (00:28 +0200)]
Fix #70752: Depacking with wrong password leaves 0 length files

We should not open the output stream before we have tried to open the
archive entry, as failing the latter could leave an empty file behind.

8 years agoMerge branch 'PHP-7.1'
Andrea Faulds [Mon, 5 Sep 2016 21:13:42 +0000 (22:13 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Mon, 5 Sep 2016 21:13:20 +0000 (22:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoUnbreak FAST_ZPP dead code
Andrea Faulds [Mon, 5 Sep 2016 21:12:26 +0000 (22:12 +0100)]
Unbreak FAST_ZPP dead code

8 years agoMerge branch 'PHP-7.1'
Julien Pauli [Mon, 5 Sep 2016 15:04:31 +0000 (17:04 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Updated NEWS
  Fixes #72590: Opcache restart with kill_all_lockers does not work

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Julien Pauli [Mon, 5 Sep 2016 15:04:15 +0000 (17:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Updated NEWS
  Fixes #72590: Opcache restart with kill_all_lockers does not work

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Mon, 5 Sep 2016 15:03:51 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Updated NEWS
  Fixes #72590: Opcache restart with kill_all_lockers does not work

8 years agoUpdated NEWS
Julien Pauli [Mon, 5 Sep 2016 15:03:29 +0000 (17:03 +0200)]
Updated NEWS

8 years agoFixes #72590: Opcache restart with kill_all_lockers does not work
Keyur [Wed, 13 Jul 2016 02:47:46 +0000 (02:47 +0000)]
Fixes #72590: Opcache restart with kill_all_lockers does not work

ACCEL_LOG_ERROR is special and causes a zend_bailout() and the code
never gets to call kill() in the next line after the logging. Change
the log level to WARNING.

8 years agoFix some sizeof(zend_long) > sizeof(size_t) issues
Nikita Popov [Sun, 4 Sep 2016 21:33:32 +0000 (23:33 +0200)]
Fix some sizeof(zend_long) > sizeof(size_t) issues

Fix a couple of mistakes that are only relevant if
sizeof(zend_long) > sizeof(size_t).

* Fix cast order in string offset check: Negation should happen
  after the (zend_long) cast, otherwise sign extension does not
  occur.
* Use Z_UL in zend_inference.
* Use aligned size for HT_USED_SIZE in zend_persist: The issue is
  that on x86-32 uint64_t is considered to be 4-aligned, so the
  alignment assumption does not hold.

8 years agoImprove getaddrinfo implementation
David Walker [Sat, 3 Sep 2016 18:32:31 +0000 (12:32 -0600)]
Improve getaddrinfo implementation

* Fix some leaks
* Improve some comparisons and casts
* Raise a notice when an unknown hint is provided

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Mon, 5 Sep 2016 12:23:54 +0000 (14:23 +0200)]
Merge branch 'PHP-7.1'

[ci skip]

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 5 Sep 2016 12:22:45 +0000 (14:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

[ci skip]

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Mon, 5 Sep 2016 12:22:29 +0000 (14:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

[ci skip]

8 years agoLimit editorconfig to C code
Nikita Popov [Mon, 5 Sep 2016 12:21:43 +0000 (14:21 +0200)]
Limit editorconfig to C code

PHPT files do not follow this.

[ci skip]

8 years agoUpdate UPGRADING wrt. commit c4fe264b
Christoph M. Becker [Mon, 5 Sep 2016 09:27:46 +0000 (11:27 +0200)]
Update UPGRADING wrt. commit c4fe264b

8 years agoMerge branch 'PHP-7.1'
Julien Pauli [Mon, 5 Sep 2016 08:19:29 +0000 (10:19 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Updated NEWS
  Updated NEWS
  Updated NEWS

8 years agoUpdated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:19:21 +0000 (10:19 +0200)]
Updated NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Julien Pauli [Mon, 5 Sep 2016 08:18:57 +0000 (10:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Updated NEWS
  Updated NEWS

8 years agoUpdated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:18:39 +0000 (10:18 +0200)]
Updated NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Mon, 5 Sep 2016 08:18:08 +0000 (10:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Updated NEWS

8 years agoUpdated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:17:56 +0000 (10:17 +0200)]
Updated NEWS

8 years agoMerge branch 'PHP-7.1'
Julien Pauli [Mon, 5 Sep 2016 08:13:31 +0000 (10:13 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Julien Pauli [Mon, 5 Sep 2016 08:13:19 +0000 (10:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Mon, 5 Sep 2016 08:12:49 +0000 (10:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE

8 years agoFix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV...
Julien Pauli [Thu, 1 Sep 2016 08:36:58 +0000 (10:36 +0200)]
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE

8 years agoMerge branch 'pull-request/1864'
Stanislav Malyshev [Mon, 5 Sep 2016 07:51:01 +0000 (00:51 -0700)]
Merge branch 'pull-request/1864'

* pull-request/1864:
  Tiny tweak for `$header` initialization, it should always be an array
  Minor tweaks

8 years agoMerge branch 'pull-request/2025'
Stanislav Malyshev [Mon, 5 Sep 2016 07:44:01 +0000 (00:44 -0700)]
Merge branch 'pull-request/2025'

* pull-request/2025:
  Change the name of the second parameter of image writer functions

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 07:43:52 +0000 (00:43 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Change the name of the second parameter of image writer functions

8 years agoChange the name of the second parameter of image writer functions
Christoph M. Becker [Sat, 23 Jul 2016 13:36:49 +0000 (15:36 +0200)]
Change the name of the second parameter of image writer functions

As of PHP 5.4.0 the second parameter of all image writer functions (except
imagexbm) accepts also a stream resource. Therefore the parameter name
`filename` is inappropriate. We change it to `to` according to what it's
already called in _php_image_output_ctx().

We consider the reflection only related BC break acceptable for a minor version.

8 years agoMerge branch 'pull-request/1958'
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:57 +0000 (00:41 -0700)]
Merge branch 'pull-request/1958'

* pull-request/1958:
  Added editorconfig file

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:29 +0000 (00:41 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Added editorconfig file

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:26 +0000 (00:41 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Added editorconfig file

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:23 +0000 (00:41 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Added editorconfig file

8 years agoAdded editorconfig file
Richard Fussenegger [Sun, 26 Jun 2016 15:51:44 +0000 (17:51 +0200)]
Added editorconfig file

8 years agoMerge branch 'pull-request/2018'
Stanislav Malyshev [Mon, 5 Sep 2016 07:39:46 +0000 (00:39 -0700)]
Merge branch 'pull-request/2018'

* pull-request/2018:
  Implement #47456: Missing PCRE option 'J'

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 07:39:06 +0000 (00:39 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Implement #47456: Missing PCRE option 'J'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 07:39:01 +0000 (00:39 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Implement #47456: Missing PCRE option 'J'

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 07:38:57 +0000 (00:38 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Implement #47456: Missing PCRE option 'J'

8 years agoImplement #47456: Missing PCRE option 'J'
Christoph M. Becker [Thu, 21 Jul 2016 13:36:42 +0000 (15:36 +0200)]
Implement #47456: Missing PCRE option 'J'

While it is possible to force the same behavior by setting the internal
option (?J), having a dedicated modifier appears to be useful. After all,
J is even listed on the "Pattern Modifiers" man page[1], but the description
referrs to (?J).

[1] <http://php.net/manual/en/reference.pcre.pattern.modifiers.php>

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:24 +0000 (00:29 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Recognize TDS versions 7.3 and 7.4

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:21 +0000 (00:29 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Recognize TDS versions 7.3 and 7.4

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:18 +0000 (00:29 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Recognize TDS versions 7.3 and 7.4

8 years agoMerge branch 'pull-request/2061' into PHP-5.6
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:11 +0000 (00:29 -0700)]
Merge branch 'pull-request/2061' into PHP-5.6

* pull-request/2061:
  Recognize TDS versions 7.3 and 7.4

8 years agoMerge branch 'pull-request/2095'
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:59 +0000 (00:19 -0700)]
Merge branch 'pull-request/2095'

* pull-request/2095:
  Use integer placeholders, since values can vary with the TDS version

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:39 +0000 (00:19 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Use integer placeholders, since values can vary with the TDS version

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:34 +0000 (00:19 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Use integer placeholders, since values can vary with the TDS version

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:26 +0000 (00:19 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Use integer placeholders, since values can vary with the TDS version

8 years agoUse integer placeholders, since values can vary with the TDS version
Adam Baratz [Wed, 24 Aug 2016 22:44:55 +0000 (18:44 -0400)]
Use integer placeholders, since values can vary with the TDS version

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 06:24:36 +0000 (23:24 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 06:24:31 +0000 (23:24 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.

8 years agophpdbg: couple of network function return checks. Possible
David Carlier [Tue, 28 Jun 2016 06:48:58 +0000 (07:48 +0100)]
phpdbg: couple of network function return checks. Possible
overflow when copy the socket_path configuration.

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 03:59:00 +0000 (20:59 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Same issue as #72926 in another place.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 03:58:09 +0000 (20:58 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Same issue as #72926 in another place.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 03:57:46 +0000 (20:57 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Same issue as #72926 in another place.

8 years agoSame issue as #72926 in another place.
Stanislav Malyshev [Mon, 5 Sep 2016 03:49:34 +0000 (20:49 -0700)]
Same issue as #72926 in another place.

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 02:16:05 +0000 (19:16 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Sync fix for bug #72910 with current upstream

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 02:15:45 +0000 (19:15 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Sync fix for bug #72910 with current upstream

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 02:15:30 +0000 (19:15 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Sync fix for bug #72910 with current upstream

8 years agoSync fix for bug #72910 with current upstream
Stanislav Malyshev [Mon, 5 Sep 2016 02:13:22 +0000 (19:13 -0700)]
Sync fix for bug #72910 with current upstream

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Sun, 4 Sep 2016 14:53:45 +0000 (16:53 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 4 Sep 2016 14:47:55 +0000 (16:47 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 4 Sep 2016 14:39:45 +0000 (16:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #72994: mbc_to_code() out of bounds read
Christoph M. Becker [Sun, 4 Sep 2016 14:37:06 +0000 (16:37 +0200)]
Fix #72994: mbc_to_code() out of bounds read

We're backporting commit 999a3553 to the still supported PHP 5.6.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sun, 4 Sep 2016 12:28:47 +0000 (14:28 +0200)]
Merge branch 'PHP-7.1'

8 years agoBump PHP_API_VERSION
Nikita Popov [Sun, 4 Sep 2016 12:27:28 +0000 (14:27 +0200)]
Bump PHP_API_VERSION

8 years agoDrop some pieces of commented-out code
Nikita Popov [Sun, 4 Sep 2016 10:43:29 +0000 (12:43 +0200)]
Drop some pieces of commented-out code

8 years agoSync convert_to_null with VM cast behavior
Nikita Popov [Sun, 4 Sep 2016 10:36:16 +0000 (12:36 +0200)]
Sync convert_to_null with VM cast behavior

Do not call cast_object, this is useless and we haven't been doing
it in the VM as of 7.0.

8 years agoDrop SXE_ELEMENT_BY_NAME
Nikita Popov [Sun, 4 Sep 2016 10:29:46 +0000 (12:29 +0200)]
Drop SXE_ELEMENT_BY_NAME

Effectively commented out code

8 years agoDrop unnecessary macro redefinition
Nikita Popov [Sun, 4 Sep 2016 10:28:00 +0000 (12:28 +0200)]
Drop unnecessary macro redefinition

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 3 Sep 2016 21:31:20 +0000 (23:31 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 3 Sep 2016 21:31:05 +0000 (23:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #72996
Nikita Popov [Sat, 3 Sep 2016 21:30:23 +0000 (23:30 +0200)]
Fix bug #72996

8 years agoRemove support for ORIGINAL_LIB_JPEG
Christoph M. Becker [Sat, 3 Sep 2016 19:33:40 +0000 (21:33 +0200)]
Remove support for ORIGINAL_LIB_JPEG

This had already been removed in GD 2.1.0, and wouldn't compile anyway.

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Sep 2016 18:11:15 +0000 (20:11 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 3 Sep 2016 18:01:06 +0000 (20:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 3 Sep 2016 17:52:19 +0000 (19:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #67325: imagetruecolortopalette: white is duplicated in palette
Christoph M. Becker [Sat, 3 Sep 2016 17:46:38 +0000 (19:46 +0200)]
Fix #67325: imagetruecolortopalette: white is duplicated in palette

gdImageTrueColorToPalette() is sometimes wasteful by putting multiple white
color entries into the palette. This is caused by an obvious typo, where
to avoid a division by zero when `total` is zero, `count` is checked instead
of `total`.

We fix this issue to improve the quality of the color quantization.

Cf. <https://github.com/libgd/libgd/commit/24b4550f>

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 3 Sep 2016 15:05:28 +0000 (17:05 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix leak and error check order

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 3 Sep 2016 15:04:43 +0000 (17:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix leak and error check order

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Sat, 3 Sep 2016 15:03:55 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix leak and error check order

8 years agofix leak and error check order
Anatol Belski [Sat, 3 Sep 2016 14:59:17 +0000 (16:59 +0200)]
fix leak and error check order

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Sep 2016 12:01:39 +0000 (14:01 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 3 Sep 2016 11:53:07 +0000 (13:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 3 Sep 2016 11:46:03 +0000 (13:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix proto comment
Christoph M. Becker [Sat, 3 Sep 2016 11:31:13 +0000 (13:31 +0200)]
Fix proto comment

While we're at it, we also change a related comment to use American English
consistently.

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Sep 2016 10:01:15 +0000 (12:01 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'pull-request/2114' into PHP-7.1
Christoph M. Becker [Sat, 3 Sep 2016 10:00:46 +0000 (12:00 +0200)]
Merge branch 'pull-request/2114' into PHP-7.1

8 years agoReplace `dirname(__FILE__)` with `__DIR__` in tests
Christoph M. Becker [Fri, 2 Sep 2016 22:55:12 +0000 (00:55 +0200)]
Replace `dirname(__FILE__)` with `__DIR__` in tests

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Fri, 2 Sep 2016 22:41:33 +0000 (00:41 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 2 Sep 2016 22:40:05 +0000 (00:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoMake test case more resilient
Christoph M. Becker [Fri, 2 Sep 2016 22:18:19 +0000 (00:18 +0200)]
Make test case more resilient

When ran from a root directory the test case failed, because the open_basedir
restriction for "../[…]" won't kick in. Therefore we change the current
working directory to the test case's directory, as discussed on internals,
see <http://news.php.net/php.internals/95585>.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 2 Sep 2016 22:06:36 +0000 (00:06 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix double free