]>
granicus.if.org Git - php/log
Jakub Zelenka [Sun, 10 Mar 2019 16:37:39 +0000 (16:37 +0000)]
Merge branch 'PHP-7.4'
Jakub Zelenka [Sun, 10 Mar 2019 16:36:55 +0000 (16:36 +0000)]
Merge branch 'PHP-7.3' into PHP-7.4
Jakub Zelenka [Sun, 10 Mar 2019 16:36:13 +0000 (16:36 +0000)]
Speed up TLS wrapper test for min and max versions
Jakub Zelenka [Sun, 10 Mar 2019 16:34:58 +0000 (16:34 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 10 Mar 2019 16:23:44 +0000 (16:23 +0000)]
Speed up TLS wrapper tests when SSLv3 disabled
If SSLv3 is disabled in OpenSSL, then sslv3 is not available so the accept
times out. This commit removes the extra accept if SSLv3 is disabled.
Anatol Belski [Sun, 10 Mar 2019 14:49:56 +0000 (15:49 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bc break in Windows readlink
johnstevenson [Wed, 13 Feb 2019 11:34:00 +0000 (11:34 +0000)]
Fix bc break in Windows readlink
GetFinalPathNameByHandleW is given a file handle to a symbolic link,
rather than one to the target, and therefore returns an incorrect path.
Fix symlink with relative path and add test
Anatol Belski [Sun, 10 Mar 2019 12:58:04 +0000 (13:58 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't use Opcache with the master test process
Anatol Belski [Sun, 10 Mar 2019 12:56:32 +0000 (13:56 +0100)]
Don't use Opcache with the master test process
Additionally, enable opcache.file_cache to mitigate possible reattach
failures in the tests.
Anatol Belski [Fri, 8 Mar 2019 20:56:07 +0000 (21:56 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update libmagic.patch [skip ci]
Anatol Belski [Fri, 8 Mar 2019 20:55:48 +0000 (21:55 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update libmagic.patch [skip ci]
Anatol Belski [Fri, 8 Mar 2019 20:55:15 +0000 (21:55 +0100)]
Update libmagic.patch [skip ci]
Anatol Belski [Fri, 8 Mar 2019 20:45:45 +0000 (21:45 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typo in libmagic version
Anatol Belski [Fri, 8 Mar 2019 20:45:18 +0000 (21:45 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix typo in libmagic version
Fabien Villepinte [Fri, 8 Mar 2019 11:43:37 +0000 (12:43 +0100)]
Fix typo in libmagic version
Anatol Belski [Fri, 8 Mar 2019 19:48:52 +0000 (20:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #77576 pull the libmagic implementation of gmtime_r
Anatol Belski [Fri, 8 Mar 2019 19:48:24 +0000 (20:48 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #77576 pull the libmagic implementation of gmtime_r
Anatol Belski [Fri, 8 Mar 2019 19:32:15 +0000 (20:32 +0100)]
Fixed bug #77576 pull the libmagic implementation of gmtime_r
PHP already has all the checks to handle the *_r function variants.
Thus, reusing it to get right symbols.
Anatol Belski [Fri, 8 Mar 2019 14:57:29 +0000 (15:57 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Sync with behavior change in OpenSSL 1.1.1b
fix news
bump versions after release
Anatol Belski [Fri, 8 Mar 2019 14:56:48 +0000 (15:56 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Sync with behavior change in OpenSSL 1.1.1b
fix news
bump versions after release
Anatol Belski [Fri, 8 Mar 2019 14:55:34 +0000 (15:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync with behavior change in OpenSSL 1.1.1b
fix news
bump versions after release
Anatol Belski [Fri, 8 Mar 2019 14:54:27 +0000 (15:54 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync with behavior change in OpenSSL 1.1.1b
fix news
bump versions after release
Anatol Belski [Thu, 28 Feb 2019 11:48:47 +0000 (12:48 +0100)]
Sync with behavior change in OpenSSL 1.1.1b
A behavior change in revealed by some openssl_decrypt() based test,
where an encrypt API is used with a decrypt context. The EVP_Cipher*
functions will automatically choose the right operation depending on the
context passed.
(cherry picked from commit
19a44ffb7be91344550fa700830b8e62a73031ba )
Nikita Popov [Fri, 8 Mar 2019 12:47:23 +0000 (13:47 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 8 Mar 2019 08:45:24 +0000 (09:45 +0100)]
More zpp error/variation test removals
Kalle Sommer Nielsen [Thu, 7 Mar 2019 21:27:42 +0000 (23:27 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Give Peter credit for his work on the Unix build system
Kalle Sommer Nielsen [Thu, 7 Mar 2019 21:27:10 +0000 (23:27 +0200)]
Give Peter credit for his work on the Unix build system
Peter Kokot [Thu, 7 Mar 2019 20:00:36 +0000 (21:00 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Clean *nix build system
Peter Kokot [Thu, 7 Mar 2019 19:58:14 +0000 (20:58 +0100)]
Clean *nix build system
- remove some outdated and not used macro calls
- remove some unused variables
- Remove not needed comment from tokenizer config.m4
- Remove not needed comment
- remove not needed local variables for editors and syntax highlighting
Peter Kokot [Thu, 7 Mar 2019 19:38:04 +0000 (20:38 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add AS_HELP_STRING to *nix build configure options
Peter Kokot [Sun, 3 Mar 2019 15:44:16 +0000 (16:44 +0100)]
Add AS_HELP_STRING to *nix build configure options
The Autoconf's default AS_HELP_STRING macro can properly format help
strings [1] so watching out if columns are aligned manually is not
anymore.
[1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings
Nikita Popov [Thu, 7 Mar 2019 16:10:58 +0000 (17:10 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 7 Mar 2019 15:39:05 +0000 (16:39 +0100)]
More zpp error/variation test removals
Nikita Popov [Thu, 7 Mar 2019 14:55:13 +0000 (15:55 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 7 Mar 2019 09:38:11 +0000 (10:38 +0100)]
More zpp error/variation test removals
Dmitry Stogov [Thu, 7 Mar 2019 11:00:17 +0000 (14:00 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
ws
Dmitry Stogov [Thu, 7 Mar 2019 11:00:02 +0000 (14:00 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
ws
Dmitry Stogov [Thu, 7 Mar 2019 10:59:18 +0000 (13:59 +0300)]
ws
Dmitry Stogov [Thu, 7 Mar 2019 10:58:42 +0000 (13:58 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #77345 (Stack Overflow caused by circular reference in garbage collection)
Add support for MemorySanitizer
Dmitry Stogov [Thu, 7 Mar 2019 10:53:43 +0000 (13:53 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #77345 (Stack Overflow caused by circular reference in garbage collection)
Dmitry Stogov [Thu, 7 Mar 2019 10:33:19 +0000 (13:33 +0300)]
Fixed bug #77345 (Stack Overflow caused by circular reference in garbage collection)
Christoph M. Becker [Thu, 7 Mar 2019 09:18:41 +0000 (10:18 +0100)]
Fix order
Mirrors will certainly not update before we actually push the changes
to the repository.
Stanislav Malyshev [Thu, 7 Mar 2019 06:44:16 +0000 (22:44 -0800)]
Oops, forgot error parameter
Stanislav Malyshev [Thu, 7 Mar 2019 06:22:58 +0000 (22:22 -0800)]
Fix broken memcmp
We can't really do memcmp("_call", "__callStatic", sizeof("__callStatic") -1),
neither should we memcmp constants at all.
Stanislav Malyshev [Thu, 7 Mar 2019 00:18:08 +0000 (16:18 -0800)]
Add support for MemorySanitizer
Stanislav Malyshev [Thu, 7 Mar 2019 00:18:08 +0000 (16:18 -0800)]
Add support for MemorySanitizer
Peter Kokot [Thu, 7 Mar 2019 00:58:41 +0000 (01:58 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Refactor README.md file
Peter Kokot [Thu, 7 Mar 2019 00:57:53 +0000 (01:57 +0100)]
Refactor README.md file
- Initial refactorings of the README.md file with some more user
oriented information about the php-src repository and PHP in general.
- SVG logo added
- README.WIN32-BUILD-SYSTEM file contents moved to README.md
- INSTALL file contents moved to README.md
- Windows releases now instead of install.txt file ship with the
README.md.
- A brief installation section added with help options mentioned for the
configure and make.
- Also mentioned the `-j` option for build and tests
Co-authored-by: Javier Eguiluz <javier.eguiluz@gmail.com>
Co-authored-by: Gabriel Caruso <carusogabriel34@gmail.com>
Co-authored-by: Matthias Kaschubowski <nihylum@gmail.com>
Peter Kokot [Thu, 7 Mar 2019 00:06:04 +0000 (01:06 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update editorconfig
Peter Kokot [Thu, 7 Mar 2019 00:05:43 +0000 (01:05 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update editorconfig
Peter Kokot [Thu, 7 Mar 2019 00:05:22 +0000 (01:05 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update editorconfig
Peter Kokot [Sun, 17 Feb 2019 13:21:58 +0000 (14:21 +0100)]
Update editorconfig
Changes:
- New property max_line_length
- COMMIT_EDITMSG file added when writing commit messages
- Markdown files can have trimmed trailing whitespace also to simplify
settings.
- https link used to EditorConfig page.
- Added also *.y, *.cpp, and *.inc files
- The tab_width moved to a new all files section
Peter Kokot [Wed, 6 Mar 2019 21:50:46 +0000 (22:50 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove legacy AC_CHECK_TYPE calls for uint and ulong
Peter Kokot [Sat, 2 Mar 2019 13:42:21 +0000 (14:42 +0100)]
Remove legacy AC_CHECK_TYPE calls for uint and ulong
The AC_CHECK_TYPE was refactored in more recent versions of Autoconf
and the call with two arguments is obsolete and not recommended anymore.
This patch also refactors some leftovers of using ulong and uint which
are not standard nor common usages of types in C.
The ulong can be used as zend_ulong and uint usage is actually
`unsigned int`.
The usage of HAVE_ULONG removed since it is not used in current code
base.
Legacy edgecase for some legacy HPUX systems removed:
- sys/stream.h header is not checked and the HAVE_SYS_STREAM_H is
not defined with current build system.
- flags are unsigned int
- max_allowed_packet changed to unsigned int
Nikita Popov [Wed, 6 Mar 2019 12:44:12 +0000 (13:44 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 6 Mar 2019 10:23:38 +0000 (11:23 +0100)]
More zpp error/variation test removals
Some of these tests also check non-zpp conditions -- however, there is
always some other test that also checks those error conditions.
rjhdby [Wed, 6 Mar 2019 09:42:02 +0000 (10:42 +0100)]
Cleanup some checks in zend_compile.c
Stanislav Malyshev [Wed, 6 Mar 2019 08:50:33 +0000 (00:50 -0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix shifting signed values too far
Stanislav Malyshev [Tue, 5 Mar 2019 21:25:21 +0000 (13:25 -0800)]
Fix shifting signed values too far
Signed shift of 31 for int and 63 for long is flagged as undefined
behavior by UBSan (-fsanitize=undefined) and seems to be indeed so
according to the standard.
The patch converts such cases to use unsigned.
Stanislav Malyshev [Tue, 5 Mar 2019 21:25:21 +0000 (13:25 -0800)]
Fix shifting signed values too far
Signed shift of 31 for int and 63 for long is flagged as undefined
behavior by UBSan (-fsanitize=undefined) and seems to be indeed so
according to the standard.
The patch converts such cases to use unsigned.
Stanislav Malyshev [Wed, 6 Mar 2019 00:03:15 +0000 (16:03 -0800)]
Update maintainership years
Christoph M. Becker [Wed, 6 Mar 2019 00:00:42 +0000 (01:00 +0100)]
Prolong my extension maintainership
Christoph M. Becker [Tue, 5 Mar 2019 23:38:40 +0000 (00:38 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77700: Writing truecolor images as GIF ignores interlace flag
Christoph M. Becker [Tue, 5 Mar 2019 23:38:12 +0000 (00:38 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77700: Writing truecolor images as GIF ignores interlace flag
Christoph M. Becker [Tue, 5 Mar 2019 23:35:37 +0000 (00:35 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77700: Writing truecolor images as GIF ignores interlace flag
Christoph M. Becker [Tue, 5 Mar 2019 23:27:16 +0000 (00:27 +0100)]
Fix #77700: Writing truecolor images as GIF ignores interlace flag
We revert the interlace flag related part of commit
ff2822a [1], since
contrary to the transparent color, the interlace flag is not retained
by `gdImageCreatePaletteFromTrueColor()`. This also matches upstream
libgd.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
ff2822a82b740edb8ccf307f080bae188c200fb9 >
Joe Watkins [Tue, 5 Mar 2019 19:50:07 +0000 (20:50 +0100)]
fix news
Joe Watkins [Tue, 5 Mar 2019 17:28:47 +0000 (18:28 +0100)]
bump versions after release
Nikita Popov [Tue, 5 Mar 2019 16:10:26 +0000 (17:10 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 5 Mar 2019 14:49:15 +0000 (15:49 +0100)]
Remove more zpp error tests
Gabriel Caruso [Tue, 5 Mar 2019 15:55:07 +0000 (12:55 -0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unnecessary check for always available extension
Gabriel Caruso [Tue, 5 Mar 2019 15:54:24 +0000 (12:54 -0300)]
Remove unnecessary check for always available extension
Nikita Popov [Tue, 5 Mar 2019 13:10:05 +0000 (14:10 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 5 Mar 2019 10:55:03 +0000 (11:55 +0100)]
Remove more zpp error/variation tests
Nikita Popov [Tue, 5 Mar 2019 10:43:23 +0000 (11:43 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 5 Mar 2019 10:41:53 +0000 (11:41 +0100)]
Remove custom error handler in mbstring tests
To make it more obvious what is tested and what the error messages
are.
Nikita Popov [Tue, 5 Mar 2019 10:03:09 +0000 (11:03 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 5 Mar 2019 09:39:19 +0000 (10:39 +0100)]
Remove more zpp error tests
Nikita Popov [Tue, 5 Mar 2019 09:24:38 +0000 (10:24 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 5 Mar 2019 08:46:02 +0000 (09:46 +0100)]
Remove tests for zpp failure conditions
These tests only check zpp error conditions, so drop them per
zpp testing policy.
Remi Collet [Tue, 5 Mar 2019 06:33:21 +0000 (07:33 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
add NEWS entry
Remi Collet [Tue, 5 Mar 2019 06:33:11 +0000 (07:33 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
add NEWS entry
Remi Collet [Tue, 5 Mar 2019 06:32:54 +0000 (07:32 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add NEWS entry
Remi Collet [Tue, 5 Mar 2019 06:32:24 +0000 (07:32 +0100)]
add NEWS entry
Dmitry Stogov [Mon, 4 Mar 2019 22:04:33 +0000 (01:04 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed support for callbacks with "void" return type
Dmitry Stogov [Mon, 4 Mar 2019 22:03:47 +0000 (01:03 +0300)]
Fixed support for callbacks with "void" return type
Christoph M. Becker [Mon, 4 Mar 2019 18:51:39 +0000 (19:51 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Christoph M. Becker [Mon, 4 Mar 2019 18:51:17 +0000 (19:51 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Christoph M. Becker [Mon, 4 Mar 2019 18:50:41 +0000 (19:50 +0100)]
Update NEWS
Stanislav Malyshev [Mon, 4 Mar 2019 17:20:21 +0000 (09:20 -0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Mon, 4 Mar 2019 17:18:55 +0000 (09:18 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Mon, 4 Mar 2019 17:18:22 +0000 (09:18 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Mon, 4 Mar 2019 17:17:14 +0000 (09:17 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Sun, 3 Mar 2019 07:42:53 +0000 (23:42 -0800)]
Fix bug #77630 - safer rename() procedure
In order to rename safer, we do the following:
- set umask to 077 (unfortunately, not TS, so excluding ZTS)
- chown() first, to set proper group before allowing group access
- chmod() after, even if chown() fails
Peter Kokot [Mon, 4 Mar 2019 13:48:56 +0000 (14:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace --with-gd by --enable-gd for Travis
Fabien Villepinte [Mon, 4 Mar 2019 13:11:34 +0000 (14:11 +0100)]
Replace --with-gd by --enable-gd for Travis
Anatol Belski [Mon, 4 Mar 2019 13:30:55 +0000 (14:30 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test portability
Anatol Belski [Mon, 4 Mar 2019 13:30:32 +0000 (14:30 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test portability
Anatol Belski [Mon, 4 Mar 2019 13:30:01 +0000 (14:30 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test portability
Anatol Belski [Mon, 4 Mar 2019 13:28:47 +0000 (14:28 +0100)]
Fix test portability