]> granicus.if.org Git - php/log
php
6 years agoAdd test for bug #76850
Anatol Belski [Sat, 8 Sep 2018 19:39:54 +0000 (21:39 +0200)]
Add test for bug #76850

6 years agoFixed bug #76850 Exit code mangled by set locale/preg_match
Anatol Belski [Sat, 8 Sep 2018 19:35:23 +0000 (21:35 +0200)]
Fixed bug #76850 Exit code mangled by set locale/preg_match

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 8 Sep 2018 17:12:14 +0000 (19:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 8 Sep 2018 17:08:59 +0000 (19:08 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed

6 years agoFix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Christoph M. Becker [Sat, 8 Sep 2018 16:27:57 +0000 (18:27 +0200)]
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed

Whenever we return with `PSFS_PASS_ON`, we need to update
`bytes_consumed` to not mislead the caller.  Instead of fixing the
respective `if` clauses, we eschew the early bail-outs to simplify the
code a bit.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 7 Sep 2018 12:02:36 +0000 (14:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFixed bug #76796
Nikita Popov [Fri, 7 Sep 2018 12:02:03 +0000 (14:02 +0200)]
Fixed bug #76796

6 years agoSupport fixed address mmap without replacement
David Carlier [Wed, 29 Aug 2018 20:04:32 +0000 (21:04 +0100)]
Support fixed address mmap without replacement

Reapply changes for Zend fixed mapping but only for FreeBSD.
Other BSD might expose some day a similar flag (private
for OpenBSD for the moment for example).
The Linux's part could be brought back but not before 7.4,
at this time, distributions with kernel > 4.17 will be
more widely available.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Wed, 5 Sep 2018 19:30:25 +0000 (21:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Sync with recent changes to default libcurl build

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 5 Sep 2018 19:29:53 +0000 (21:29 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync with recent changes to default libcurl build

6 years agoSync with recent changes to default libcurl build
Anatol Belski [Wed, 5 Sep 2018 15:40:25 +0000 (17:40 +0200)]
Sync with recent changes to default libcurl build

(cherry picked from commit a1ba3007a452fb2618526ed7159236362219a208)

6 years agoFixed support for commutative "user opcodes"
Dmitry Stogov [Wed, 5 Sep 2018 19:11:10 +0000 (22:11 +0300)]
Fixed support for commutative "user opcodes"

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 5 Sep 2018 13:10:27 +0000 (15:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #74454: Wrong exception being thrown when using ReflectionMethod

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 5 Sep 2018 13:07:59 +0000 (15:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #74454: Wrong exception being thrown when using ReflectionMethod

6 years agoFix #74454: Wrong exception being thrown when using ReflectionMethod
Christoph M. Becker [Wed, 5 Sep 2018 13:05:19 +0000 (15:05 +0200)]
Fix #74454: Wrong exception being thrown when using ReflectionMethod

If zend_throw_exception_ex() already threw an exception, we should not
throw again.

6 years agoFix typos in UPGRADING.INTERNALS
Tyson Andre [Wed, 5 Sep 2018 00:35:51 +0000 (20:35 -0400)]
Fix typos in UPGRADING.INTERNALS

6 years agoRestore NEWS entry [skip ci]
Anatol Belski [Tue, 4 Sep 2018 11:03:17 +0000 (13:03 +0200)]
Restore NEWS entry [skip ci]

6 years agoMerge branch 'PHP-7.3' of git.php.net:/php-src into PHP-7.3
Xinchen Hui [Tue, 4 Sep 2018 09:27:41 +0000 (17:27 +0800)]
Merge branch 'PHP-7.3' of git.php.net:/php-src into PHP-7.3

* 'PHP-7.3' of git.php.net:/php-src:
  Fix bug #74764 and add a test case
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS

6 years agoFixed bug #76825 (Undefined symbols ___cpuid_count)
Xinchen Hui [Tue, 4 Sep 2018 09:26:46 +0000 (17:26 +0800)]
Fixed bug #76825 (Undefined symbols ___cpuid_count)

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Joe Watkins [Tue, 4 Sep 2018 09:12:57 +0000 (11:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug #74764 and add a test case

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 4 Sep 2018 09:12:26 +0000 (11:12 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #74764 and add a test case

6 years agoFix bug #74764 and add a test case
Ville Hukkamaki [Tue, 28 Aug 2018 21:26:13 +0000 (23:26 +0200)]
Fix bug #74764 and add a test case

6 years ago[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:03:33 +0000 (11:03 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Tue, 4 Sep 2018 09:03:01 +0000 (11:03 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

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

6 years ago[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:02:26 +0000 (11:02 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Tue, 4 Sep 2018 09:01:57 +0000 (11:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Update NEWS

6 years ago[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:01:24 +0000 (11:01 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Tue, 4 Sep 2018 08:57:25 +0000 (10:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3

6 years agoFixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3
Anatol Belski [Tue, 4 Sep 2018 08:51:14 +0000 (10:51 +0200)]
Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3

It would probably be better to remove this test as it's too much
maintanance for a little gain.

6 years agoFix incorrect literal freeing if pass_two generates fatal error
Nikita Popov [Tue, 4 Sep 2018 06:08:39 +0000 (08:08 +0200)]
Fix incorrect literal freeing if pass_two generates fatal error

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Sep 2018 03:57:07 +0000 (05:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 4 Sep 2018 03:49:02 +0000 (05:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoRevert all MySQL auth related changes
Nikita Popov [Tue, 4 Sep 2018 03:45:45 +0000 (05:45 +0200)]
Revert all MySQL auth related changes

Per bug #76651 these changes do not appear to work correctly in
some cases. As no immediate fix seems to be forthcoming, I'm
reverting these changes.

Revert "Fixed invalid free introduced by d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)"

This reverts commit 11507c0e1bfa17a96480f3648397f6975c31551e.

Revert "Fix mysqlnd build without openssl"

This reverts commit 6c9db02ff7812c298d1e7e292ba731d9d3a66790.

Revert "Fix VC compilation as variable size array is not supported"

This reverts commit f96df64cb2219fda42ca875483f874cf3052647c.

Revert "Fix MySQL 8 auth"

This reverts commit d6e81f0bfd0cb90586dd83d4fd47a4302605261a.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Sep 2018 03:32:52 +0000 (05:32 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 4 Sep 2018 03:32:42 +0000 (05:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix parenthesis warning
Nikita Popov [Tue, 4 Sep 2018 03:32:25 +0000 (05:32 +0200)]
Fix parenthesis warning

6 years agoFix bug #75481: makedev warning
Peter Kokot [Wed, 13 Jun 2018 02:36:55 +0000 (04:36 +0200)]
Fix bug #75481: makedev warning

To use makedev the sys/sysmacros.h needs to be included on newer
systems.

Cherry-picked from PHP-7.3.

6 years agoEscape trigraph sequence
Nikita Popov [Tue, 4 Sep 2018 03:07:43 +0000 (05:07 +0200)]
Escape trigraph sequence

??= is a trigraph for #, so it needs to be escaped. To stay
consistent I'm escaping all question marks in this literal, even
though one of the latter two would suffice.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Sep 2018 02:57:13 +0000 (04:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 4 Sep 2018 02:55:15 +0000 (04:55 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFixed bug #73457
Ville Hukkamaki [Fri, 24 Aug 2018 20:49:53 +0000 (22:49 +0200)]
Fixed bug #73457

Correctly report errors when opening FTP data connection.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Mon, 3 Sep 2018 13:11:10 +0000 (15:11 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 3 Sep 2018 13:10:25 +0000 (15:10 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS

6 years agoFixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
Anatol Belski [Mon, 3 Sep 2018 13:09:23 +0000 (15:09 +0200)]
Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS

6 years agoUpdate to Oniguruma 6.9.0
Christoph M. Becker [Mon, 3 Sep 2018 10:09:20 +0000 (12:09 +0200)]
Update to Oniguruma 6.9.0

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Mon, 3 Sep 2018 07:21:42 +0000 (10:21 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed reference-countingin ZTS build.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 3 Sep 2018 07:21:32 +0000 (10:21 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed reference-countingin ZTS build.

6 years agoFixed reference-countingin ZTS build.
Dmitry Stogov [Mon, 3 Sep 2018 07:20:40 +0000 (10:20 +0300)]
Fixed reference-countingin ZTS build.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 2 Sep 2018 19:02:09 +0000 (20:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix stream_security_level.phpt with OpenSSL 1.1.1
Jakub Zelenka [Sun, 2 Sep 2018 19:00:08 +0000 (20:00 +0100)]
Fix stream_security_level.phpt with OpenSSL 1.1.1

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 1 Sep 2018 12:29:26 +0000 (14:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #75696: posix_getgrnam fails to print details of group

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 1 Sep 2018 12:27:31 +0000 (14:27 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #75696: posix_getgrnam fails to print details of group

6 years agoFix #75696: posix_getgrnam fails to print details of group
Christoph M. Becker [Fri, 24 Aug 2018 15:59:44 +0000 (17:59 +0200)]
Fix #75696: posix_getgrnam fails to print details of group

According to the POSIX specification of `getgrnam_r()` the result of
`sysconf(_SC_GETGR_R_SIZE_MAX)` is an initial value suggested for the
size of the buffer, and `ERANGE` signals that insufficient storage was
supplied.  So if we get `ERANGE`, we try again with a buffer twice as
big, and so on, instead of failing.

6 years ago[ci skip] Update NEWS
Anatol Belski [Sat, 1 Sep 2018 09:33:39 +0000 (11:33 +0200)]
[ci skip] Update NEWS

6 years agoImprove fix for bug #76829
Anatol Belski [Fri, 31 Aug 2018 23:12:06 +0000 (01:12 +0200)]
Improve fix for bug #76829

6 years agoFixed bug #76829 Incorrect validation of domain on idn_to_utf8() function
Anatol Belski [Fri, 31 Aug 2018 22:14:23 +0000 (00:14 +0200)]
Fixed bug #76829 Incorrect validation of domain on idn_to_utf8() function

As stated by RFC 5890, U-Labels might be up to 252 Unicode code points
long. This can be fixed in 7.1+ as well, but there might potentially be
issues in some existing apps expecting the output to be max 255 octets
long. Thus it seems to be safer to not to touch stable branches.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Thu, 30 Aug 2018 17:34:23 +0000 (19:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix stack underflow in phar

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 30 Aug 2018 17:34:01 +0000 (19:34 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix stack underflow in phar

6 years agoFix stack underflow in phar
Anatol Belski [Mon, 6 Aug 2018 20:35:11 +0000 (22:35 +0200)]
Fix stack underflow in phar

The checks can issue reads below and above the temporary buffer. A read
itself doesn't seem dangerous, but the condition result can be
arbitrary. Such reads have to be avoided. Likely this patch should be
backported.

(cherry picked from commit b053beee7efb64b8e439fb3639de839e615ba89c)

6 years agoFix #76820: Z_COPYABLE invalid definition
Christoph M. Becker [Thu, 30 Aug 2018 16:00:51 +0000 (18:00 +0200)]
Fix #76820: Z_COPYABLE invalid definition

We remove the extraneous parenthesis.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Thu, 30 Aug 2018 15:39:39 +0000 (17:39 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Switch to staging series on AppVeyor

6 years agoSwitch to staging series on AppVeyor
Anatol Belski [Thu, 30 Aug 2018 15:38:51 +0000 (17:38 +0200)]
Switch to staging series on AppVeyor

6 years agoNEWS for #76818
Remi Collet [Thu, 30 Aug 2018 12:50:26 +0000 (14:50 +0200)]
NEWS for #76818

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Thu, 30 Aug 2018 07:04:43 +0000 (09:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  fix double cast to int on 32-bit

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Remi Collet [Thu, 30 Aug 2018 07:04:13 +0000 (09:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  fix double cast to int on 32-bit

6 years agofix double cast to int on 32-bit
Remi Collet [Wed, 29 Aug 2018 07:10:59 +0000 (09:10 +0200)]
fix double cast to int on 32-bit

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Wed, 29 Aug 2018 20:41:22 +0000 (23:41 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Wed, 29 Aug 2018 20:41:14 +0000 (23:41 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).

6 years agoFixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal...
Dmitry Stogov [Wed, 29 Aug 2018 20:40:17 +0000 (23:40 +0300)]
Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Sara Golemon [Wed, 29 Aug 2018 16:42:11 +0000 (12:42 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Prep for 7.1.23

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Wed, 29 Aug 2018 16:41:36 +0000 (12:41 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Prep for 7.1.23

6 years agoPrep for 7.1.23
Sara Golemon [Wed, 29 Aug 2018 16:38:34 +0000 (12:38 -0400)]
Prep for 7.1.23

6 years agoUpdate NEWS
Anatol Belski [Wed, 29 Aug 2018 14:12:18 +0000 (16:12 +0200)]
Update NEWS

6 years agoRevert "Support fixed address mmap without replacement"
Remi Collet [Wed, 29 Aug 2018 12:41:04 +0000 (14:41 +0200)]
Revert "Support fixed address mmap without replacement"

This reverts commit 0f68ff5c92924deb9401ce66458e67f250ccde74.

6 years agoRevert "Don't report mmap failure if it is expected"
Remi Collet [Wed, 29 Aug 2018 12:40:59 +0000 (14:40 +0200)]
Revert "Don't report mmap failure if it is expected"

This reverts commit 446b5b15d324dacd30f58313563a9d625fb54ac8.

6 years agoFixed bug #76803 ftruncate changes file pointer
Anatol Belski [Tue, 28 Aug 2018 13:42:39 +0000 (15:42 +0200)]
Fixed bug #76803 ftruncate changes file pointer

6 years agoFix SKIPIF conditions
Christoph M. Becker [Tue, 28 Aug 2018 12:02:11 +0000 (14:02 +0200)]
Fix SKIPIF conditions

The test calls `mb_convert_encoding()` and as such requires the
mbstring extension.

6 years ago[ci skip] Update NEWS wrt. php-7.3.0beta3 tagging
Christoph M. Becker [Tue, 28 Aug 2018 10:22:57 +0000 (12:22 +0200)]
[ci skip] Update NEWS wrt. php-7.3.0beta3 tagging

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Tue, 28 Aug 2018 08:19:08 +0000 (10:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  bump to 7.2.11-dev

6 years agobump to 7.2.11-dev
Remi Collet [Tue, 28 Aug 2018 08:17:33 +0000 (10:17 +0200)]
bump to 7.2.11-dev

6 years agoStore zlog stream in each child so it can be reused
Jakub Zelenka [Mon, 27 Aug 2018 13:50:27 +0000 (14:50 +0100)]
Store zlog stream in each child so it can be reused

This change results in using the same buffer for multiple
stdio events which should fix inconsistencies of handling
messages that are not ended with a new line and possibly
very long messages that are split to multiple events.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sun, 26 Aug 2018 11:23:06 +0000 (13:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #68180: iconv_mime_decode can return extra characters in a header

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sun, 26 Aug 2018 11:20:22 +0000 (13:20 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #68180: iconv_mime_decode can return extra characters in a header

6 years agoFix #68180: iconv_mime_decode can return extra characters in a header
Christoph M. Becker [Sun, 26 Aug 2018 10:59:17 +0000 (12:59 +0200)]
Fix #68180: iconv_mime_decode can return extra characters in a header

Basically, the algorithm to append a converted string to an existing
`smart_str` works by increasing the `smart_str` buffer, to let `iconv`
convert characters until there is no more space, to set the new length
of the `smart_str` and to repeat until there is no more input.

Formerly, the new length calculation has been wrong, though, since we
would have to take the old `out_len` into account (`buf_growth -
old_out_len - out_len`).  However, since there is no need to take the
old `out_len` into account when increasing the `smart_str` buffer, we
can simplify the fix, avoiding an additional variable.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 25 Aug 2018 15:49:39 +0000 (17:49 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #60494: iconv_mime_decode does ignore special characters

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 25 Aug 2018 15:42:10 +0000 (17:42 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #60494: iconv_mime_decode does ignore special characters

6 years agoFix #60494: iconv_mime_decode does ignore special characters
Christoph M. Becker [Sat, 25 Aug 2018 13:41:44 +0000 (15:41 +0200)]
Fix #60494: iconv_mime_decode does ignore special characters

We must not ignore erroneous characters in mime headers, but rather let
iconv_mime_decode() fail in this case, issuing the usual notice
regarding illegal characters.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 25 Aug 2018 12:53:56 +0000 (14:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #63839: iconv_mime_decode_headers function is skipping headers

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 25 Aug 2018 12:51:47 +0000 (14:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #63839: iconv_mime_decode_headers function is skipping headers

6 years agoFix #63839: iconv_mime_decode_headers function is skipping headers
Christoph M. Becker [Sun, 12 Aug 2018 21:20:41 +0000 (23:20 +0200)]
Fix #63839: iconv_mime_decode_headers function is skipping headers

We have to cater to the possibility that `=?` is not the start of an
encoded-word, but rather a literal `=?`.  If a line break is found
while we're still looking for the charset, we can safely assume that
it's a literal `=?`, and act accordingly.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 25 Aug 2018 12:42:35 +0000 (14:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #55146: iconv_mime_decode_headers() skips some headers

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 25 Aug 2018 12:41:00 +0000 (14:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #55146: iconv_mime_decode_headers() skips some headers

6 years agoFix #55146: iconv_mime_decode_headers() skips some headers
Christoph M. Becker [Sun, 12 Aug 2018 17:55:09 +0000 (19:55 +0200)]
Fix #55146: iconv_mime_decode_headers() skips some headers

If we're expecting the start of an encoded word (`=?`), but instead of
the question mark get a line break (CR or LF), we must not append it to
the `pretval`.

6 years agoFix #53891: iconv_mime_encode() fails to Q-encode UTF-8 string
Christoph M. Becker [Sun, 12 Aug 2018 13:03:47 +0000 (15:03 +0200)]
Fix #53891: iconv_mime_encode() fails to Q-encode UTF-8 string

The minimum length of an encoded-word is actually the pure encoding
overhead plus the length of the `output-charset` plus the minimum unit
of encoded text, which is 4 for B-encoding and (for simplicity) 3 for
Q-encoding.  We also cater to the possibility that we need further
encoded words, which would be split by the `line-break-chars` followed
by a space character.  Obviously, the former `out_charset_len + 12` is
too simplistic and wrong in the given case (where the magic number
would be 13).

These simplifications are somewhat wasteful, but iconv_mime_encode()
with Q-encoding is wasteful anyway (see bug 66828[1]), and the proper
solution to convert the whole input to the desired output charset
upfront, and applying the encoding afterwards appears too much a change
for the stable releases.

[1] <https://bugs.php.net/66828>

6 years agoFix #76712: Assignment of empty string creates extraneous text node
Christoph M. Becker [Tue, 7 Aug 2018 09:37:58 +0000 (11:37 +0200)]
Fix #76712: Assignment of empty string creates extraneous text node

We work around this peculiarity of libxml by using xmlNodeSetContent(),
which does not exhibit this behavior.  This also saves us from manually
calculating the string length.

6 years agoRemove some old parts of the php
Peter Kokot [Fri, 24 Aug 2018 18:07:43 +0000 (20:07 +0200)]
Remove some old parts of the php

Since ba138a3746b3077ebe5b7356b5b49f21cfc30438 the generate-phpt library
has been unbundled from the php-src. This patch cleans two remaining
parts.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Thu, 23 Aug 2018 19:27:43 +0000 (21:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  mkdist.php: recursively check dll dependencies

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 23 Aug 2018 19:26:40 +0000 (21:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  mkdist.php: recursively check dll dependencies

6 years agomkdist.php: recursively check dll dependencies
Dylan K. Taylor [Tue, 21 Aug 2018 14:23:02 +0000 (15:23 +0100)]
mkdist.php: recursively check dll dependencies

Fix duplication of recursively checked deps

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Thu, 23 Aug 2018 10:51:11 +0000 (12:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Simplify regression test