]> granicus.if.org Git - php/log
php
6 years agoRemoved "dead" code
Dmitry Stogov [Mon, 5 Feb 2018 17:43:08 +0000 (20:43 +0300)]
Removed "dead" code

6 years agoOne cache slot is enough
Dmitry Stogov [Mon, 5 Feb 2018 17:40:21 +0000 (20:40 +0300)]
One cache slot is enough

6 years agoMoved "zval.u2.cache_slot" into free room of "zend_op"
Dmitry Stogov [Mon, 5 Feb 2018 16:41:47 +0000 (19:41 +0300)]
Moved "zval.u2.cache_slot" into free room of "zend_op"

6 years agoUse low bits
Dmitry Stogov [Mon, 5 Feb 2018 16:41:17 +0000 (19:41 +0300)]
Use low bits

6 years agoAvoid repeatable ARG_SHOULD_BE_SENT_BY_REF() checks in FETCH_*FUNC_ARG and following...
Dmitry Stogov [Mon, 5 Feb 2018 16:40:06 +0000 (19:40 +0300)]
Avoid repeatable ARG_SHOULD_BE_SENT_BY_REF() checks in FETCH_*FUNC_ARG and following SEND_VAR_EX. Perform the check once in a new CHECK_FUNC_ARG opcode and reuse in the following FETCH_*FUNC_ARG and SEND_FUNC_ARG (SEND_VAR_EX replacement).

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Mon, 5 Feb 2018 09:41:22 +0000 (10:41 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Finer conditions, so /Qspectre is already usable with latest vc15

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 5 Feb 2018 09:40:45 +0000 (10:40 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Finer conditions, so /Qspectre is already usable with latest vc15

6 years agoFiner conditions, so /Qspectre is already usable with latest vc15
Anatol Belski [Mon, 5 Feb 2018 09:38:06 +0000 (10:38 +0100)]
Finer conditions, so /Qspectre is already usable with latest vc15

6 years agoMerge branch 'PHP-7.2'
Michael Wallner [Mon, 5 Feb 2018 08:10:11 +0000 (09:10 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  fix bug #75916 DNS_CAA record results contain garbage

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Michael Wallner [Mon, 5 Feb 2018 08:07:00 +0000 (09:07 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  fix bug #75916 DNS_CAA record results contain garbage

6 years agofix bug #75916 DNS_CAA record results contain garbage
Michael Wallner [Mon, 5 Feb 2018 08:04:07 +0000 (09:04 +0100)]
fix bug #75916 DNS_CAA record results contain garbage

It is assumed that DNS_CAA record values are zero terminated,
while its length is defined as (RDATA_LENGTH - tag_length - 2).

6 years agoAdjust manual zpp-like error message implementations
Nikita Popov [Sun, 4 Feb 2018 22:27:31 +0000 (23:27 +0100)]
Adjust manual zpp-like error message implementations

This should also use int/bool.

6 years agoRemove no longer necessary type-name special cases
Nikita Popov [Sun, 4 Feb 2018 22:20:14 +0000 (23:20 +0100)]
Remove no longer necessary type-name special cases

zend_get_type_by_name() now produces the correct value by itself,
so we no longer need these workarounds.

6 years agoUse bool instead of boolean while throwing a type error
Gabriel Caruso [Sun, 4 Feb 2018 18:42:36 +0000 (16:42 -0200)]
Use bool instead of boolean while throwing a type error

PHP requires boolean typehints to be written "bool" and disallows
"boolean" as an alias. This changes the error messages to match
the actual type name and avoids confusing messages like "must be
of type boolean, boolean given".

This a followup to ce1d69a1f6dcf15d43029301059c25e5bc09a577, which
implements the same change for integer->int.

6 years agoUse int instead of integer in type errors
Gabriel Caruso [Sun, 4 Feb 2018 13:33:49 +0000 (11:33 -0200)]
Use int instead of integer in type errors

PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".

6 years agostrcoll isn't always available
Gabriel Caruso [Sat, 3 Feb 2018 19:43:53 +0000 (17:43 -0200)]
strcoll isn't always available

6 years agoAdd and fix SKIPIF sections
Gabriel Caruso [Sun, 4 Feb 2018 12:41:21 +0000 (10:41 -0200)]
Add and fix SKIPIF sections

6 years agoUse bool instead of boolean in proto
Gabriel Caruso [Sun, 4 Feb 2018 07:44:28 +0000 (05:44 -0200)]
Use bool instead of boolean in proto

6 years agoFix test for TCP_NODELAY constant
Gabriel Caruso [Sat, 3 Feb 2018 17:49:35 +0000 (15:49 -0200)]
Fix test for TCP_NODELAY constant

Actually check for the constant, instead of just printing a string...

6 years agoRemove superfluous PHP version check in tests
Gabriel Caruso [Sat, 3 Feb 2018 15:51:22 +0000 (13:51 -0200)]
Remove superfluous PHP version check in tests

Also remove tests that target only old PHP versions.

6 years agoRemove superfluous SKIPIF sections in more tests
Gabriel Caruso [Sat, 3 Feb 2018 14:24:56 +0000 (12:24 -0200)]
Remove superfluous SKIPIF sections in more tests

6 years agoCleanup some tests - remove unnecessary sections
Stanislav Malyshev [Sun, 4 Feb 2018 10:12:13 +0000 (02:12 -0800)]
Cleanup some tests - remove unnecessary sections

Also unify credits - all are under --CREDITS-- now.

6 years agoBump libcurl requirement to 7.15.5
Nikita Popov [Sat, 3 Feb 2018 20:02:52 +0000 (21:02 +0100)]
Bump libcurl requirement to 7.15.5

The existence of the following functions is now guaranteed:
 * curl_escape()
 * curl_unescape()
 * curl_multi_setopt()

libcurl 7.15.5 has been released 11.5 years ago and is available
even in RHEL 5.

6 years agoScript to check the sync of cURL constants with online docs
Benjamin Morel [Tue, 19 Dec 2017 16:17:35 +0000 (17:17 +0100)]
Script to check the sync of cURL constants with online docs

6 years agoAdd CURLOPT_REQUEST_TARGET constant
Benjamin Morel [Wed, 6 Dec 2017 02:35:12 +0000 (03:35 +0100)]
Add CURLOPT_REQUEST_TARGET constant

6 years agoRemove checks for unicode.semantics ini option
Nikita Popov [Sat, 3 Feb 2018 18:50:20 +0000 (19:50 +0100)]
Remove checks for unicode.semantics ini option

6 years agoSimplify E_STRICT handling in mysqli tests
Nikita Popov [Sat, 3 Feb 2018 18:11:55 +0000 (19:11 +0100)]
Simplify E_STRICT handling in mysqli tests

E_STRICT is always defined, so we don't need to handle it
conditionally. Instead just let the message be printed and check
the output.

6 years agoRemove some references to E_STRICT in tests
Nikita Popov [Sat, 3 Feb 2018 17:17:12 +0000 (18:17 +0100)]
Remove some references to E_STRICT in tests

run-tests.php enforces error_reporting=E_ALL (including E_STRICT),
setting this explicitly in not necessary. Conversely, after the
removal of some E_STRICT errors, explicitly excluding it is no
longer necessary in some places.

6 years agoRemove superfluous SKIPIF sections in tests
Gabriel Caruso [Sat, 3 Feb 2018 13:47:35 +0000 (11:47 -0200)]
Remove superfluous SKIPIF sections in tests

6 years agoRemove superfluous SKIPIF sections in SPL tests
Gabriel Caruso [Sat, 3 Feb 2018 13:34:01 +0000 (11:34 -0200)]
Remove superfluous SKIPIF sections in SPL tests

6 years agoAvoid another unused opline warning
Nikita Popov [Sat, 3 Feb 2018 16:40:45 +0000 (17:40 +0100)]
Avoid another unused opline warning

The unconditional opline load here used to be necessary for freeing
the return value in case of exception. However, this is no longer
the case, so using LOAD_OPLINE() should be sufficient now.

6 years agoAvoid VM warning if building without global regs
Nikita Popov [Sat, 3 Feb 2018 15:48:05 +0000 (16:48 +0100)]
Avoid VM warning if building without global regs

6 years agoIf the target attribute is available, attach it explicitly
Anatol Belski [Sat, 3 Feb 2018 16:15:18 +0000 (17:15 +0100)]
If the target attribute is available, attach it explicitly

The ifunc attribute might be not available as it is binary format
dependent.

6 years agoRemove superfluous SKIPIF sections in Zend tests
Gabriel Caruso [Sat, 3 Feb 2018 14:03:29 +0000 (12:03 -0200)]
Remove superfluous SKIPIF sections in Zend tests

6 years agoSet max_requests to 0
Lee Hsun [Tue, 30 Jan 2018 12:49:47 +0000 (20:49 +0800)]
Set max_requests to 0

The value will always be overwritten by fpm_run(), and the default
value there is 0 and not 500.

6 years agoFix DateTime*::__set_state arginfo
Gabriel Caruso [Thu, 25 Jan 2018 04:21:03 +0000 (02:21 -0200)]
Fix DateTime*::__set_state arginfo

This is a minor BC break, because classes inheriting from DateTime and
overriding __set_state() now have to specify the additional parameter
as well. However, adding the additional parameter also continues to
work on previous versions of PHP, so this change is acceptable for
master.

6 years agoRemove superfluous SKIPIF sections in Reflection tests
Gabriel Caruso [Sat, 3 Feb 2018 05:05:55 +0000 (03:05 -0200)]
Remove superfluous SKIPIF sections in Reflection tests

6 years agoAdd missing SKIPIF sections
Gabriel Caruso [Sat, 3 Feb 2018 04:33:09 +0000 (02:33 -0200)]
Add missing SKIPIF sections

6 years agoAdd missing SKIPIF section
Christoph M. Becker [Sat, 3 Feb 2018 12:34:58 +0000 (13:34 +0100)]
Add missing SKIPIF section

The test requires the session extension, which may not be available, in
which case the test would fail, which is expected anyway, but not for
the expected reasons.

6 years agoMerge branch 'PHP-7.2'
Nikita Popov [Fri, 2 Feb 2018 21:39:32 +0000 (22:39 +0100)]
Merge branch 'PHP-7.2'

6 years agoUse %d when expecting line number in tests
Gabriel Caruso [Sat, 27 Jan 2018 21:51:51 +0000 (19:51 -0200)]
Use %d when expecting line number in tests

6 years agoFix spelling and grammar mistakes in php.ini files
Michael Smith [Mon, 29 Jan 2018 15:50:52 +0000 (09:50 -0600)]
Fix spelling and grammar mistakes in php.ini files

The spelling of input_encoding is incorrect in both the php.ini-production
and php.ini-development, as of March, 2014. This fixes the spelling.

Cleaning up spelling and grammar includes wrapping lines to 80 characters,
adding articles such as 'the', and fixing spellings such as pathes to
paths.

6 years agoUse int instead of integer in proto
Gabriel Caruso [Thu, 1 Feb 2018 08:04:25 +0000 (06:04 -0200)]
Use int instead of integer in proto

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 2 Feb 2018 21:31:40 +0000 (22:31 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix SOURCE_DATE_EPOCH to not vary on timezones
Chris Lamb [Fri, 2 Feb 2018 11:20:58 +0000 (11:20 +0000)]
Fix SOURCE_DATE_EPOCH to not vary on timezones

6 years agoUse 7za for packaging
Anatol Belski [Fri, 2 Feb 2018 17:30:20 +0000 (18:30 +0100)]
Use 7za for packaging

Better compression, Unicode support and general compatibility.

6 years agoSync gdImageCrop() with upstream
Christoph M. Becker [Fri, 2 Feb 2018 16:39:23 +0000 (17:39 +0100)]
Sync gdImageCrop() with upstream

Besides that we still hope to sync the complete bundled libgd sometime,
the upstream implementation of `gdImageCrop()` is much simpler than the
current one, and thus better readable and less error prone.

6 years agoBreak dependency between IS_TYPE_REFCOUNTED and ZEND_CALL_FREE_EXTRA_ARGS
Dmitry Stogov [Fri, 2 Feb 2018 14:38:07 +0000 (17:38 +0300)]
Break dependency between IS_TYPE_REFCOUNTED and ZEND_CALL_FREE_EXTRA_ARGS

6 years agoAdded note about changed VM instructions
Dmitry Stogov [Fri, 2 Feb 2018 14:35:23 +0000 (17:35 +0300)]
Added note about changed VM instructions

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Fri, 2 Feb 2018 13:09:44 +0000 (14:09 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Switch to the new PHP SDK version on AppVeyor

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Fri, 2 Feb 2018 13:09:20 +0000 (14:09 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Switch to the new PHP SDK version on AppVeyor

6 years agoSwitch to the new PHP SDK version on AppVeyor
Anatol Belski [Fri, 2 Feb 2018 13:06:53 +0000 (14:06 +0100)]
Switch to the new PHP SDK version on AppVeyor

7 years agoFix incompatible pointer warning
Anatol Belski [Thu, 1 Feb 2018 15:52:18 +0000 (16:52 +0100)]
Fix incompatible pointer warning

7 years agotypo
Dmitry Stogov [Thu, 1 Feb 2018 14:46:30 +0000 (17:46 +0300)]
typo

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 1 Feb 2018 14:30:58 +0000 (15:30 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Ensure there are no line breaks in the error msg

7 years agoEnsure there are no line breaks in the error msg
Anatol Belski [Thu, 1 Feb 2018 14:30:01 +0000 (15:30 +0100)]
Ensure there are no line breaks in the error msg

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 1 Feb 2018 14:26:49 +0000 (15:26 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix race conditions with Apache vhost vs. per dir config

7 years ago[ci skip] Update NEWS
Anatol Belski [Thu, 1 Feb 2018 14:26:12 +0000 (15:26 +0100)]
[ci skip] Update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 1 Feb 2018 14:25:55 +0000 (15:25 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Update NEWS
  Fix race conditions with Apache vhost vs. per dir config

7 years ago[ci skip] Update NEWS
Anatol Belski [Thu, 1 Feb 2018 14:25:15 +0000 (15:25 +0100)]
[ci skip] Update NEWS

7 years agoFix race conditions with Apache vhost vs. per dir config
Anatol Belski [Wed, 31 Jan 2018 19:15:30 +0000 (20:15 +0100)]
Fix race conditions with Apache vhost vs. per dir config

If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.

(cherry picked from commit 73eb5a78b9caa18d35624765f9b972c1ba48855d)

7 years agoChanged CATCH instruction format (extended_value moved into op2, op2 into result...
Dmitry Stogov [Wed, 31 Jan 2018 19:39:30 +0000 (22:39 +0300)]
Changed CATCH instruction format (extended_value moved into op2, op2 into result, result into extended_value)

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Wed, 31 Jan 2018 19:26:20 +0000 (20:26 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix race conditions with Apache vhost vs. per dir config

7 years agoFix race conditions with Apache vhost vs. per dir config
Anatol Belski [Wed, 31 Jan 2018 19:15:30 +0000 (20:15 +0100)]
Fix race conditions with Apache vhost vs. per dir config

If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.

7 years agoChanged FETCH_CONSTANT instruction format (extended_value moved into op1)
Dmitry Stogov [Wed, 31 Jan 2018 15:15:25 +0000 (18:15 +0300)]
Changed FETCH_CONSTANT instruction format (extended_value moved into op1)

7 years agoChanged FETCH_CLASS instruction format (extended_value moved into op1)
Dmitry Stogov [Wed, 31 Jan 2018 15:14:43 +0000 (18:14 +0300)]
Changed FETCH_CLASS instruction format (extended_value moved into op1)

7 years agoCompress handlers table
Dmitry Stogov [Wed, 31 Jan 2018 13:46:30 +0000 (16:46 +0300)]
Compress handlers table

7 years agoMerge branch 'PHP-7.2'
Derick Rethans [Wed, 31 Jan 2018 11:56:11 +0000 (11:56 +0000)]
Merge branch 'PHP-7.2'

7 years agoSync with timelib 2017.06
Derick Rethans [Wed, 31 Jan 2018 11:55:35 +0000 (11:55 +0000)]
Sync with timelib 2017.06

7 years agoAvoid redundand mask extraction
Dmitry Stogov [Wed, 31 Jan 2018 10:47:43 +0000 (13:47 +0300)]
Avoid redundand mask extraction

7 years agoAvoid redundand mask extraction
Dmitry Stogov [Wed, 31 Jan 2018 10:34:34 +0000 (13:34 +0300)]
Avoid redundand mask extraction

7 years agoFixed string comparison (it may fail in case of not null-terminated strings)
Dmitry Stogov [Wed, 31 Jan 2018 09:38:02 +0000 (12:38 +0300)]
Fixed string comparison (it may fail in case of not null-terminated strings)

7 years agoMake IS_UNUSED to be zero.
Dmitry Stogov [Wed, 31 Jan 2018 08:18:41 +0000 (11:18 +0300)]
Make IS_UNUSED to be zero.

7 years agoMerge branch 'PHP-7.2'
Jakub Zelenka [Tue, 30 Jan 2018 20:09:24 +0000 (20:09 +0000)]
Merge branch 'PHP-7.2'

7 years agoUse correct certs for SNI server tests with separate key and cert
Jakub Zelenka [Tue, 30 Jan 2018 20:08:19 +0000 (20:08 +0000)]
Use correct certs for SNI server tests with separate key and cert

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Tue, 30 Jan 2018 20:02:34 +0000 (20:02 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoUse correct certs for SNI server tests
Jakub Zelenka [Tue, 30 Jan 2018 19:58:40 +0000 (19:58 +0000)]
Use correct certs for SNI server tests

7 years agoChange FETCH/ISSET instruction modifiers:
Dmitry Stogov [Tue, 30 Jan 2018 19:06:05 +0000 (22:06 +0300)]
Change FETCH/ISSET instruction modifiers:
- Get rid of ZEND_ISEMPTY and ZEND_ISSET_ISEMPTY_MASK. Use just single ZEND_ISSET bit to make distinct between isset() and empty()
- Use ZEND_FETCH_GLOBAL, ZEND_FETCH_LOCAL and ZEND_FETCH_GLOBAL_LOCK as bitmask
- Removed unused ZEND_FETCH_STANDARD
- Extended ZEND_FETCH_ARG_MASK

7 years agoImplement configuration option for explicit native intrinsics
Anatol Belski [Mon, 29 Jan 2018 17:24:27 +0000 (18:24 +0100)]
Implement configuration option for explicit native intrinsics

It mimics -march=native, AVX and more to go, if needed.

7 years agoMerge branch 'PHP-7.2'
Thomas Punt [Mon, 29 Jan 2018 11:17:23 +0000 (11:17 +0000)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Use the correct freeing function

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Thomas Punt [Mon, 29 Jan 2018 11:13:22 +0000 (11:13 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Use the correct freeing function

7 years agoUse the correct freeing function
Thomas Punt [Mon, 29 Jan 2018 11:13:10 +0000 (11:13 +0000)]
Use the correct freeing function

7 years agoRemove explicit intval() param count check
Gabriel Caruso [Sun, 28 Jan 2018 12:45:37 +0000 (10:45 -0200)]
Remove explicit intval() param count check

Rely on ZPP instead.

7 years agoDon't loop over indexes in Phar::extractTo()
Nikita Popov [Sun, 28 Jan 2018 21:04:24 +0000 (22:04 +0100)]
Don't loop over indexes in Phar::extractTo()

Instead use a more idiomatic foreach loop. The behavior is not
strictly the same, but I see no reason why this specific case
should enforce continuously indexed integer keys.

Also handle references in the array while at it.

7 years agoFix misspelling vlaues to values
Gabriel Caruso [Sun, 28 Jan 2018 19:48:59 +0000 (17:48 -0200)]
Fix misspelling vlaues to values

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Sun, 28 Jan 2018 20:53:38 +0000 (21:53 +0100)]
Merge branch 'PHP-7.2'

7 years agoFixed bug #54289
Bishop Bettini [Sat, 6 Jan 2018 07:21:30 +0000 (02:21 -0500)]
Fixed bug #54289

If a directory is passed to Phar::extractTo(), loop over all
entries and extract all files with the given prefix.

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Sat, 27 Jan 2018 16:25:40 +0000 (17:25 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  [ci skip] Update NEWS.

7 years ago[ci skip] Update NEWS.
Anatol Belski [Sat, 27 Jan 2018 16:24:29 +0000 (17:24 +0100)]
[ci skip] Update NEWS.

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Sat, 27 Jan 2018 15:45:27 +0000 (16:45 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  fixed Big_endian issue on s390x for stream test cases

7 years agofixed Big_endian issue on s390x for stream test cases
Sam Ding [Tue, 23 Jan 2018 21:46:55 +0000 (16:46 -0500)]
fixed Big_endian issue on s390x for stream test cases

7 years agoMerge branch 'PHP-7.2' and add NEWS entry
Christoph M. Becker [Sat, 27 Jan 2018 12:14:20 +0000 (13:14 +0100)]
Merge branch 'PHP-7.2' and add NEWS entry

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 27 Jan 2018 12:12:09 +0000 (13:12 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"

7 years agoRevert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"
Christoph M. Becker [Sat, 27 Jan 2018 12:11:30 +0000 (13:11 +0100)]
Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"

This reverts commit 4bd7658e1b44b72ff76913036c1b41f74318b065.

To avoid the BC break we apply the fix to master only.

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Sat, 27 Jan 2018 11:46:10 +0000 (12:46 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 27 Jan 2018 11:40:20 +0000 (12:40 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature

7 years agoFix #75878: RecursiveTreeIterator::setPostfix has wrong signature
Christoph M. Becker [Sat, 27 Jan 2018 11:33:36 +0000 (12:33 +0100)]
Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Fri, 26 Jan 2018 21:28:54 +0000 (22:28 +0100)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 26 Jan 2018 21:28:48 +0000 (22:28 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoBe consistent in clearing out in php_iconv_string()
Philip Prindeville [Thu, 25 Jan 2018 01:47:19 +0000 (18:47 -0700)]
Be consistent in clearing out in php_iconv_string()