]>
granicus.if.org Git - php/log
Peter Kokot [Tue, 26 Jun 2018 23:09:48 +0000 (01:09 +0200)]
Remove outdated comments about PHP 3
Dmitry Stogov [Wed, 27 Jun 2018 09:33:20 +0000 (12:33 +0300)]
Fixed ZTS race condition (zend_class_entry->ce_flags of internal classes must not be modified, because internal class enties are shared between threads)
Xinchen Hui [Wed, 27 Jun 2018 08:49:05 +0000 (16:49 +0800)]
Add test for issue #1400
Xinchen Hui [Wed, 27 Jun 2018 05:09:54 +0000 (13:09 +0800)]
Update NEWS
Xinchen Hui [Wed, 27 Jun 2018 05:08:47 +0000 (13:08 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler)
Conflicts:
Zend/zend_vm_execute.h
Xinchen Hui [Wed, 27 Jun 2018 05:07:53 +0000 (13:07 +0800)]
Update NEWS
Xinchen Hui [Wed, 27 Jun 2018 05:07:36 +0000 (13:07 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler)
Conflicts:
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Xinchen Hui [Wed, 27 Jun 2018 05:05:11 +0000 (13:05 +0800)]
Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler)
Kalle Sommer Nielsen [Tue, 26 Jun 2018 20:38:00 +0000 (22:38 +0200)]
Minor cleanup in regards to magic_quotes in tests:
- dba008.phpt never runs anyway, no need to keep it
- bug75357.phpt has a branch that is never hit, which should not change the bug behavior in anyway
- bug55371.phpt added a simple 'done' test to not let the EXPECT section be empty
Dmitry Stogov [Tue, 26 Jun 2018 13:18:30 +0000 (16:18 +0300)]
Cleanup conditions
Dmitry Stogov [Tue, 26 Jun 2018 11:48:53 +0000 (14:48 +0300)]
Merge branch 'fetch_r_tmp'
* fetch_r_tmp:
Make FETCH_R/IS, FETCH_DIM_R/IS, FETCH_OBJ_R/IS, FETCH_STATIC_PROP_R/IS return TMP_VAR, instead of VAR.
Dmitry Stogov [Tue, 26 Jun 2018 08:23:37 +0000 (11:23 +0300)]
Restored zend_array_element_type() prototype
Dmitry Stogov [Mon, 25 Jun 2018 20:43:23 +0000 (23:43 +0300)]
Make FETCH_R/IS, FETCH_DIM_R/IS, FETCH_OBJ_R/IS, FETCH_STATIC_PROP_R/IS return TMP_VAR, instead of VAR.
Nikita Popov [Mon, 25 Jun 2018 17:00:37 +0000 (19:00 +0200)]
Remove unnecessary uses of z/ parameters
Dmitry Stogov [Mon, 25 Jun 2018 20:01:21 +0000 (23:01 +0300)]
Fixed ability to call plain functions through zend_call_method()
Dmitry Stogov [Mon, 25 Jun 2018 19:43:19 +0000 (22:43 +0300)]
typo
Dmitry Stogov [Mon, 25 Jun 2018 16:53:58 +0000 (19:53 +0300)]
Lazy function copying from op_cache SHM into process memory
Christoph M. Becker [Mon, 25 Jun 2018 16:00:26 +0000 (18:00 +0200)]
[ci skip] Remove obsolete task
INSTALL points to the online docs and win32/install.txt is removed as
of commit
1e9e7d4 [1].
[1] http://git.php.net/?p=php-src.git;a=commit;h=
1e9e7d4dc4949b67908e55ab3f3e44528923c029
Dmitry Stogov [Mon, 25 Jun 2018 14:32:13 +0000 (17:32 +0300)]
Micro-optimization
Nikita Popov [Mon, 25 Jun 2018 13:26:10 +0000 (15:26 +0200)]
Fix off-by-one error
Nikita Popov [Fri, 22 Jun 2018 10:58:48 +0000 (12:58 +0200)]
Fixed bug #76509
In PHP static properties are shared between inheriting classes,
unless they are explicitly overwritten. However, because this
functionality was implemented using reference, it was possible
to break the implementation by reassigning the static property
reference.
This is fixed by switching the implementation from using references
to using INDIRECTs, which cannot be affected by userland code.
Nikita Popov [Mon, 25 Jun 2018 12:27:02 +0000 (14:27 +0200)]
Update array_element_type inference for previous change
LIST_R and DIM_IS return value can't be MAY_BE_REF anymore.
Nikita Popov [Mon, 25 Jun 2018 12:23:06 +0000 (14:23 +0200)]
Use COPY_DEREF for DIM_IS and LIST_R as well
Also add an upgrading note for the behavior change, not that we
expect anyone to be affected...
Markus Staab [Mon, 25 Jun 2018 10:40:19 +0000 (12:40 +0200)]
[ci skip] fixed typos
Dmitry Stogov [Mon, 25 Jun 2018 10:35:14 +0000 (13:35 +0300)]
Added note about zend_function.reserved[] fields usage
Dmitry Stogov [Mon, 25 Jun 2018 10:07:44 +0000 (13:07 +0300)]
Improved type inference. Result of opcodes using ZVAL_COPY_DEREF can't be MAY_BE_REF.
Christoph M. Becker [Mon, 25 Jun 2018 09:56:36 +0000 (11:56 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix arginfo wrt. optional/required parameters
Christoph M. Becker [Mon, 25 Jun 2018 09:54:02 +0000 (11:54 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix arginfo wrt. optional/required parameters
Christoph M. Becker [Fri, 22 Jun 2018 13:45:31 +0000 (15:45 +0200)]
Fix arginfo wrt. optional/required parameters
All parameters of phpdbg_color(), phpdbg_exec() and phpdbg_prompt() are
required. We mark them as such.
Christoph M. Becker [Sun, 24 Jun 2018 15:30:55 +0000 (17:30 +0200)]
Remove useless PHPDBG_* constants
The sole purpose of `PHPDBG_FILE`, `PHPDBG_METHOD`, `PHPDBG_LINENO` and
`PHPDBG_FUNC` has been to be passed as first argument to `phpdbg_break`.
However, this functions is replaced as of PHP 5.6.3 by
`phpdbg_break_file`, `phpdbg_break_method` and 'phpdbg_break_func`,
respectively. Therefore, we're finally removing the useless constants.
Anatol Belski [Mon, 25 Jun 2018 09:32:03 +0000 (11:32 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Prepare tests for ICU 62.1
Anatol Belski [Mon, 25 Jun 2018 09:31:21 +0000 (11:31 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Prepare tests for ICU 62.1
Anatol Belski [Mon, 25 Jun 2018 09:30:14 +0000 (11:30 +0200)]
Prepare tests for ICU 62.1
Nikita Popov [Thu, 14 Jun 2018 21:34:26 +0000 (23:34 +0200)]
Use COPY_DEREF instead of COPY_UNREF
This fixes the behavior when the storage location of the fetch is
modified before the operand is dereferenced by the using VM opcode.
Furthermore it elimiates references as a possible return value from
*_R opcodes, which will give us more opportunities for inferences,
in particular in regard to typed properties.
Dusta [Sun, 24 Jun 2018 20:31:55 +0000 (22:31 +0200)]
Update http to https
COFFEE [Mon, 25 Jun 2018 05:26:38 +0000 (13:26 +0800)]
numner => number
Nikita Popov [Sun, 24 Jun 2018 20:29:07 +0000 (22:29 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Sun, 24 Jun 2018 20:28:49 +0000 (22:28 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sun, 24 Jun 2018 20:26:45 +0000 (22:26 +0200)]
Fixed bug #76502
Nikita Popov [Sun, 24 Jun 2018 11:34:32 +0000 (13:34 +0200)]
Remove expr_without_variable
We no longer need this distinction.
Anatol Belski [Fri, 22 Jun 2018 15:56:18 +0000 (17:56 +0200)]
Remove obsolete version checks in tests
Anatol Belski [Fri, 22 Jun 2018 15:33:57 +0000 (17:33 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 22 Jun 2018 15:27:41 +0000 (17:27 +0200)]
If there's no setlocale, char tables are not used
Nikita Popov [Fri, 22 Jun 2018 14:22:50 +0000 (16:22 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Fri, 22 Jun 2018 14:22:04 +0000 (16:22 +0200)]
Fixed bug #76520
Anatol Belski [Fri, 22 Jun 2018 13:13:29 +0000 (15:13 +0200)]
Don't discard char tables just generated
Remi Collet [Fri, 22 Jun 2018 12:58:30 +0000 (14:58 +0200)]
add note about php_url struct changes
Anatol Belski [Fri, 22 Jun 2018 12:37:59 +0000 (14:37 +0200)]
Improve locale character tables handling and reduce pattern cache size
If a locale other than C is active, character tables are saved into the
compile context. Every compiled pattern will have a pointer to the
character table, that was present in the context at the time of the
pattern compilation. Thus, the cache entries don't need to carry char
tables pointer, which reduces their size to 8 bytes on 64-bit. Instead,
the generated character tables are tracked in a separate HashTable. If a
character table was generated before, it'll be assigned to the compile
context when the locale changes. Otherwise a new char table will be
generated and cached.
Dmitry Stogov [Fri, 22 Jun 2018 11:29:54 +0000 (14:29 +0300)]
Reduced overhead of magic method calls (__get/__set/__unset/__isset/__dectructor/__clone).
Dmitry Stogov [Fri, 22 Jun 2018 11:28:29 +0000 (14:28 +0300)]
retval shouldn't be NULL
Dmitry Stogov [Fri, 22 Jun 2018 10:19:53 +0000 (13:19 +0300)]
Reduce spl_autoload() overhead
Anatol Belski [Fri, 22 Jun 2018 08:56:42 +0000 (10:56 +0200)]
Fixed bug #76514 Regression in preg_match makes it fail with PREG_JIT_STACKLIMIT_ERROR
Looks like some patterns might require more stack for JIT execution. It
is a regression, as the same pattern was passing using JIT.
Dmitry Stogov [Fri, 22 Jun 2018 09:04:49 +0000 (12:04 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Added parenthesis
Dmitry Stogov [Fri, 22 Jun 2018 09:04:39 +0000 (12:04 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Added parenthesis
Dmitry Stogov [Fri, 22 Jun 2018 09:04:23 +0000 (12:04 +0300)]
Added parenthesis
Dmitry Stogov [Thu, 21 Jun 2018 23:46:59 +0000 (02:46 +0300)]
Avoid duplication of "shadow" property_info
Christoph M. Becker [Thu, 21 Jun 2018 22:01:51 +0000 (00:01 +0200)]
Fix line endings in new PHPT
Christoph M. Becker [Thu, 21 Jun 2018 17:18:15 +0000 (19:18 +0200)]
Fix #76512: \w no longer includes unicode characters
The migration from PCRE to PCRE2 missed to rename once occurrence of
`PCRE_UCP` to `PCRE2_UCP`. We fix that. We also revert the changes to
bug52971.phpt which had been incorrectly made in commit
a5bc5ae [1].
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
a5bc5aed71f7a15f14f33bb31b8e17bf5f327e2d >
Jakub Zelenka [Thu, 21 Jun 2018 16:03:07 +0000 (17:03 +0100)]
Merge branch 'PHP-7.2'
Jakub Zelenka [Thu, 21 Jun 2018 16:02:44 +0000 (17:02 +0100)]
Make new openssl ext tests in 7.2 consitent
Jakub Zelenka [Thu, 21 Jun 2018 15:50:45 +0000 (16:50 +0100)]
Merge branch 'PHP-7.2'
Jakub Zelenka [Thu, 21 Jun 2018 15:47:08 +0000 (16:47 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Thu, 21 Jun 2018 15:43:32 +0000 (16:43 +0100)]
Use unix NL in all openssl ext tests
Jakub Zelenka [Thu, 21 Jun 2018 15:38:19 +0000 (16:38 +0100)]
Make code in openssl ext tests more consistent
Mainly use spaces for indent and fix some other CS issues. Also
drop checks for unsupported OpenSSL library versions.
Charles R. Portwood II [Fri, 15 Jun 2018 20:46:42 +0000 (15:46 -0500)]
RFC: Argon2 Password Hash Enhancements Implementation of Argon2id per RFC https://wiki.php.net/rfc/argon2_password_hash_enhancements
- m4 and Windows configure scripts now forces Argon2 reference library version >=
20161029
- Implementation tested against
20161029 and
20171227 for Argon2id support
- Updates Argon2 ext/standard/password/tests to run tests for both Argon2i and Argon2id
Peter Kokot [Tue, 19 Jun 2018 23:32:26 +0000 (01:32 +0200)]
Bump phar and hash extension version to match PHP version
Dmitry Stogov [Thu, 21 Jun 2018 10:09:25 +0000 (13:09 +0300)]
Avoid reusing zend_function.common.prototype for magic things (use reserved fields instead).
Anatol Belski [Thu, 21 Jun 2018 09:47:10 +0000 (11:47 +0200)]
Gereralize VA macro expansion mechanism
Avoids code duplication and makes in usable elsewhere.
Xinchen Hui [Thu, 21 Jun 2018 09:27:18 +0000 (17:27 +0800)]
Update NEWS
Xinchen Hui [Thu, 21 Jun 2018 09:26:57 +0000 (17:26 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
Xinchen Hui [Thu, 21 Jun 2018 09:26:45 +0000 (17:26 +0800)]
Update NEWS
Xinchen Hui [Thu, 21 Jun 2018 09:26:27 +0000 (17:26 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
Xinchen Hui [Thu, 21 Jun 2018 09:26:05 +0000 (17:26 +0800)]
Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
Stanislav Malyshev [Wed, 20 Jun 2018 17:42:04 +0000 (10:42 -0700)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Revert "ICU 59+ requires C++11 and errors out without the option"
Stanislav Malyshev [Wed, 20 Jun 2018 17:41:59 +0000 (10:41 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert "ICU 59+ requires C++11 and errors out without the option"
Stanislav Malyshev [Wed, 20 Jun 2018 17:41:41 +0000 (10:41 -0700)]
Revert "ICU 59+ requires C++11 and errors out without the option"
This reverts commit
5dd1ef90caec3021e6ce55c8554e695edf641eaf .
Nikita Popov [Wed, 20 Jun 2018 14:03:50 +0000 (16:03 +0200)]
Remove unnnecessary DEREF parameter
Nikita Popov [Wed, 20 Jun 2018 13:05:08 +0000 (15:05 +0200)]
Remove code duplication
And fix indentation
Nikita Popov [Wed, 20 Jun 2018 10:31:31 +0000 (12:31 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Wed, 20 Jun 2018 10:30:19 +0000 (12:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 12 Jun 2018 18:34:01 +0000 (20:34 +0200)]
Fixed bug #73342
Directly listen on socket, instead of duping it to STDIN and
listening on that.
Stanislav Malyshev [Wed, 20 Jun 2018 05:43:20 +0000 (22:43 -0700)]
Merge branch 'pull-request/3281'
* pull-request/3281:
Revert braces inside condition
Use .= where possible
Remove unncecessary parantheses
Remove unused variable old_php
Fix property name
Stanislav Malyshev [Tue, 19 Jun 2018 23:50:16 +0000 (16:50 -0700)]
Merge branch 'pull-request/3274'
* pull-request/3274:
Added const modifier
76363: added jsm extension to list of mime types
Stanislav Malyshev [Tue, 19 Jun 2018 23:43:52 +0000 (16:43 -0700)]
Merge branch 'pull-request/3288'
* pull-request/3288:
Fix bug #75481: makedev warning
Stanislav Malyshev [Tue, 19 Jun 2018 23:42:28 +0000 (16:42 -0700)]
Merge branch 'pull-request/3309'
* pull-request/3309:
phar module, unsignedness check changes. while at it, correcting seemingly subtle bug when checking extension validity.
Sara Golemon [Tue, 19 Jun 2018 22:20:38 +0000 (18:20 -0400)]
Move class constant definition to the right enum file
Christoph M. Becker [Tue, 19 Jun 2018 13:36:31 +0000 (15:36 +0200)]
Update NEWS for 7.3.0alpha3
Gabriel Caruso [Fri, 30 Mar 2018 20:44:31 +0000 (17:44 -0300)]
Report unknown variables passed to compact()
Robert Lu [Fri, 15 Jun 2018 06:08:49 +0000 (14:08 +0800)]
Fix bug #44217: Output after stdout/stderr closed cause immediate exit with status 0
We exit with status 255 instead.
David Carlier [Mon, 18 Jun 2018 14:08:50 +0000 (14:08 +0000)]
phar module, unsignedness check changes.
while at it, correcting seemingly subtle bug when checking
extension validity.
Dmitry Stogov [Mon, 18 Jun 2018 08:21:23 +0000 (11:21 +0300)]
Fixed bug #76466 (Loop variable confusion)
Xinchen Hui [Mon, 18 Jun 2018 04:14:17 +0000 (12:14 +0800)]
Fixed typo
Xinchen Hui [Mon, 18 Jun 2018 04:14:00 +0000 (12:14 +0800)]
use defined macro
Xinchen Hui [Mon, 18 Jun 2018 03:33:48 +0000 (11:33 +0800)]
Fixed bug #76437 (token_get_all with TOKEN_PARSE flag fails to recognise close tag)
Stanislav Malyshev [Sun, 17 Jun 2018 23:43:46 +0000 (16:43 -0700)]
Merge branch 'PHP-7.2'
* PHP-7.2:
ICU 59+ requires C++11 and errors out without the option
Fix #76300 - Dont attempt to change visibility of a parent private
Stanislav Malyshev [Sun, 17 Jun 2018 23:42:49 +0000 (16:42 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
ICU 59+ requires C++11 and errors out without the option
Stanislav Malyshev [Sun, 17 Jun 2018 23:00:06 +0000 (16:00 -0700)]
ICU 59+ requires C++11 and errors out without the option
Pedro Magalhães [Thu, 3 May 2018 20:25:12 +0000 (21:25 +0100)]
Fix #76300 - Dont attempt to change visibility of a parent private
Stanislav Malyshev [Sun, 17 Jun 2018 22:47:03 +0000 (15:47 -0700)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #76300 - Dont attempt to change visibility of a parent private
Stanislav Malyshev [Sun, 17 Jun 2018 22:26:42 +0000 (15:26 -0700)]
Merge branch 'pull-request/3233' into PHP-7.2
* pull-request/3233:
Fix #76300 - Dont attempt to change visibility of a parent private