]>
granicus.if.org Git - php/log
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'
Nikita Popov [Mon, 15 Jul 2019 10:51:01 +0000 (12:51 +0200)]
Emit T_BAD_CHARACTER for unexpected characters
Avoid having holes in the token stream which are annoying and
inefficient to reconstruct on the consumer side.
Nikita Popov [Mon, 15 Jul 2019 10:35:42 +0000 (12:35 +0200)]
Remove unused is_constructor arguments
Nikita Popov [Mon, 15 Jul 2019 10:00:30 +0000 (12:00 +0200)]
Fixed bug #78010
Prevent the gc_info from becoming all zero for a registered root
by setting the top bit to one for compressed root addresses.
Dmitry Stogov [Mon, 15 Jul 2019 08:36:11 +0000 (11:36 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
vectorize string-escape with NEON
Sebastian Pop [Wed, 10 Jul 2019 18:31:27 +0000 (18:31 +0000)]
vectorize string-escape with NEON
On this benchmark:
function simple_string_escape() {
$a = "test'asd'asd'' asd\'\"asdfasdf";
for($i=0; $i<512; $i++) {
$a .= chr($i%256);
}
for ($i = 0; $i < 100000; $i++) {
if ($a === stripslashes(addslashes($a)))
$a .= chr($i%256);
else {
echo "error at i=".$i."\n";
return;
}
}
}
the execution time goes from 21.619s to 8.139s (165% speedup) on an A1 Graviton instance.
When removing the characters that need escaping, i.e., this benchmark:
function simple_string() {
$a = "testasdasd asdasdfasdf";
for ($i = 0; $i < 10000; $i++) {
if ($a === stripslashes(addslashes($a)))
$a .= "test dedeasdf";
else {
echo "error at i=".$i."\n";
return;
}
}
}
the execution time goes from 2.932s down to 0.516s (468% speedup) on an A1 Graviton instance.
Nikita Popov [Mon, 15 Jul 2019 08:29:45 +0000 (10:29 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Jul 2019 08:29:37 +0000 (10:29 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Jul 2019 08:23:27 +0000 (10:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Andrew Collington [Sun, 14 Jul 2019 13:49:38 +0000 (14:49 +0100)]
Fix bug #78291 Missing opcache directives
New opcache directives have been added recently which are returned
if using `ini_get_all('zend opcache')` but are not listed in the
directives if using `opcache_get_configuration()`. This fix adds
those missing directives as well as if `opcache.mmap_base` is used
instead of `opcache.lockfile_path`. Also adds a test to ensure the
directives match with both methods of fetching.
Peter Kokot [Sun, 14 Jul 2019 21:45:13 +0000 (23:45 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove usage of PHP_AIX_LDFLAGS
Peter Kokot [Sun, 14 Jul 2019 21:44:01 +0000 (23:44 +0200)]
Remove usage of PHP_AIX_LDFLAGS
These are currently not defined since their usage has been removed via
51ca2dba530883a8e07d6869e66ee6c5b3c978a6
and
53349d69ddf7a2ba128f0928fb3b376422611a3b
Peter Kokot [Sun, 14 Jul 2019 21:02:52 +0000 (23:02 +0200)]
Symbol HAVE_PCRE has been removed
Peter Kokot [Sun, 14 Jul 2019 20:24:59 +0000 (22:24 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove conditional calls of always available macros
Peter Kokot [Sun, 14 Jul 2019 20:24:21 +0000 (22:24 +0200)]
Remove conditional calls of always available macros
These checks were once relevant for these extensions in PECL and PHP
versions without availability of the checked macros.
Closes GH-4405
Peter Kokot [Sun, 14 Jul 2019 19:08:19 +0000 (21:08 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unsed zts check for sqlite3
Peter Kokot [Sun, 14 Jul 2019 19:06:15 +0000 (21:06 +0200)]
Remove unsed zts check for sqlite3
This check was relevant with bundled sqlite library. Removed via
6083a387a81dbbd66d6316a3a12a63f06d5f7109
Closes GH-4403
Peter Kokot [Sun, 14 Jul 2019 12:46:55 +0000 (14:46 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove duplicate PTHREADS template define
Peter Kokot [Sun, 14 Jul 2019 12:45:27 +0000 (14:45 +0200)]
Remove duplicate PTHREADS template define
The undef PTHREADS converts to define if thread safety is configured.
This step is already done by pthreads m4 macros from TSRM so this now
removes duplicated PTHREADS defines from php_config.h.
Peter Kokot [Sun, 14 Jul 2019 11:50:43 +0000 (13:50 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove timelib outdated defines
Peter Kokot [Sun, 14 Jul 2019 11:50:05 +0000 (13:50 +0200)]
Remove timelib outdated defines
- TIMELIB_OMIT_STDINT is not used anymore since
https://github.com/derickr/timelib/commit/
a171f99cf02baf39549ab7209e37565b8b8f6529
- HAVE_GETTIMEOFDAY was defined multiple times in Windows headers
- ext/date/lib/timelib_config.h.win32 does not seem to be used
Closes GH-4400
Peter Kokot [Sun, 14 Jul 2019 11:49:18 +0000 (13:49 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove PHP_MYSQL variable
Peter Kokot [Sun, 14 Jul 2019 11:48:44 +0000 (13:48 +0200)]
Remove PHP_MYSQL variable
PHP_MYSQL variable was once defined by the ext/mysql (--with-mysql).
Closes GH-4399
Peter Kokot [Sat, 13 Jul 2019 13:38:58 +0000 (15:38 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update changelogs
Peter Kokot [Sat, 13 Jul 2019 13:37:36 +0000 (15:37 +0200)]
Update changelogs
- PHP-7.4 alpha, beta, RC versions already include bugs logged in the
NEWS
- some links to RFCs
- php_error_docref0
Peter Kokot [Sat, 13 Jul 2019 13:06:53 +0000 (15:06 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove php_multiple_shlib_versions_ok
Peter Kokot [Sat, 13 Jul 2019 13:06:35 +0000 (15:06 +0200)]
Remove php_multiple_shlib_versions_ok
Variable usage was removed via
913cec65517f11ebd972f920d1d320b853a175dd
Peter Kokot [Sat, 13 Jul 2019 12:53:07 +0000 (14:53 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused recode extension artefacts
Peter Kokot [Sat, 13 Jul 2019 12:52:36 +0000 (14:52 +0200)]
Remove unused recode extension artefacts
Closes GH-4395
Peter Kokot [Sat, 13 Jul 2019 12:49:00 +0000 (14:49 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove checks for always enabled spl and pcre
Peter Kokot [Sat, 13 Jul 2019 12:47:37 +0000 (14:47 +0200)]
Remove checks for always enabled spl and pcre
Closes GH-4397
Peter Kokot [Sat, 13 Jul 2019 12:40:17 +0000 (14:40 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove WARNING_LEVEL fix for QNX
Peter Kokot [Sat, 13 Jul 2019 12:39:29 +0000 (14:39 +0200)]
Remove WARNING_LEVEL fix for QNX
Fix is no longer relevant since the environment variable WARNING_LEVEL
is no longer used to define the value of the -w option for cc.
Closes GH-4398
Christoph M. Becker [Sat, 13 Jul 2019 10:03:59 +0000 (12:03 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78283: no output for explicit environment
Christoph M. Becker [Sat, 13 Jul 2019 10:01:33 +0000 (12:01 +0200)]
Fix #78283: no output for explicit environment
This test does not work on Windows, if the child process has OPcache
enabled via php.ini, since TEMP is not set in the environment, so
OPcache can't find the base address file, and terminates the childs.
To avoid this (and potentially some other issues regarding missing
environment variables, such as PATH), we force the child process to
ignore any ini files.
Christoph M. Becker [Sat, 13 Jul 2019 07:45:14 +0000 (09:45 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78282: atime and mtime mismatch
Christoph M. Becker [Sat, 13 Jul 2019 07:40:50 +0000 (09:40 +0200)]
Fix #78282: atime and mtime mismatch
The fix for bug #78241 assumed that `time_t` would always be 64bit, but
actually is 32bit for x86. We therefore enforce 64bit arithmetic to
avoid wrapping.
Peter Kokot [Sat, 13 Jul 2019 00:10:17 +0000 (02:10 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Convert all php_error_docref0 to php_error_docref