]>
granicus.if.org Git - php/log
Christoph M. Becker [Sat, 6 Oct 2018 10:01:22 +0000 (12:01 +0200)]
Fix PHPT ENV sections
run-tests.php assumes the contents of an ENV section are a simple list
of key-value-pairs, instead of evaluating the section contents as PHP
script which server-tests.php did. Since server-tests.php is gone, we
remove the superfluous and confusing scripting.
Nikita Popov [Sat, 6 Oct 2018 09:22:24 +0000 (11:22 +0200)]
Merge branch 'PHP-7.3'
Michael Moravec [Fri, 5 Oct 2018 22:07:41 +0000 (00:07 +0200)]
Fix bug #76979: define() error message does not mention resources as valid values
Christoph M. Becker [Sat, 6 Oct 2018 09:06:59 +0000 (11:06 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #76975: preg_match difference between 7.3 and < 7.3 - II
Christoph M. Becker [Sat, 6 Oct 2018 09:05:41 +0000 (11:05 +0200)]
Fix #76975: preg_match difference between 7.3 and < 7.3 - II
[ci skip]
Anatol Belski [Fri, 5 Oct 2018 21:01:20 +0000 (23:01 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 21:01:03 +0000 (23:01 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 21:00:24 +0000 (23:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:59:55 +0000 (22:59 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 20:57:45 +0000 (22:57 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:57:27 +0000 (22:57 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 20:51:58 +0000 (22:51 +0200)]
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:54:03 +0000 (22:54 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Add test for bug #76942
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
Anatol Belski [Fri, 5 Oct 2018 20:53:11 +0000 (22:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add test for bug #76942
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
Anatol Belski [Fri, 5 Oct 2018 20:52:53 +0000 (22:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add test for bug #76942
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
Anatol Belski [Fri, 5 Oct 2018 20:51:58 +0000 (22:51 +0200)]
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:50:34 +0000 (22:50 +0200)]
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
ref bug #74484
Nikita Popov [Fri, 5 Oct 2018 19:34:04 +0000 (21:34 +0200)]
Merge branch 'PHP-7.3'
twosee [Mon, 1 Oct 2018 11:22:25 +0000 (19:22 +0800)]
Optimize MySQL statement execute without parameters
Nikita Popov [Fri, 5 Oct 2018 16:42:45 +0000 (18:42 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Fri, 5 Oct 2018 16:41:42 +0000 (18:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 5 Oct 2018 16:41:16 +0000 (18:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Manuel Mausz [Thu, 4 Oct 2018 16:40:26 +0000 (18:40 +0200)]
Fix #76972: FTP data truncation due to forceful ssl socket shutdown
Do a correct bidirectional shutdown instead
Pedro Magalhães [Thu, 4 Oct 2018 22:28:53 +0000 (23:28 +0100)]
Use HT_MIN_SIZE when duplicating an empty array
Nikita Popov [Thu, 4 Oct 2018 19:42:46 +0000 (21:42 +0200)]
Remove unused backpatch_count field
Anatol Belski [Thu, 4 Oct 2018 17:17:22 +0000 (19:17 +0200)]
Ensure target is \0 terminated
Nikita Popov [Thu, 4 Oct 2018 08:56:43 +0000 (10:56 +0200)]
Clarify that the get_properties handler is required
Some places were checking for non-null get_properties, some weren't.
Make it clear that the handler is required and such checks are not
necessary.
Nikita Popov [Thu, 4 Oct 2018 08:58:20 +0000 (10:58 +0200)]
Fix incorrect printf modifier after size_t changes
Remi Collet [Thu, 4 Oct 2018 09:46:37 +0000 (11:46 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Allow to disable pcre.jit when system library is used as it is for now broken on some arch (s390x...)
Remi Collet [Thu, 4 Oct 2018 09:45:35 +0000 (11:45 +0200)]
Allow to disable pcre.jit when system library is used
as it is for now broken on some arch (s390x...)
Pierrick Charron [Thu, 4 Oct 2018 01:19:05 +0000 (21:19 -0400)]
Merge branch 'PHP-7.3'
Pierrick Charron [Thu, 4 Oct 2018 01:18:47 +0000 (21:18 -0400)]
Update NEWS [ci skip]
Pierrick Charron [Wed, 3 Oct 2018 23:44:46 +0000 (19:44 -0400)]
Merge branch 'PHP-7.3'
Pierrick Charron [Wed, 3 Oct 2018 23:43:59 +0000 (19:43 -0400)]
Add constants from curl 7.50 to 7.55
Christoph M. Becker [Wed, 3 Oct 2018 22:47:52 +0000 (00:47 +0200)]
Fix PRIMARY MAINTAINER and MAINTENANCE fields
We have to distinguish between `PRIMARY_MAINTAINER` and `MAINTENANCE`.
Furthermore, all extensions should have both fields.
Christoph M. Becker [Wed, 3 Oct 2018 22:30:40 +0000 (00:30 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
libzip has been unbundled in master only
Christoph M. Becker [Wed, 3 Oct 2018 22:30:10 +0000 (00:30 +0200)]
libzip has been unbundled in master only
Cf. <https://github.com/php/php-src/pull/3532>.
Anatol Belski [Wed, 3 Oct 2018 21:10:30 +0000 (23:10 +0200)]
Reuse delivered length
Fix length calculation
Anatol Belski [Wed, 3 Oct 2018 19:17:52 +0000 (21:17 +0200)]
Add compatibility bit
readlink in PHP doesn't error on regular files.
Dmitry Stogov [Wed, 3 Oct 2018 17:15:30 +0000 (20:15 +0300)]
Removed wrong reference counting
Anatol Belski [Wed, 3 Oct 2018 17:11:31 +0000 (19:11 +0200)]
Update UPGRADING [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:56:08 +0000 (18:56 +0200)]
Refactor php_sys_readlink
Also move the implementation into win32 where it belongs
Anatol Belski [Wed, 3 Oct 2018 16:54:47 +0000 (18:54 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:54:08 +0000 (18:54 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:52:21 +0000 (18:52 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update NEWS [ci skip]
Update NEWS [ci skip]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:51:48 +0000 (18:51 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:50:24 +0000 (18:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS [ci skip]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:49:52 +0000 (18:49 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:49:13 +0000 (18:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:48:40 +0000 (18:48 +0200)]
Update NEWS [ci skip]
Dmitry Stogov [Wed, 3 Oct 2018 15:32:25 +0000 (18:32 +0300)]
More careful handling of function prototypes
Dmitry Stogov [Wed, 3 Oct 2018 14:43:08 +0000 (17:43 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Avoid code duplication and don't miss env restore
Anatol Belski [Wed, 3 Oct 2018 12:36:09 +0000 (14:36 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Avoid code duplication and don't miss env restore
Anatol Belski [Wed, 3 Oct 2018 12:35:38 +0000 (14:35 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Avoid code duplication and don't miss env restore
Anatol Belski [Wed, 3 Oct 2018 12:34:08 +0000 (14:34 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Avoid code duplication and don't miss env restore
Anatol Belski [Wed, 3 Oct 2018 12:32:52 +0000 (14:32 +0200)]
Avoid code duplication and don't miss env restore
Dmitry Stogov [Wed, 3 Oct 2018 12:01:53 +0000 (15:01 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Hopefully last round of size_t fixes, this makes the remaining php_hash_ops use size_t over an int
Kalle Sommer Nielsen [Wed, 3 Oct 2018 11:36:30 +0000 (13:36 +0200)]
Merge branch 'master' of git.php.net:/php-src
Kalle Sommer Nielsen [Wed, 3 Oct 2018 11:36:05 +0000 (13:36 +0200)]
Hopefully last round of size_t fixes, this makes the remaining php_hash_ops use size_t over an int
Dmitry Stogov [Wed, 3 Oct 2018 11:35:36 +0000 (14:35 +0300)]
typo
Remi Collet [Wed, 3 Oct 2018 10:59:46 +0000 (12:59 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
bump zip extension version
Remi Collet [Wed, 3 Oct 2018 10:59:31 +0000 (12:59 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
bump zip extension version
Remi Collet [Wed, 3 Oct 2018 10:59:01 +0000 (12:59 +0200)]
bump zip extension version
Anatol Belski [Wed, 3 Oct 2018 10:15:54 +0000 (12:15 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Anatol Belski [Wed, 3 Oct 2018 10:15:15 +0000 (12:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Anatol Belski [Wed, 3 Oct 2018 10:13:22 +0000 (12:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Anatol Belski [Wed, 3 Oct 2018 10:11:43 +0000 (12:11 +0200)]
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Kalle Sommer Nielsen [Wed, 3 Oct 2018 09:36:30 +0000 (11:36 +0200)]
Merge branch 'master' of git.php.net:/php-src
Kalle Sommer Nielsen [Wed, 3 Oct 2018 09:36:11 +0000 (11:36 +0200)]
Remove $ext_shared usage for ext/hash in the Unix build script (Thanks Christoph for the notice)
Dmitry Stogov [Wed, 3 Oct 2018 09:33:36 +0000 (12:33 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Second round of fixing compiler warnings in ext/hash. Lots of the signatures that previously was unsigned int is now size_t, there was a fair bit of inconsistency there already and this commit should make it all sync nicely
Write to correct smart_str
Revert "Fix compiler warnings in ext/hash"
Kalle Sommer Nielsen [Wed, 3 Oct 2018 09:33:15 +0000 (11:33 +0200)]
Merge branch 'master' of git.php.net:/php-src
Kalle Sommer Nielsen [Wed, 3 Oct 2018 09:32:57 +0000 (11:32 +0200)]
Second round of fixing compiler warnings in ext/hash. Lots of the signatures that previously was unsigned int is now size_t, there was a fair bit of inconsistency there already and this commit should make it all sync nicely
Dmitry Stogov [Wed, 3 Oct 2018 09:32:33 +0000 (12:32 +0300)]
Avoid method compatibility check with itself
Dmitry Stogov [Wed, 3 Oct 2018 09:31:47 +0000 (12:31 +0300)]
Added assertions
Nikita Popov [Wed, 3 Oct 2018 09:03:55 +0000 (11:03 +0200)]
Write to correct smart_str
Mixed this up during the migration to ZEND_HASH_FOREACH.
Nikita Popov [Wed, 3 Oct 2018 08:50:38 +0000 (10:50 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Wed, 3 Oct 2018 08:50:27 +0000 (10:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 3 Oct 2018 08:50:16 +0000 (10:50 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 3 Oct 2018 08:48:42 +0000 (10:48 +0200)]
Reflection: Copy invoke function also in the variadic case
It doesn't matter how the parameters are provided, we always have
to copy the trampoline invoke function.
Nikita Popov [Tue, 2 Oct 2018 21:28:38 +0000 (23:28 +0200)]
Remove uses of apply_with_arguments API in reflection
Instead of ZEND_HASH_FOREACH. As a side-effect, this fixes a latent
bug in _addmethod, where a zval was interpreted as a zval*.
Also apply some optimizations to getProperties() while at it: For
declared properties, use the HT key instead of unmangling the
property name. For dynamic properties check INDIRECT instead of
looking up prop info to determine if the property is dynamic.
Kalle Sommer Nielsen [Wed, 3 Oct 2018 08:37:20 +0000 (10:37 +0200)]
Revert "Fix compiler warnings in ext/hash"
This reverts commit
596fbf7393777cb14006813111875db5b0a21d3b .
Kalle Sommer Nielsen [Wed, 3 Oct 2018 06:48:27 +0000 (08:48 +0200)]
Fix compiler warnings in ext/hash
Kalle Sommer Nielsen [Wed, 3 Oct 2018 06:48:11 +0000 (08:48 +0200)]
Update hash tests for consistency in their titles and remove the skipif sections (except for the mhash related tests)
Kalle Sommer Nielsen [Wed, 3 Oct 2018 06:47:07 +0000 (08:47 +0200)]
Implemented RFC "Always available hash extension"
Anatol Belski [Tue, 2 Oct 2018 22:22:34 +0000 (00:22 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76947 file_put_contents() blocks the directory of the file (__DIR__)
Anatol Belski [Tue, 2 Oct 2018 22:15:43 +0000 (00:15 +0200)]
Fixed bug #76947 file_put_contents() blocks the directory of the file (__DIR__)
The condition was wrong. The target buffer size only matters, when some
output is going to be copied into it.
Nikita Popov [Tue, 2 Oct 2018 17:50:55 +0000 (19:50 +0200)]
Some reflection cleanups
Use zend_string and zend_string_tolower in more places, clean up
__invoke handling slightly.
Nikita Popov [Tue, 2 Oct 2018 16:20:30 +0000 (18:20 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 2 Oct 2018 16:20:15 +0000 (18:20 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 2 Oct 2018 16:19:53 +0000 (18:19 +0200)]
Fixed bug #66430
Nikita Popov [Tue, 2 Oct 2018 15:49:08 +0000 (17:49 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 2 Oct 2018 15:48:56 +0000 (17:48 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 2 Oct 2018 15:47:07 +0000 (17:47 +0200)]
Fixed bug #76936
Nikita Popov [Tue, 2 Oct 2018 14:14:36 +0000 (16:14 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 2 Oct 2018 14:13:51 +0000 (16:13 +0200)]
Fixed bug #76958
Nikita Popov [Tue, 2 Oct 2018 14:07:22 +0000 (16:07 +0200)]
Don't fall back to vtbl_pass if no matching vtbl found
If we don't know how to convert between two encodings, make sure
we error instead of ignoring the issue.
Explicitly use vtbl_pass if we are round-tripping wchar->wchar or
8bit->8bit. Fingers crossed that nothing else relies on the
vtbl_pass fallback...
Dmitry Stogov [Tue, 2 Oct 2018 12:38:55 +0000 (15:38 +0300)]
typo
Dmitry Stogov [Tue, 2 Oct 2018 06:51:06 +0000 (09:51 +0300)]
Make ZEND_ACC_IMMUTABLE and ZEND_ACC_HAS_TYPE_HINTS to be common (for functions and classes)
Dmitry Stogov [Tue, 2 Oct 2018 06:10:04 +0000 (09:10 +0300)]
Rename ZEND_ACC_NO_RT_ARENA into ZEND_ACC_HEAP_RT_CACHE and use it for pseudo-main op_arrays.
Dmitry Stogov [Mon, 1 Oct 2018 16:05:31 +0000 (19:05 +0300)]
Allocate only necessary space for static properties of internal classes in ZTS mode.