]>
granicus.if.org Git - php/log
Christoph M. Becker [Sat, 10 Mar 2018 16:28:32 +0000 (17:28 +0100)]
Fix #69948: path/domain are not sanitized in setcookie
For improved security, characters not allowed for name and value should
also be forbidden for path and domain.
Christoph M. Becker [Sun, 11 Mar 2018 12:04:44 +0000 (13:04 +0100)]
Implement #51368: php_filter_float does not allow custom thousand separators
A set of hard-coded thousand separator characters (presently, `',.`) is
somewhat limited (users may prefer other separators, such as spaces or
underscores), as well as somewhat too liberal (arbitrary combinations
of different thousand separators are presently possible). Therefore we
introduce a `thousand` option analogous to `decimal`, which allows to
define the desired thousand separators as non-empty string, defaulting
to `',.`. While we easily could support empty strings here as well,
that would not make much sense, since this behavior can more easily be
accomplished by not setting the `FILTER_FLAG_ALLOW_THOUSAND` flag in
the first place.
Nikita Popov [Sat, 24 Mar 2018 12:16:31 +0000 (13:16 +0100)]
Merge branch 'PHP-7.2'
Nikita Popov [Sat, 24 Mar 2018 12:15:59 +0000 (13:15 +0100)]
Followup fix for bug #75729
The case of overloaded substr() with 3 arguments was not handled.
Derick Rethans [Sat, 24 Mar 2018 11:26:17 +0000 (11:26 +0000)]
Updated to version 2018.4 (2018d)
Derick Rethans [Sat, 24 Mar 2018 11:26:17 +0000 (11:26 +0000)]
Empty merge
Derick Rethans [Sat, 24 Mar 2018 11:26:16 +0000 (11:26 +0000)]
Updated to version 2018.4 (2018d)
Derick Rethans [Sat, 24 Mar 2018 11:26:16 +0000 (11:26 +0000)]
Empty merge
Derick Rethans [Sat, 24 Mar 2018 11:26:15 +0000 (11:26 +0000)]
Updated to version 2018.4 (2018d)
Nikita Popov [Fri, 23 Mar 2018 21:04:18 +0000 (22:04 +0100)]
Merge branch 'PHP-7.2'
Michael Heimpold [Wed, 14 Feb 2018 13:46:17 +0000 (14:46 +0100)]
Fixed bug #75722: Rework valgrind detection
As described in bug report #75722, the configure script (acinclude.m4)
currently searches for the valgrind header file and enables valgrind
support if found.
When cross-compiling the searched paths are invalid for the target
platform because they belong to the host system. At the moment, there is
no way to tell the build system a dedicated path where to look for the
header file.
This leads to the issue, that when cross-compiling eg. for ARMv5 platform,
that valgrind header file is detected - e.g. because host system is amd64 -
and support is enabled - but target platform will never support valgrind
(valgrind requires e.g. at least ARMv7).
This change reworks the detection so that user could manually opt-in
valgrind support and optionally specify a directory where the build system
should look for the header file using the --with-valgrind option.
Tom Van Looy [Tue, 20 Feb 2018 18:57:48 +0000 (19:57 +0100)]
Fix expat_compat.h path used in #include
Using ext/xml/expat_compat.h does not work if the extension is
compiled out-of-tree.
Gabriel Caruso [Tue, 27 Feb 2018 05:05:31 +0000 (02:05 -0300)]
Small improvements to run-tests
* substr instead of preg_match
* cast instead of settype
* remove $borked and check if $bork_info isn't null to report borked
tests
* remove some error control operators
Nikita Popov [Fri, 23 Mar 2018 20:14:58 +0000 (21:14 +0100)]
Merge branch 'PHP-7.2'
Thomas Petazzoni [Mon, 26 Feb 2018 18:30:55 +0000 (19:30 +0100)]
main/php_ini.c: build empty php_load_zend_extension_cb() when !HAVE_LIBDL
Commit
0782a7fc6314c8bd3cbfd57f12d0479bf9cc8dc7 ("Fixed bug #74866
extension_dir = "./ext" now use current directory for base") modified
the php_load_zend_extension_cb() function to use php_load_shlib(), and
pass a handle to the newly introduced zend_load_extension_handle()
function instead of passing the extension path to
zend_load_extension().
While doing so, it introduced a call to php_load_shlib() from code
that is built even when HAVE_LIBDL is not defined. However,
php_load_shlib() is not implemented when HAVE_LIBDL is not defined,
for obvious reasons.
It turns out that zend_load_extension_handle() anyway doesn't do
anything when ZEND_EXTENSIONS_SUPPORT is defined to 0, and
ZEND_EXTENSIONS_SUPPORT is not defined when HAVE_LIBDL is not defined
(Zend/zend_portability.h).
Fixes the following build failure when building on a system that
doesn't have libdl:
main/php_ini.o: In function `php_load_zend_extension_cb':
php_ini.c:(.text+0x478): undefined reference to `php_load_shlib'
php_ini.c:(.text+0x4b0): undefined reference to `php_load_shlib'
collect2: error: ld returned 1 exit status
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
David Carlier [Sat, 10 Mar 2018 08:03:12 +0000 (08:03 +0000)]
Don't use optimize pragmas with clang
Khan M Rashedun-Naby [Sat, 17 Mar 2018 11:46:01 +0000 (17:46 +0600)]
Fix typo in crc32.h
Niklas Keller [Wed, 21 Mar 2018 13:35:26 +0000 (14:35 +0100)]
Drop double CHECK_NULL_PATH check for PHARs
Gabriel Caruso [Sat, 10 Mar 2018 23:20:27 +0000 (20:20 -0300)]
Use ZEND_ARG_ARRAY_INFO in DateTime*::__set_state
Nikita Popov [Fri, 23 Mar 2018 17:57:16 +0000 (18:57 +0100)]
Merge branch 'PHP-7.2'
atvoicu [Wed, 21 Mar 2018 21:45:14 +0000 (14:45 -0700)]
Add missing skip prefix for some SKIPIF messages
Dmitry Stogov [Fri, 23 Mar 2018 13:11:27 +0000 (16:11 +0300)]
Remove "hot" mark from JMP(Z|NZ|ZNZ) with IS_CONST operand
Dmitry Stogov [Fri, 23 Mar 2018 12:17:10 +0000 (15:17 +0300)]
Fixed bug #75982 ($_SERVER mostly empty with default variables_order GPCS on FastCGI/CGI)
Dmitry Stogov [Fri, 23 Mar 2018 10:59:47 +0000 (13:59 +0300)]
Mark few more opcode handlers as "hot".
Paul Crovella [Fri, 23 Mar 2018 06:03:36 +0000 (23:03 -0700)]
[ci skip] Add normalizer_get_raw_decomposition to UPGRADING
Paul Crovella [Wed, 21 Mar 2018 00:33:23 +0000 (17:33 -0700)]
Add normalizer_get_raw_decomposition function
Implements #76111 https://bugs.php.net/bug.php?id=76111
Dmitry Stogov [Thu, 22 Mar 2018 21:13:45 +0000 (00:13 +0300)]
Optimize zend_hash_real_init()
Dmitry Stogov [Thu, 22 Mar 2018 13:37:34 +0000 (16:37 +0300)]
Dmitry Stogov [Thu, 22 Mar 2018 10:03:45 +0000 (13:03 +0300)]
Make ZEND_ISSET_ISEMPTY_CV specialised across ISSET/ISEMPTY and HOT (the handler is really small, so inlining affects executor size insignificantly)
Dmitry Stogov [Thu, 22 Mar 2018 10:02:49 +0000 (13:02 +0300)]
Allow extra specialisation for ISSET/ISEMPTY handlers
Dmitry Stogov [Thu, 22 Mar 2018 09:48:22 +0000 (12:48 +0300)]
Fixed expectation
Dmitry Stogov [Thu, 22 Mar 2018 08:33:17 +0000 (11:33 +0300)]
Reduce overhead of extra-specialization for opcode handler selection.
Dmitry Stogov [Wed, 21 Mar 2018 23:41:49 +0000 (02:41 +0300)]
Improve HashTable iterators handling:
- Avoid iterators check/update on each HashTable update opration
- Keep position equal (or above) nNumUsed instead of HT_INVALID_IDX
- Fixed iterators handling in array_unshift()
Anatol Belski [Wed, 21 Mar 2018 12:18:20 +0000 (13:18 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update SDK version for AppVeyor
Anatol Belski [Wed, 21 Mar 2018 12:17:44 +0000 (13:17 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update SDK version for AppVeyor
Anatol Belski [Wed, 21 Mar 2018 12:15:29 +0000 (13:15 +0100)]
Update SDK version for AppVeyor
Dmitry Stogov [Wed, 21 Mar 2018 09:39:56 +0000 (12:39 +0300)]
Micro optimization
Dmitry Stogov [Wed, 21 Mar 2018 08:57:54 +0000 (11:57 +0300)]
Micro optimization
Anatol Belski [Tue, 20 Mar 2018 21:03:03 +0000 (22:03 +0100)]
Rework datatypes wrt warnings
Christoph M. Becker [Tue, 20 Mar 2018 13:42:57 +0000 (14:42 +0100)]
Update to Oniguruma 6.8.1
Christoph M. Becker [Tue, 20 Mar 2018 16:02:52 +0000 (17:02 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #76113: mbstring does not build with Oniguruma 6.8.1
Christoph M. Becker [Tue, 20 Mar 2018 15:52:42 +0000 (16:52 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76113: mbstring does not build with Oniguruma 6.8.1
Christoph M. Becker [Tue, 20 Mar 2018 15:35:39 +0000 (16:35 +0100)]
Fix #76113: mbstring does not build with Oniguruma 6.8.1
As of Oniguruma 6.8.1, the regex structure has been moved from the
public `oniguruma.h` to the private `regint.h`. Thus, it is no longer
possible to directly access the struct's members, and actually, there
is no need to, since there are respective accessor functions available
at least of 2.3.1.
Anatol Belski [Tue, 20 Mar 2018 10:12:25 +0000 (11:12 +0100)]
Use const pointers
Christoph M. Becker [Mon, 19 Mar 2018 13:48:10 +0000 (14:48 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #75944: Wrong cp1251 detection
Anatol Belski [Mon, 19 Mar 2018 13:38:41 +0000 (14:38 +0100)]
Reuse new alignment macros
Christoph M. Becker [Mon, 19 Mar 2018 13:25:44 +0000 (14:25 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75944: Wrong cp1251 detection
Christoph M. Becker [Mon, 19 Mar 2018 12:51:40 +0000 (13:51 +0100)]
Fix #75944: Wrong cp1251 detection
`\xFF` is a valid character of CP-1251.
Anatol Belski [Mon, 19 Mar 2018 10:44:27 +0000 (11:44 +0100)]
Eliminate cast
Stanislav Malyshev [Mon, 19 Mar 2018 08:18:54 +0000 (01:18 -0700)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Set tests exit status by defaul - also in other instance.
Stanislav Malyshev [Mon, 19 Mar 2018 08:17:36 +0000 (01:17 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Set tests exit status by defaul - also in other instance.
Stanislav Malyshev [Mon, 19 Mar 2018 08:17:14 +0000 (01:17 -0700)]
Set tests exit status by defaul - also in other instance.
Stanislav Malyshev [Sun, 18 Mar 2018 22:07:53 +0000 (15:07 -0700)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Set tests exit status by default.
Stanislav Malyshev [Sun, 18 Mar 2018 22:06:08 +0000 (15:06 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Set tests exit status by default.
Stanislav Malyshev [Sun, 18 Mar 2018 22:04:50 +0000 (15:04 -0700)]
Set tests exit status by default.
Use REPORT_EXIT_STATUS=0 or REPORT_EXIT_STATUS=no to prevent it.
Based on discussion in https://www.mail-archive.com/internals@lists.php.net/msg94141.html
Anatol Belski [Sat, 17 Mar 2018 20:17:47 +0000 (21:17 +0100)]
Mark non exported symbol as static
Anatol Belski [Sat, 17 Mar 2018 11:45:22 +0000 (12:45 +0100)]
Use const pointers
Anatol Belski [Fri, 16 Mar 2018 19:36:41 +0000 (20:36 +0100)]
Use const pointers where appropriate
Anatol Belski [Fri, 16 Mar 2018 17:57:32 +0000 (18:57 +0100)]
Switch to placeholder matching
Anatol Belski [Fri, 16 Mar 2018 17:56:55 +0000 (18:56 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Sync test with newer output
Anatol Belski [Fri, 16 Mar 2018 17:56:08 +0000 (18:56 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync test with newer output
Anatol Belski [Fri, 16 Mar 2018 17:54:55 +0000 (18:54 +0100)]
Sync test with newer output
Czech Republic vs. newer Czechia
Anatol Belski [Fri, 16 Mar 2018 14:42:41 +0000 (15:42 +0100)]
Use const pointers at some appropriate places
Xinchen Hui [Fri, 16 Mar 2018 08:01:32 +0000 (16:01 +0800)]
slashchars are 16 bytes aligned
Xinchen Hui [Fri, 16 Mar 2018 05:23:35 +0000 (13:23 +0800)]
Fixed folder
Xinchen Hui [Fri, 16 Mar 2018 02:52:57 +0000 (10:52 +0800)]
Optimized str_rot13 with SSE2 instructions
Anatol Belski [Thu, 15 Mar 2018 20:17:40 +0000 (21:17 +0100)]
Workaround VA macro expansion difference with VC++
Dmitry Stogov [Thu, 15 Mar 2018 12:40:04 +0000 (15:40 +0300)]
Optmized AST creation
Dmitry Stogov [Thu, 15 Mar 2018 09:46:19 +0000 (12:46 +0300)]
Use cheaper functions
Xinchen Hui [Thu, 15 Mar 2018 03:17:14 +0000 (11:17 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #76094 (Access violation when using opcache)
Xinchen Hui [Thu, 15 Mar 2018 03:17:00 +0000 (11:17 +0800)]
Fixed bug #76094 (Access violation when using opcache)
Dmitry Stogov [Wed, 14 Mar 2018 22:33:17 +0000 (01:33 +0300)]
PHP scanner optimization
Anatol Belski [Wed, 14 Mar 2018 22:11:02 +0000 (23:11 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Reduce var scope
Anatol Belski [Wed, 14 Mar 2018 22:10:24 +0000 (23:10 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Reduce var scope
Anatol Belski [Wed, 14 Mar 2018 21:59:54 +0000 (22:59 +0100)]
Reduce var scope
Anatol Belski [Wed, 14 Mar 2018 21:23:38 +0000 (22:23 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix stack use after scope
Anatol Belski [Wed, 14 Mar 2018 21:23:04 +0000 (22:23 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix stack use after scope
Anatol Belski [Wed, 14 Mar 2018 21:21:43 +0000 (22:21 +0100)]
Fix stack use after scope
Dmitry Stogov [Wed, 14 Mar 2018 21:05:00 +0000 (00:05 +0300)]
zend_ast_destroy() optimization
Dmitry Stogov [Wed, 14 Mar 2018 20:13:20 +0000 (23:13 +0300)]
Mark zend_ast_export() as "cold".
Dmitry Stogov [Wed, 14 Mar 2018 18:27:57 +0000 (21:27 +0300)]
PHP scanner optimization
Dmitry Stogov [Wed, 14 Mar 2018 18:26:50 +0000 (21:26 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Remove unused argument
Upgrade binary SDK version for AppVeyor
Anatol Belski [Wed, 14 Mar 2018 15:33:34 +0000 (16:33 +0100)]
Remove unused argument
Dmitry Stogov [Wed, 14 Mar 2018 11:01:45 +0000 (14:01 +0300)]
Keep initialized object_handlers structures in read-only memory.
Anatol Belski [Wed, 14 Mar 2018 11:01:38 +0000 (12:01 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Upgrade binary SDK version for AppVeyor
Anatol Belski [Wed, 14 Mar 2018 11:01:01 +0000 (12:01 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Upgrade binary SDK version for AppVeyor
Anatol Belski [Wed, 14 Mar 2018 10:59:37 +0000 (11:59 +0100)]
Upgrade binary SDK version for AppVeyor
Dmitry Stogov [Wed, 14 Mar 2018 08:35:31 +0000 (11:35 +0300)]
Move constant array into read-only memory
Dmitry Stogov [Wed, 14 Mar 2018 06:41:55 +0000 (09:41 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed user-opcode support
Dmitry Stogov [Wed, 14 Mar 2018 06:41:25 +0000 (09:41 +0300)]
Fixed user-opcode support
Dmitry Stogov [Wed, 14 Mar 2018 06:14:32 +0000 (09:14 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed use-after-free
Dmitry Stogov [Wed, 14 Mar 2018 06:14:16 +0000 (09:14 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed use-after-free
Dmitry Stogov [Wed, 14 Mar 2018 06:11:48 +0000 (09:11 +0300)]
Fixed use-after-free
Joe Watkins [Wed, 14 Mar 2018 04:59:40 +0000 (05:59 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
bump versions
Joe Watkins [Wed, 14 Mar 2018 04:59:18 +0000 (05:59 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
bump versions
Joe Watkins [Wed, 14 Mar 2018 04:58:42 +0000 (05:58 +0100)]
bump versions
Christoph M. Becker [Tue, 13 Mar 2018 23:01:46 +0000 (00:01 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
Christoph M. Becker [Tue, 13 Mar 2018 22:55:26 +0000 (23:55 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
Christoph M. Becker [Tue, 13 Mar 2018 22:54:42 +0000 (23:54 +0100)]
Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
mail.add_x_header actually defaults to `Off`, so we should use this
default in the provided `php.ini`s.
Dmitry Stogov [Tue, 13 Mar 2018 22:48:17 +0000 (01:48 +0300)]
PHP scanner optimization