]> granicus.if.org Git - php/log
php
6 years agoFixed bug #76046
Nikita Popov [Tue, 27 Nov 2018 15:37:55 +0000 (16:37 +0100)]
Fixed bug #76046

Place FE_FREE on start line of foreach, instead of whatever random
line number might be in CG(zend_lineno) at the time.

6 years agoFixed bug #77184
Colin Basnett [Wed, 21 Nov 2018 21:40:43 +0000 (13:40 -0800)]
Fixed bug #77184

The U in URATIONAL is for unsigned, so the values should be printed
as unsigned.

6 years agoCheck column number before trying to fetch the value
Sergei Morozov [Wed, 7 Nov 2018 20:34:50 +0000 (12:34 -0800)]
Check column number before trying to fetch the value

6 years agoFix #77200: imagecropauto(…, GD_CROP_SIDES) crops left but not right
Christoph M. Becker [Sun, 25 Nov 2018 18:00:50 +0000 (19:00 +0100)]
Fix #77200: imagecropauto(…, GD_CROP_SIDES) crops left but not right

We apply the upstream patch[1].

[1] <https://github.com/libgd/libgd/commit/6613094e5d218dc4d4372757aef5e58c6462a9f7>

6 years agoFix #77198: auto cropping has insufficient precision
Christoph M. Becker [Sun, 25 Nov 2018 14:41:27 +0000 (15:41 +0100)]
Fix #77198: auto cropping has insufficient precision

We apply the upstream patch[1], and also fix the erroneous bailout at
the end of `gdImageAutoCrop()`, since `crop.x` and `crop.y` may very
well be zero.

[1] <https://github.com/libgd/libgd/commit/bda85aaeeb1d7467d92c892ba4c30eaa53d7a6d4>

6 years agoext/sodium: remove redundant code
Frank Denis [Sat, 24 Nov 2018 16:55:36 +0000 (17:55 +0100)]
ext/sodium: remove redundant code

6 years agoext/sodium: Correct base64 decoding with unpadded variants
Frank Denis [Sat, 24 Nov 2018 16:53:08 +0000 (17:53 +0100)]
ext/sodium: Correct base64 decoding with unpadded variants

Backports 0eee0b957a3b75f8175cdd30b306c15e372685e8 from the PECL extension

6 years agoFix test case
Christoph M. Becker [Sat, 24 Nov 2018 12:36:42 +0000 (13:36 +0100)]
Fix test case

6 years agoFix #77195: Incorrect error handling of imagecreatefromjpeg()
Christoph M. Becker [Sat, 24 Nov 2018 11:52:08 +0000 (12:52 +0100)]
Fix #77195: Incorrect error handling of imagecreatefromjpeg()

The broken JPEG image triggers a notice, two warnings and outputs a
message to stderr directly.  The additional notice is pretty useless,
and the direct output to stderr is bad.  Therefore, we port the
relevant differences from upstream to our bundled libgd.  This leaves
us with two warnings; the first one is triggered by libjpeg and shows
the actual problem, the second one is triggered by our libgd wrapper
whenever an image can't be read, what may not have necessarily
triggered a warning before.

6 years agoFix #77177: Serializing or unserializing COM objects crashes
Christoph M. Becker [Fri, 23 Nov 2018 15:32:33 +0000 (16:32 +0100)]
Fix #77177: Serializing or unserializing COM objects crashes

Firstly, we avoid returning NULL from the get_property handler, but
instead return an empty HashTable, which already prevents the crashes.
Secondly, since (de-)serialization obviously makes no sense for COM,
DOTNET and VARIANT objects (at least with the current implementation),
we prohibit it right away.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Wed, 21 Nov 2018 19:39:25 +0000 (14:39 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Prep for 7.1.26

6 years agoPrep for 7.1.26
Sara Golemon [Wed, 21 Nov 2018 19:37:37 +0000 (14:37 -0500)]
Prep for 7.1.26

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 20 Nov 2018 20:30:27 +0000 (21:30 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix bug #71041 dynamic embed SAPI load error
Valentin V. Bartenev [Tue, 20 Nov 2018 15:48:06 +0000 (18:48 +0300)]
Fix bug #71041 dynamic embed SAPI load error

If the library is built with ZEND_SIGNALS defined, it's unusable with an
external SAPI module because the zend_signal_startup() call is mandatory
in this case.

This bug is similar to #74149, but related to dynamic loading of PHP library.

6 years agoDefine __APPLE_USE_RFC_3542 for new ipv6 constants
Mizunashi Mana [Sat, 10 Nov 2018 18:17:11 +0000 (03:17 +0900)]
Define __APPLE_USE_RFC_3542 for new ipv6 constants

6 years agoBump for 7.2.14
Sara Golemon [Tue, 20 Nov 2018 19:40:21 +0000 (14:40 -0500)]
Bump for 7.2.14

6 years agoDisable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Mon, 19 Nov 2018 01:10:43 +0000 (17:10 -0800)]
Disable rsh/ssh functionality in imap by default (bug #77153)

6 years agoDisable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Mon, 19 Nov 2018 01:10:43 +0000 (17:10 -0800)]
Disable rsh/ssh functionality in imap by default (bug #77153)

6 years agoNEWS
Remi Collet [Tue, 20 Nov 2018 10:20:05 +0000 (11:20 +0100)]
NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Remi Collet [Tue, 20 Nov 2018 10:19:52 +0000 (11:19 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  NEWS
  Fix #77151 ftp_close(): SSL_read on shutdown

6 years agoNEWS
Remi Collet [Tue, 20 Nov 2018 10:19:29 +0000 (11:19 +0100)]
NEWS

6 years agoFix #77151 ftp_close(): SSL_read on shutdown
Remi Collet [Thu, 15 Nov 2018 07:58:08 +0000 (08:58 +0100)]
Fix #77151 ftp_close(): SSL_read on shutdown

Regression introduced in fix for #76972

only display the error message when sslerror
or if errno is set (for SSL_ERROR_SYSCALL case)

6 years ago[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:38:35 +0000 (14:38 +0100)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Sun, 18 Nov 2018 13:37:56 +0000 (14:37 +0100)]
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 [Sun, 18 Nov 2018 13:37:04 +0000 (14:37 +0100)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Sun, 18 Nov 2018 11:32:47 +0000 (12:32 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type

6 years agoFixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data...
Anatol Belski [Sun, 18 Nov 2018 11:29:34 +0000 (12:29 +0100)]
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type

Backport 369c991d and 282a63da to 7.1, closes #3634

6 years ago[ci skip] Update NEWS
Anatol Belski [Sat, 17 Nov 2018 22:00:12 +0000 (23:00 +0100)]
[ci skip] Update NEWS

6 years agoFixed bug #77111 php-win.exe corrupts unicode symbols from cli parameters
Anatol Belski [Fri, 16 Nov 2018 22:19:33 +0000 (23:19 +0100)]
Fixed bug #77111 php-win.exe corrupts unicode symbols from cli parameters

The binary can be of course used on console, for whatever reasons, so
UNICODE API should be used in that case. That might however not work as
expected, if the binary is used for a service.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 14 Nov 2018 13:56:41 +0000 (14:56 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR

6 years agoFix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
Christoph M. Becker [Wed, 14 Nov 2018 13:55:38 +0000 (14:55 +0100)]
Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR

If the `ICONV_MIME_DECODE_CONTINUE_ON_ERROR` flag is set, parsing
should not fail, if there are illegal characters in the headers;
instead we silently ignore these like before.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 13 Nov 2018 11:57:38 +0000 (12:57 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Validate length on socket_write

6 years agoValidate length on socket_write
Thiago Carvalho [Sun, 21 Oct 2018 19:42:29 +0000 (21:42 +0200)]
Validate length on socket_write

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Mon, 12 Nov 2018 22:21:04 +0000 (23:21 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #77141: Signedness issue in SOAP when precision=-1

6 years agoFix #77141: Signedness issue in SOAP when precision=-1
Christoph M. Becker [Mon, 12 Nov 2018 22:00:25 +0000 (23:00 +0100)]
Fix #77141: Signedness issue in SOAP when precision=-1

According to php_gcvt(), we assume at most 17 fractional digits for
negative precision.

6 years agoUpdate libmagic.patch [ci skip]
Anatol Belski [Sat, 10 Nov 2018 21:01:49 +0000 (22:01 +0100)]
Update libmagic.patch [ci skip]

6 years agoFork test with pcre.jit=0
Anatol Belski [Sat, 10 Nov 2018 19:05:56 +0000 (20:05 +0100)]
Fork test with pcre.jit=0

6 years agoFix regex
Anatol Belski [Sat, 10 Nov 2018 11:11:02 +0000 (12:11 +0100)]
Fix regex

6 years agoRework magic data
Anatol Belski [Sat, 10 Nov 2018 00:28:23 +0000 (01:28 +0100)]
Rework magic data

Avoid patching where vanilla data suffices. More precisely, avoid data
using [:space:] posix class in regex, as it is likely to cause performance
regressions.

6 years agoSync one more upstream libmagic piece
Anatol Belski [Fri, 9 Nov 2018 23:18:30 +0000 (00:18 +0100)]
Sync one more upstream libmagic piece

6 years agoUpdate NEWS [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:53:01 +0000 (22:53 +0100)]
Update NEWS [ci skip]

6 years agoUpdate libmagic.patch [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:22:49 +0000 (22:22 +0100)]
Update libmagic.patch [ci skip]

6 years agoDeclare function proto in header
Anatol Belski [Mon, 5 Nov 2018 20:28:04 +0000 (21:28 +0100)]
Declare function proto in header

6 years agoBackport 7f5f4601 for 7.2
Anatol Belski [Sun, 4 Nov 2018 15:56:43 +0000 (16:56 +0100)]
Backport 7f5f4601 for 7.2

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sun, 4 Nov 2018 15:44:06 +0000 (16:44 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault

6 years agoFix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
Christoph M. Becker [Sun, 4 Nov 2018 15:40:27 +0000 (16:40 +0100)]
Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault

“Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end.”

6 years agoFixed bug #77092
Nikita Popov [Fri, 2 Nov 2018 13:26:24 +0000 (14:26 +0100)]
Fixed bug #77092

Weird that this worked for so long, probably because nearly all
ext/standard functions use fast ZPP rather than ordinary ZPP.

6 years agoUpdated to version 2018.7 (2018g)
Derick Rethans [Tue, 30 Oct 2018 11:25:48 +0000 (11:25 +0000)]
Updated to version 2018.7 (2018g)

6 years agoEmpty merge
Derick Rethans [Tue, 30 Oct 2018 11:25:47 +0000 (11:25 +0000)]
Empty merge

6 years agoUpdated to version 2018.7 (2018g)
Derick Rethans [Tue, 30 Oct 2018 11:25:45 +0000 (11:25 +0000)]
Updated to version 2018.7 (2018g)

6 years ago[ci skip] Update NEWS
Peter Kokot [Mon, 29 Oct 2018 23:23:20 +0000 (00:23 +0100)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Mon, 29 Oct 2018 23:22:26 +0000 (00:22 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Update NEWS
  fix bug #77079

6 years ago[ci skip] Update NEWS
Peter Kokot [Mon, 29 Oct 2018 23:22:03 +0000 (00:22 +0100)]
[ci skip] Update NEWS

6 years agofix bug #77079
Jon Allen [Mon, 29 Oct 2018 13:44:37 +0000 (14:44 +0100)]
fix bug #77079

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Thu, 25 Oct 2018 14:43:07 +0000 (16:43 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFixed bug #77058
Nikita Popov [Thu, 25 Oct 2018 14:25:54 +0000 (16:25 +0200)]
Fixed bug #77058

Account for the fact that undef must be interpreted as null for
the purposes of INC/DEC inference.

6 years agoImprove "narrowing" error message
Nikita Popov [Thu, 25 Oct 2018 14:18:10 +0000 (16:18 +0200)]
Improve "narrowing" error message

By including the opcode name.

6 years agobump versions
Joe Watkins [Wed, 24 Oct 2018 06:43:27 +0000 (08:43 +0200)]
bump versions

6 years agoFixed bug #50675
Cameron Porter [Sat, 6 Oct 2018 06:09:22 +0000 (01:09 -0500)]
Fixed bug #50675

SOAP: Stop overwriting the node name when creating an XML node
for an object reference.

6 years agobump to 7.2.13-dev
Remi Collet [Tue, 23 Oct 2018 10:15:30 +0000 (12:15 +0200)]
bump to 7.2.13-dev

6 years agoUpdated to version 2018.6 (2018f)
Derick Rethans [Mon, 22 Oct 2018 11:05:40 +0000 (12:05 +0100)]
Updated to version 2018.6 (2018f)

6 years agoEmpty merge
Derick Rethans [Mon, 22 Oct 2018 11:05:40 +0000 (12:05 +0100)]
Empty merge

6 years agoUpdated to version 2018.6 (2018f)
Derick Rethans [Mon, 22 Oct 2018 11:05:39 +0000 (12:05 +0100)]
Updated to version 2018.6 (2018f)

6 years agoFix #75282: xmlrpc_encode_request() crashes
Christoph M. Becker [Sun, 21 Oct 2018 10:06:55 +0000 (12:06 +0200)]
Fix #75282: xmlrpc_encode_request() crashes

Since we allow ext/xmlrpc to be built against a system libxmlrpc(-epi),
we must not `efree` memory which has been allocated via `malloc`.  To
distinguish bundled and system libxmlrpc(-epi) we introduce the macro
`HAVE_XMLRPC_BUNDLED` (analogous to how it is done by ext/gd).  We
deliberately keep the ugly `#ifdef`s, instead of tucking them away in
an `XMLRPC_FREE()` macro, to not forget that it is a bad idea to fork
and bundle a library, but to also allow building against an unpatched
system lib.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Sat, 20 Oct 2018 21:04:15 +0000 (23:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix tests for ICU 63.1

6 years agoFix tests for ICU 63.1
Anatol Belski [Sat, 20 Oct 2018 21:02:06 +0000 (23:02 +0200)]
Fix tests for ICU 63.1

The most of change is U+00A0 vs. new U+202F used in some outputs.

6 years ago[ci skip] Update NEWS
Peter Kokot [Sat, 20 Oct 2018 07:52:46 +0000 (09:52 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sat, 20 Oct 2018 07:51:22 +0000 (09:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Update NEWS
  Fix #77041: buildconf should output error messages to stderr

6 years ago[ci skip] Update NEWS
Peter Kokot [Sat, 20 Oct 2018 07:48:50 +0000 (09:48 +0200)]
[ci skip] Update NEWS

6 years agoFix #77041: buildconf should output error messages to stderr
Mizunashi Mana [Sat, 20 Oct 2018 07:42:56 +0000 (09:42 +0200)]
Fix #77041: buildconf should output error messages to stderr

6 years ago[ci skip] Update NEWS
Peter Kokot [Thu, 18 Oct 2018 22:08:57 +0000 (00:08 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Thu, 18 Oct 2018 22:07:42 +0000 (00:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Update NEWS
  Fix #77035: The phpize and ./configure create redundant .deps file

6 years ago[ci skip] Update NEWS
Peter Kokot [Thu, 18 Oct 2018 22:06:11 +0000 (00:06 +0200)]
[ci skip] Update NEWS

6 years agoFix #77035: The phpize and ./configure create redundant .deps file
Peter Kokot [Thu, 18 Oct 2018 22:02:09 +0000 (00:02 +0200)]
Fix #77035: The phpize and ./configure create redundant .deps file

The `.deps` file(s) was once used by Automake and created to write
dependencies to it. The file creation has been removed via the commit
779c11af21cf8a627b8f2f2edef9e9073c76ed94.

The phpize and ./configure script create a redundant .deps file in a
PECL extension directory which might cause confusions why is it used.
Today it is no longer relevant so this redundant artefact can be
removed in the phpize configure script.

6 years agoFix tests/output/bug74815.phpt generating errors.log
Peter Kokot [Thu, 18 Oct 2018 14:30:18 +0000 (16:30 +0200)]
Fix tests/output/bug74815.phpt generating errors.log

Test tests/output/bug74815.phpt was creating an errors.log file
in project root directory and didn't removed it after the test.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 17 Oct 2018 22:44:43 +0000 (00:44 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix test when it's run on another drive

6 years agoFix test when it's run on another drive
Anatol Belski [Wed, 17 Oct 2018 22:43:24 +0000 (00:43 +0200)]
Fix test when it's run on another drive

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 17 Oct 2018 14:29:38 +0000 (16:29 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #77027: tidy::getOptDoc() not available on Windows

6 years agoFix #77027: tidy::getOptDoc() not available on Windows
Christoph M. Becker [Wed, 17 Oct 2018 14:27:07 +0000 (16:27 +0200)]
Fix #77027: tidy::getOptDoc() not available on Windows

We define the `HAVE_TIDYOPTGETDOC` macro unconditionally, since the
Windows PHP SDK ships libtidy 2009/04/06 or newer for a long time.

We do not add a regression test, since 021.phpt already tests
`tidy_get_opt_doc`, but has previously been skipped due to
unavailability of the function.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Tue, 16 Oct 2018 16:48:36 +0000 (18:48 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Add support for getting SKIP_TAGSTART and SKIP_WHITE options

6 years agoAdd support for getting SKIP_TAGSTART and SKIP_WHITE options
Christoph M. Becker [Tue, 16 Oct 2018 16:47:31 +0000 (18:47 +0200)]
Add support for getting SKIP_TAGSTART and SKIP_WHITE options

When `XML_OPTION_SKIP_TAGSTART` and `XML_OPTION_SKIP_WHITE` had been
introduced[1], it had been overlooked to also support them for
`xml_parser_get_option()`.  We catch up on that.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=b57dc275950b228f2399990471c4f22b7d154c6c>

6 years agoSync leading and final newlines in *.phpt sections
Peter Kokot [Mon, 15 Oct 2018 02:31:31 +0000 (04:31 +0200)]
Sync leading and final newlines in *.phpt sections

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Mon, 15 Oct 2018 02:30:40 +0000 (04:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync leading and final newlines in *.phpt sections

6 years agoSync leading and final newlines in *.phpt sections
Peter Kokot [Mon, 15 Oct 2018 02:29:24 +0000 (04:29 +0200)]
Sync leading and final newlines in *.phpt sections

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoTrim trailing whitespace in *.phpt
Peter Kokot [Sun, 14 Oct 2018 15:23:43 +0000 (17:23 +0200)]
Trim trailing whitespace in *.phpt

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sun, 14 Oct 2018 17:43:39 +0000 (19:43 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Trim trailing whitespace in *.phpt

6 years agoTrim trailing whitespace in *.phpt
Peter Kokot [Sun, 14 Oct 2018 13:37:22 +0000 (15:37 +0200)]
Trim trailing whitespace in *.phpt

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sun, 14 Oct 2018 11:41:09 +0000 (13:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix failing ext/session/tests due to final newlines

6 years agoFix failing ext/session/tests due to final newlines
Peter Kokot [Sun, 14 Oct 2018 11:38:28 +0000 (13:38 +0200)]
Fix failing ext/session/tests due to final newlines

6 years agoSync leading and final newlines in source code files
Peter Kokot [Sun, 14 Oct 2018 10:54:08 +0000 (12:54 +0200)]
Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sun, 14 Oct 2018 10:52:38 +0000 (12:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync leading and final newlines in source code files

6 years agoSync leading and final newlines in source code files
Peter Kokot [Sun, 14 Oct 2018 10:51:01 +0000 (12:51 +0200)]
Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years ago[ci skip] Update NEWS
Frank Denis [Sun, 14 Oct 2018 08:58:02 +0000 (10:58 +0200)]
[ci skip] Update NEWS

6 years agoext/sodium: sodium_pad(): do not copy any bytes if the string is empty
Frank Denis [Sun, 14 Oct 2018 08:43:21 +0000 (10:43 +0200)]
ext/sodium: sodium_pad(): do not copy any bytes if the string is empty

Spotted by San Zhang, thanks!

Backport from PECL libsodium-php 2.0.13

6 years agoext/sodium: Fix sodium_pad() with blocksize >= 256
Frank Denis [Sun, 14 Oct 2018 08:37:37 +0000 (10:37 +0200)]
ext/sodium: Fix sodium_pad() with blocksize >= 256

Backport from PECL libsodium-php 2.0.12

6 years agoext/sodium: Use a correct max output size for base64 decoding
Frank Denis [Sun, 14 Oct 2018 08:32:48 +0000 (10:32 +0200)]
ext/sodium: Use a correct max output size for base64 decoding

Also handle the case where the function is not available in test.

Backport from PECL libsodium-php 2.0.12

6 years agoext/sodium: Avoid shifts wider than 32 bits on size_t values
Frank Denis [Sun, 14 Oct 2018 08:21:29 +0000 (10:21 +0200)]
ext/sodium: Avoid shifts wider than 32 bits on size_t values

Backport from PECL libsodium-php 2.0.10

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sat, 13 Oct 2018 13:23:35 +0000 (15:23 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix failing tests/lang due to whitespace

6 years agoFix failing tests/lang due to whitespace
Peter Kokot [Sat, 13 Oct 2018 13:22:49 +0000 (15:22 +0200)]
Fix failing tests/lang due to whitespace

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sat, 13 Oct 2018 13:15:39 +0000 (15:15 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix failing ext/zlib/tests due to whitespace