]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 17 Jul 2019 10:02:30 +0000 (12:02 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 17 Jul 2019 09:56:00 +0000 (11:56 +0200)]
Use reported fstat filesize for PHP streams
Nikita Popov [Wed, 17 Jul 2019 09:49:10 +0000 (11:49 +0200)]
Revert "Avoid unused fstat() call"
This reverts commit
5a90dc77b8f244f603082aea022fadc0ce2c009c .
Let's try to go with the reverse direction here and actually trust
the reported size...
Nikita Popov [Wed, 17 Jul 2019 09:22:41 +0000 (11:22 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 17 Jul 2019 09:01:57 +0000 (11:01 +0200)]
Avoid unused fstat() call
If we're including a file via PHP streams, we're not going to trust
the reported file size anyway and populate in a loop -- so don't
bother determining the file size in the first place. Only do this
for non-tty HANDLE_FP now, which is the only case where this
information was used.
Dmitry Stogov [Wed, 17 Jul 2019 09:05:40 +0000 (12:05 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove old hack
Dmitry Stogov [Wed, 17 Jul 2019 09:05:23 +0000 (12:05 +0300)]
Remove old hack
Nikita Popov [Wed, 17 Jul 2019 08:41:34 +0000 (10:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 17 Jul 2019 08:20:06 +0000 (10:20 +0200)]
Avoid double buffering in Zend streams
Disable buffering in PHP streams, to avoid storing and copying the
file contents twice.
This will call stream_set_option() on custom stream wrapper as
well, so the method needs to be implemented to avoid a warning.
Dmitry Stogov [Wed, 17 Jul 2019 06:12:27 +0000 (09:12 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Added specialization for comparison instructions and QM_ASSIGN
Dmitry Stogov [Wed, 17 Jul 2019 06:12:01 +0000 (09:12 +0300)]
Added specialization for comparison instructions and QM_ASSIGN
Peter Kokot [Wed, 17 Jul 2019 01:55:04 +0000 (03:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typo
Simplify functions checks in m4
Peter Kokot [Wed, 17 Jul 2019 01:54:54 +0000 (03:54 +0200)]
Fix typo
Peter Kokot [Wed, 17 Jul 2019 01:50:47 +0000 (03:50 +0200)]
Simplify functions checks in m4
- AC_CHECK_FUNCS already automatically defines belonging HAVE_function
symbols and executes given shell code.
Dmitry Stogov [Tue, 16 Jul 2019 21:56:06 +0000 (00:56 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Separate "cold" and common unspecialized code
Dmitry Stogov [Tue, 16 Jul 2019 21:52:26 +0000 (00:52 +0300)]
Separate "cold" and common unspecialized code
Peter Kokot [Tue, 16 Jul 2019 20:47:02 +0000 (22:47 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update changelog
Remove unused build checks
Peter Kokot [Tue, 16 Jul 2019 20:46:46 +0000 (22:46 +0200)]
Update changelog
Peter Kokot [Tue, 16 Jul 2019 20:39:09 +0000 (22:39 +0200)]
Remove unused build checks
- yp_get_default_domain was part of ext/yp
- functions checks produce HAVE_function_name symbols. These checks are
currently not used in php-src neither in the extensions out there.
- Removed symbols because they are not used in the code:
- HAVE_GCVT
- HAVE_PUTENV
- HAVE_PUTENV
- HAVE_SETVBUF
- HAVE_TEMPNAM
- HAVE_SIN (sin is also defined in C89 standard)
- HAVE_SETSOCKOPT
- HAVE_LOCKF
- HAVE_ISASCII
- HAVE_YP_GET_DEFAULT_DOMAIN (and other yp extension related unused checks)
- HAVE_LINK
- HAVE_USLEEP is already defined in Windows configuration header
- HAVE_LIBBIND has not been used in php-src for a while anymore
- HAVE_GETHOSTNAME is duplicated in Windows configuration header
Closes GH-4417
Dmitry Stogov [Tue, 16 Jul 2019 19:56:47 +0000 (22:56 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Provide type info
Dmitry Stogov [Tue, 16 Jul 2019 19:56:20 +0000 (22:56 +0300)]
Provide type info
Nikita Popov [Tue, 16 Jul 2019 15:45:03 +0000 (17:45 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Jul 2019 15:17:19 +0000 (17:17 +0200)]
Remove ZEND_HANDLE_MAPPED
The buf/len members are now simply used in addition to the main
stream, without changing the handle kind.
Nikita Popov [Tue, 16 Jul 2019 14:50:22 +0000 (16:50 +0200)]
Drop free_filename field from zend_file_handle
free_filename was always zero.
Nikita Popov [Tue, 16 Jul 2019 14:44:46 +0000 (16:44 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Jul 2019 14:40:54 +0000 (16:40 +0200)]
Introduce zend_stream_init_filename()
Avoid more ad-hoc initialization of zend_file_handle structures.
Nikita Popov [Tue, 16 Jul 2019 14:21:45 +0000 (16:21 +0200)]
Introduce zend_stream_init_fp() API
Reduce the amount of code that mucks around with zend_file_handle
initialization.
Dmitry Stogov [Tue, 16 Jul 2019 14:40:31 +0000 (17:40 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Slit INC/DEC opcodes into hot/cold parts and remove specialized versioins for LONG_OR_DOUBLE.
Dmitry Stogov [Tue, 16 Jul 2019 14:39:25 +0000 (17:39 +0300)]
Slit INC/DEC opcodes into hot/cold parts and remove specialized versioins for LONG_OR_DOUBLE.
Nikita Popov [Tue, 16 Jul 2019 13:54:05 +0000 (15:54 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Jul 2019 13:53:41 +0000 (15:53 +0200)]
Remove unused _get_zval_ptr_cv_BP_VAR_UNSET function
To fix the macos -Werror build.
Nikita Popov [Tue, 16 Jul 2019 13:48:24 +0000 (15:48 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Jul 2019 12:51:48 +0000 (14:51 +0200)]
Remove ZEND_HANDLE_FD
This handle type was unused.
Nikita Popov [Tue, 16 Jul 2019 11:27:41 +0000 (13:27 +0200)]
Fix bug #52752 by not using mmap() to lex files
Using mmap() is unsafe under concurrent modification. If the file
is truncated, access past the end of the file may occur, which will
generate a SIGBUS error. Even if the length does not change, the
contents may, which is a situation that the lexer certainly is not
prepared to deal with either.
Reproduce with test.php:
<?php
file_put_contents(__DIR__ . '/test.tpl',
'AAA<?php $string = "' .
str_repeat('A', mt_rand(1, 256 * 1024)) .
'"; ?>BBB' . "\r\n");
require_once __DIR__ . '/test.tpl';
And:
for ((n=0;n<100;n++)); do sapi/cli/php test.php & done
Christoph M. Becker [Tue, 16 Jul 2019 13:29:33 +0000 (15:29 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Convert short tag to standard tag in Zend test file
Christoph M. Becker [Tue, 16 Jul 2019 13:29:10 +0000 (15:29 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Convert short tag to standard tag in Zend test file
George Peter Banyard [Thu, 11 Jul 2019 14:06:41 +0000 (16:06 +0200)]
Convert short tag to standard tag in Zend test file
Closes GH-4389.
(cherry picked from commit
e6c2b288652cf9c8d0b92d2842d73b3eb2431860 )
Christoph M. Becker [Tue, 16 Jul 2019 11:46:17 +0000 (13:46 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS [ci skip]
Christoph M. Becker [Tue, 16 Jul 2019 11:45:23 +0000 (13:45 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS [ci skip]
Christoph M. Becker [Tue, 16 Jul 2019 11:44:13 +0000 (13:44 +0200)]
Update NEWS [ci skip]
Remi Collet [Tue, 16 Jul 2019 11:00:57 +0000 (13:00 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
move NEWS entry [ci skip]
Remi Collet [Tue, 16 Jul 2019 11:00:44 +0000 (13:00 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
move NEWS entry [ci skip]
Remi Collet [Tue, 16 Jul 2019 11:00:30 +0000 (13:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
move NEWS entry [ci skip]
Remi Collet [Tue, 16 Jul 2019 11:00:13 +0000 (13:00 +0200)]
move NEWS entry [ci skip]
Dmitry Stogov [Tue, 16 Jul 2019 10:50:55 +0000 (13:50 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace deprecated conditions by ZEND_ASSERT.
Dmitry Stogov [Tue, 16 Jul 2019 10:50:25 +0000 (13:50 +0300)]
Replace deprecated conditions by ZEND_ASSERT.
Nikita Popov [Tue, 16 Jul 2019 10:20:21 +0000 (12:20 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Jul 2019 10:07:09 +0000 (12:07 +0200)]
Use ZEND_HASH_FOREACH APIs in a few more places
Nikita Popov [Tue, 16 Jul 2019 09:54:40 +0000 (11:54 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Jul 2019 15:26:26 +0000 (17:26 +0200)]
Support <?php followed by EOF
This is an annoying edge-case for canonicalization.
Nikita Popov [Tue, 16 Jul 2019 09:11:08 +0000 (11:11 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Jul 2019 09:11:00 +0000 (11:11 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 16 Jul 2019 09:10:02 +0000 (11:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 16 Jul 2019 09:08:27 +0000 (11:08 +0200)]
Fixed bug #78297
Remi Collet [Tue, 16 Jul 2019 08:39:37 +0000 (10:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
next is 7.2.22
Remi Collet [Tue, 16 Jul 2019 08:39:24 +0000 (10:39 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
next is 7.2.22
Remi Collet [Tue, 16 Jul 2019 08:39:03 +0000 (10:39 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
next is 7.2.22
Remi Collet [Tue, 16 Jul 2019 08:38:20 +0000 (10:38 +0200)]
next is 7.2.22
Nikita Popov [Tue, 16 Jul 2019 08:26:25 +0000 (10:26 +0200)]
Fix build without jit
Nikita Popov [Tue, 16 Jul 2019 08:25:14 +0000 (10:25 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Jul 2019 08:24:20 +0000 (10:24 +0200)]
Fix name collisions in fputcsv tests
Nikita Popov [Tue, 16 Jul 2019 08:21:38 +0000 (10:21 +0200)]
Canonicalize file-names in zip tests
There were a number of name collisions in there.
Dmitry Stogov [Tue, 16 Jul 2019 08:17:04 +0000 (11:17 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Delay IS_UNDEF checks
Dmitry Stogov [Tue, 16 Jul 2019 08:16:45 +0000 (11:16 +0300)]
Delay IS_UNDEF checks
Dmitry Stogov [Mon, 15 Jul 2019 22:54:34 +0000 (01:54 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect specialization (missed IS_INDIRECT handling)
Dmitry Stogov [Mon, 15 Jul 2019 22:54:22 +0000 (01:54 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed incorrect specialization (missed IS_INDIRECT handling)
Dmitry Stogov [Mon, 15 Jul 2019 22:52:11 +0000 (01:52 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed incorrect specialization (missed IS_INDIRECT handling)
Dmitry Stogov [Mon, 15 Jul 2019 22:50:10 +0000 (01:50 +0300)]
Fixed incorrect specialization (missed IS_INDIRECT handling)
Peter Kokot [Mon, 15 Jul 2019 16:15:58 +0000 (18:15 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Small typo and proto name fix
George Peter Banyard [Mon, 15 Jul 2019 16:15:17 +0000 (18:15 +0200)]
Small typo and proto name fix
Closes GH-4415
Peter Kokot [Mon, 15 Jul 2019 16:00:31 +0000 (18:00 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove win32/php_stdbool.h
Peter Kokot [Mon, 15 Jul 2019 16:00:04 +0000 (18:00 +0200)]
Remove win32/php_stdbool.h
File usage was removed via
33fc7d77d7d0f7c85025b8aa82d62b154c4bc71f .
Closes GH-4411
Peter Kokot [Mon, 15 Jul 2019 15:59:17 +0000 (17:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused files
Peter Kokot [Mon, 15 Jul 2019 15:58:46 +0000 (17:58 +0200)]
Remove unused files
These were introduced in
504b9beae60a45e1b1e6466e97a6bd246dfc74f6
and their usages were removed via
4b3e19802385c5874eefd3ba4565f2efbc55dc96 .
Closes GH-4410
Peter Kokot [Mon, 15 Jul 2019 15:57:51 +0000 (17:57 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove Windows syslog script and syslog.reg
Peter Kokot [Mon, 15 Jul 2019 15:57:11 +0000 (17:57 +0200)]
Remove Windows syslog script and syslog.reg
These were used on old Windows systems before Vista and also were
used together with unmaintained win32std extension.
https://docs.microsoft.com/en-us/windows/win32/eventlog/event-logging
Closes GH-4409
Peter Kokot [Mon, 15 Jul 2019 15:56:07 +0000 (17:56 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove some *.dsp/*.dsw leftovers
Peter Kokot [Mon, 15 Jul 2019 15:55:37 +0000 (17:55 +0200)]
Remove some *.dsp/*.dsw leftovers
Usage of this was removed via
4b3e19802385c5874eefd3ba4565f2efbc55dc96
Closes GH-4408
Nikita Popov [Mon, 15 Jul 2019 15:29:45 +0000 (17:29 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Jul 2019 15:29:27 +0000 (17:29 +0200)]
Combine SKIP_TOKEN+RETURN_TOKEN into one macro
Nikita Popov [Mon, 15 Jul 2019 14:26:25 +0000 (16:26 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Jul 2019 14:21:46 +0000 (16:21 +0200)]
Move shebang handling into the lexer
Instead of handling shebang lines by adjusting the file pointer in
individual SAPIs, move the handling into the lexer, where this is
both a lot simpler and more robust. Whether the shebang should be
skipped is controlled by CG(skip_shebang) -- we might want to do
that in more cases.
This fixed bugs #60677 and #78066.
Nikita Popov [Mon, 15 Jul 2019 13:20:45 +0000 (15:20 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Jul 2019 13:20:36 +0000 (15:20 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Jul 2019 13:19:43 +0000 (15:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 25 Jun 2019 10:09:47 +0000 (12:09 +0200)]
Fix bug #77124
This is a backport of
6fcae63f614d1ed4aaeaff7b13a7a4627b1f1312
to PHP 7.2.
Christoph M. Becker [Mon, 15 Jul 2019 12:21:25 +0000 (14:21 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Sync mysqlnd version with PHP version
Christoph M. Becker [Mon, 15 Jul 2019 09:43:09 +0000 (11:43 +0200)]
Sync mysqlnd version with PHP version
Since mysqlnd is solely developed in the php-src repository, it makes
not much sense to have its own version number, particularly since
nobody cares to update it. Therefore we use PHP's version number, but
stick with the "mysqlnd" prefix which can be important to distinguish
the mysqli driver (libmysqlclient vs. mysqlnd).
Remi Collet [Mon, 15 Jul 2019 12:17:32 +0000 (14:17 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
typo [ci skip]
Remi Collet [Mon, 15 Jul 2019 12:17:23 +0000 (14:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
typo [ci skip]
Remi Collet [Mon, 15 Jul 2019 12:17:13 +0000 (14:17 +0200)]
typo [ci skip]
Remi Collet [Mon, 15 Jul 2019 12:12:13 +0000 (14:12 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78269 password_hash uses weak options for argon2
Fix #78269 password_hash uses weak options for argon2
Remi Collet [Mon, 15 Jul 2019 12:11:57 +0000 (14:11 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78269 password_hash uses weak options for argon2
Fix #78269 password_hash uses weak options for argon2
Remi Collet [Mon, 15 Jul 2019 12:11:38 +0000 (14:11 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78269 password_hash uses weak options for argon2
Remi Collet [Mon, 15 Jul 2019 12:11:30 +0000 (14:11 +0200)]
Fix #78269 password_hash uses weak options for argon2
Remi Collet [Mon, 15 Jul 2019 12:10:38 +0000 (14:10 +0200)]
Fix #78269 password_hash uses weak options for argon2
Christoph M. Becker [Mon, 15 Jul 2019 08:41:00 +0000 (10:41 +0200)]
Fix #65547: Default value for sunrise/sunset zenith still wrong
The value of the zenith angle to calculate sunrise and sunset times is
commonly defined as 90°50', and is "obtained by adding the average
apparent radius of the Sun (16') to the average amount of atmospheric
refraction at the horizon (34')", according to
http://aa.usno.navy.mil/faq/docs/RST_defs.php.
This value is also used for the Sunrise/Sunset Algorithm published in
the Almanac for Computers, 1990, see
https://web.archive.org/web/
20161202180207 /http://williams.best.vwh.net/sunrise_sunset_algorithm.htm.
Nikita Popov [Mon, 15 Jul 2019 11:49:36 +0000 (13:49 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Jul 2019 11:49:29 +0000 (13:49 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Jul 2019 10:52:18 +0000 (12:52 +0200)]
Merge branch 'PHP-7.4'