]>
granicus.if.org Git - php/log
Dmitry Stogov [Wed, 29 Nov 2017 22:13:39 +0000 (01:13 +0300)]
Use zend_string_tolower() where it's possible (to avoid reallocations).
Allow zend_string_tolower_ex() to create parsistent strings
Christoph M. Becker [Wed, 29 Nov 2017 16:06:47 +0000 (17:06 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Define floorf if system doesn't have it (follow up for
22c48761 )
Revert "Revert "ext/sodium: pwhash: do not warn on low parameters"" This reverts commit
a1845b7fdb5916b0951146ca18bb67ca83854733 .
Dmitry Stogov [Wed, 29 Nov 2017 16:00:57 +0000 (19:00 +0300)]
Try to intern unserualized string keys
Christoph M. Becker [Wed, 29 Nov 2017 15:59:17 +0000 (16:59 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Define floorf if system doesn't have it (follow up for
22c48761 )
Christoph M. Becker [Wed, 29 Nov 2017 15:53:11 +0000 (16:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Define floorf if system doesn't have it (follow up for
22c48761 )
Lior Kaplan [Wed, 29 Nov 2017 11:45:21 +0000 (13:45 +0200)]
Define floorf if system doesn't have it (follow up for
22c48761 )
floorf is checked in config.m4
Dmitry Stogov [Wed, 29 Nov 2017 14:10:51 +0000 (17:10 +0300)]
Intern auto global name strings in first place
Frank Denis [Wed, 29 Nov 2017 12:19:18 +0000 (13:19 +0100)]
Revert "Revert "ext/sodium: pwhash: do not warn on low parameters""
This reverts commit
a1845b7fdb5916b0951146ca18bb67ca83854733 .
Revert "Revert "ext/sodium: throw exceptions instead of errors""
This reverts commit
31d221f9c72f0d0322c84907c5d89a4464667244 .
Anatol Belski [Wed, 29 Nov 2017 08:32:09 +0000 (09:32 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Wed, 29 Nov 2017 08:31:29 +0000 (09:31 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
Anatol Belski [Wed, 29 Nov 2017 08:31:14 +0000 (09:31 +0100)]
[ci skip] update NEWS
Anatol Belski [Wed, 29 Nov 2017 08:28:21 +0000 (09:28 +0100)]
[ci skip] update NEWS
Move entry to proper section
Xinchen Hui [Wed, 29 Nov 2017 06:54:05 +0000 (14:54 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Revert "ext/sodium: pwhash: do not warn on low parameters"
Conflicts:
Zend/zend_object_handlers.c
Xinchen Hui [Wed, 29 Nov 2017 06:47:26 +0000 (14:47 +0800)]
Update NEWS
Xinchen Hui [Wed, 29 Nov 2017 06:46:44 +0000 (14:46 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Xinchen Hui [Wed, 29 Nov 2017 06:46:21 +0000 (14:46 +0800)]
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Frank Denis [Wed, 29 Nov 2017 00:22:59 +0000 (01:22 +0100)]
Revert "ext/sodium: pwhash: do not warn on low parameters"
This reverts commit
c219991c77e4c68f7d62963e18a1da778de0bbe0 .
Nikita Popov [Tue, 28 Nov 2017 22:37:28 +0000 (23:37 +0100)]
Merge branch 'PHP-7.2'
Nikita Popov [Tue, 28 Nov 2017 22:37:05 +0000 (23:37 +0100)]
Merge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2
Nikita Popov [Tue, 28 Nov 2017 22:34:30 +0000 (23:34 +0100)]
Merge branch 'PHP-7.2'
Nikita Popov [Tue, 28 Nov 2017 22:34:00 +0000 (23:34 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
johnstevenson [Thu, 16 Nov 2017 17:56:32 +0000 (17:56 +0000)]
Fixed #73124: php_ini_scanned_files()
Additional ini files are reported using the --ini option, but not by
`php_ini_scanned_files()`, which relied on PHP_CONFIG_FILE_SCAN_DIR.
Frank Denis [Tue, 28 Nov 2017 22:30:21 +0000 (23:30 +0100)]
Revert "ext/sodium: throw exceptions instead of errors"
This reverts commit
c05cbd1e775fa69ed9939796a908390f2bfb4459 .
Nikita Popov [Tue, 28 Nov 2017 22:10:50 +0000 (23:10 +0100)]
Fixed bug #75575
These functions are never called with needle longer than haystack,
but it makes sense to explicitly check for this, especially as we
already perform a check for empty haystack anyway, which is
naturally subsumed by a haystack_len < needle_len check.
David Carlier [Tue, 28 Nov 2017 20:37:53 +0000 (20:37 +0000)]
Add configure check for asm goto support
asm goto is not supported by couple of systems. To make sure it does,
we can check it at configure-time.
Anatol Belski [Tue, 28 Nov 2017 19:35:19 +0000 (20:35 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Follow up on bug #75574 for FCGI side
Anatol Belski [Tue, 28 Nov 2017 19:34:44 +0000 (20:34 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Follow up on bug #75574 for FCGI side
Anatol Belski [Tue, 28 Nov 2017 19:31:48 +0000 (20:31 +0100)]
Follow up on bug #75574 for FCGI side
Remi Collet [Tue, 28 Nov 2017 17:00:46 +0000 (18:00 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
NEWS
NEWS
NEWS
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
Remi Collet [Tue, 28 Nov 2017 17:00:36 +0000 (18:00 +0100)]
NEWS
Remi Collet [Tue, 28 Nov 2017 17:00:21 +0000 (18:00 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
NEWS
NEWS
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
Remi Collet [Tue, 28 Nov 2017 17:00:07 +0000 (18:00 +0100)]
NEWS
Remi Collet [Tue, 28 Nov 2017 16:59:36 +0000 (17:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
Remi Collet [Tue, 28 Nov 2017 16:59:16 +0000 (17:59 +0100)]
NEWS
Remi Collet [Mon, 27 Nov 2017 16:06:57 +0000 (17:06 +0100)]
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
Remi Collet [Tue, 28 Nov 2017 16:43:28 +0000 (17:43 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
better fix for #75514
Remi Collet [Tue, 28 Nov 2017 16:43:15 +0000 (17:43 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
better fix for #75514
Remi Collet [Tue, 28 Nov 2017 16:42:43 +0000 (17:42 +0100)]
better fix for #75514
Matteo Beccati [Tue, 28 Nov 2017 14:35:14 +0000 (15:35 +0100)]
Fix getifaddrs detection on NetBSD
Remi Collet [Tue, 28 Nov 2017 13:16:33 +0000 (14:16 +0100)]
ensure no merge commit during submodule update
Frank Denis [Tue, 28 Nov 2017 12:57:06 +0000 (13:57 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
ext/sodium: throw exceptions instead of errors
Frank Denis [Tue, 28 Nov 2017 12:56:46 +0000 (13:56 +0100)]
Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2
* 'PHP-7.2' of git.php.net:php-src:
[ci skip] update NEWS
[ci skip] update NEWS
Fixed bug #73830 Directory does not exist.
Frank Denis [Tue, 28 Nov 2017 12:56:11 +0000 (13:56 +0100)]
ext/sodium: throw exceptions instead of errors
Anatol Belski [Tue, 28 Nov 2017 11:46:59 +0000 (12:46 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Tue, 28 Nov 2017 11:46:39 +0000 (12:46 +0100)]
[ci skip] update NEWS
Anatol Belski [Tue, 28 Nov 2017 11:46:03 +0000 (12:46 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
Anatol Belski [Tue, 28 Nov 2017 11:45:30 +0000 (12:45 +0100)]
[ci skip] update NEWS
Anatol Belski [Tue, 28 Nov 2017 11:43:03 +0000 (12:43 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #73830 Directory does not exist.
Anatol Belski [Tue, 28 Nov 2017 11:42:40 +0000 (12:42 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #73830 Directory does not exist.
Anatol Belski [Tue, 28 Nov 2017 11:41:49 +0000 (12:41 +0100)]
Fixed bug #73830 Directory does not exist.
Dmitry Stogov [Tue, 28 Nov 2017 11:11:40 +0000 (14:11 +0300)]
CONCAT/FAST_CONCAT micro-optimization
Frank Denis [Tue, 28 Nov 2017 10:25:44 +0000 (11:25 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
ext/sodium: pwhash: do not warn on low parameters but raise an explicit error if these are too low
Frank Denis [Tue, 28 Nov 2017 10:24:49 +0000 (11:24 +0100)]
ext/sodium: pwhash: do not warn on low parameters
but raise an explicit error if these are too low
Dmitry Stogov [Tue, 28 Nov 2017 09:37:00 +0000 (12:37 +0300)]
Prefer "GNU asm goto" to __builtin_saddl_overflow() for overflow detection. This allows generation of significantly better code.
Anatol Belski [Mon, 27 Nov 2017 13:09:59 +0000 (14:09 +0100)]
Keep up with Linux extension to POSIX.1-2001 getcwd()
If both buf and size are zero, the buf is allocated as big as required.
Otherwise, the size is still to respect.
Fix var name
Improve error check
Ensure the end buffer length is not bigger than requested
Anatol Belski [Mon, 27 Nov 2017 13:01:55 +0000 (14:01 +0100)]
Sync with the POSIX signature
Remi Collet [Tue, 28 Nov 2017 07:01:59 +0000 (08:01 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
drop -dev from Zend version
Remi Collet [Tue, 28 Nov 2017 07:00:45 +0000 (08:00 +0100)]
drop -dev from Zend version
Xinchen Hui [Tue, 28 Nov 2017 05:16:51 +0000 (13:16 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Update NEWs (added bug entry)
Xinchen Hui [Tue, 28 Nov 2017 05:16:39 +0000 (13:16 +0800)]
Update NEWS
Xinchen Hui [Tue, 28 Nov 2017 05:16:22 +0000 (13:16 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWs (added bug entry)
Xinchen Hui [Tue, 28 Nov 2017 05:15:54 +0000 (13:15 +0800)]
Update NEWs (added bug entry)
Anatol Belski [Mon, 27 Nov 2017 20:19:17 +0000 (21:19 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix allocation
Fix memory leak
Anatol Belski [Mon, 27 Nov 2017 20:18:54 +0000 (21:18 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix allocation
Fix memory leak
Anatol Belski [Mon, 27 Nov 2017 20:18:08 +0000 (21:18 +0100)]
Fix allocation
Anatol Belski [Mon, 27 Nov 2017 19:24:30 +0000 (20:24 +0100)]
Fix memory leak
Anatol Belski [Mon, 27 Nov 2017 17:52:45 +0000 (18:52 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #75574 putenv does not work properly if parameter contains non-ASCII unicode character
Anatol Belski [Mon, 27 Nov 2017 17:50:05 +0000 (18:50 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75574 putenv does not work properly if parameter contains non-ASCII unicode character
Anatol Belski [Mon, 27 Nov 2017 17:49:02 +0000 (18:49 +0100)]
Fixed bug #75574 putenv does not work properly if parameter contains non-ASCII unicode character
Sara Golemon [Mon, 27 Nov 2017 17:47:26 +0000 (12:47 -0500)]
Bugfix net_get_interfaces() on NetBSD
Sara Golemon [Tue, 21 Nov 2017 15:04:37 +0000 (10:04 -0500)]
Add net_get_interfaces()
Remi Collet [Mon, 27 Nov 2017 11:49:46 +0000 (12:49 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Prepare NEWS file for release - set release date - merge all alpha/beta/RC entries - clean entries already in 7.1
Remi Collet [Mon, 27 Nov 2017 11:49:28 +0000 (12:49 +0100)]
Prepare NEWS file for release
- set release date
- merge all alpha/beta/RC entries
- clean entries already in 7.1
Anatol Belski [Mon, 27 Nov 2017 11:33:54 +0000 (12:33 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix normalized path length calculation and error handling
Anatol Belski [Mon, 27 Nov 2017 11:33:23 +0000 (12:33 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix normalized path length calculation and error handling
Anatol Belski [Mon, 27 Nov 2017 11:32:19 +0000 (12:32 +0100)]
Fix normalized path length calculation and error handling
Anatol Belski [Mon, 27 Nov 2017 11:14:35 +0000 (12:14 +0100)]
Add note on PAX headers in tarballs
Dmitry Stogov [Mon, 27 Nov 2017 07:17:07 +0000 (10:17 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug in type inference
Dmitry Stogov [Mon, 27 Nov 2017 07:16:46 +0000 (10:16 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug in type inference
Dmitry Stogov [Mon, 27 Nov 2017 07:16:16 +0000 (10:16 +0300)]
Fixed bug in type inference
Xinchen Hui [Mon, 27 Nov 2017 04:03:48 +0000 (12:03 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Improved fix
Xinchen Hui [Mon, 27 Nov 2017 04:03:37 +0000 (12:03 +0800)]
Improved fix
Nikita Popov [Sat, 25 Nov 2017 21:51:37 +0000 (22:51 +0100)]
Make sure properties are initialized before cloning
Now that they are not memset, they need to be explicitly intialized,
as zend_objects_clone_members() destroys the old property values
first.
MattJeevas [Thu, 23 Nov 2017 18:42:39 +0000 (21:42 +0300)]
Print PHP version in phpinfo() func html title
Nikita Popov [Sat, 25 Nov 2017 17:02:01 +0000 (18:02 +0100)]
Subtract one zval from memset
Nikita Popov [Sat, 25 Nov 2017 15:07:51 +0000 (16:07 +0100)]
Add zend_object_alloc() API
Using ecalloc() to create objects is expensive, because the
dynamic-size memset() is unreasonably slow. Make sure we only
zero the main object structure with known size, as the properties
are intialized separately anyway.
Technically we do not need to zero the embedded zend_object
structure either, but as long as the memset argument is constant,
a couple more bytes don't really matter.
Nikita Popov [Sat, 25 Nov 2017 12:31:18 +0000 (13:31 +0100)]
Make sure string property/class const values are interned
This was done for user-definde class constant values, however this
is also important for properties and internal classes.
Kalle Sommer Nielsen [Fri, 24 Nov 2017 23:54:16 +0000 (00:54 +0100)]
We don't check for Windows in the win32/ directory, as files here are only compiled on Windows anyway
Kalle Sommer Nielsen [Fri, 24 Nov 2017 23:40:13 +0000 (00:40 +0100)]
PCRE is always available, PHP can't be built without it anyway so these checks makes no sense anymore
Nikita Popov [Fri, 24 Nov 2017 21:57:45 +0000 (22:57 +0100)]
Fix ZEND_VM_SPEC=0 build
Nikita Popov [Fri, 24 Nov 2017 20:24:13 +0000 (21:24 +0100)]
Fix zend_fetch_dimension_const()
Pass IS_TMP_VAR instead of IS_CONST as operand type, as IS_CONST
requires additional guarantees that are not necessarily
satisfied by the caller.
Nikita Popov [Fri, 24 Nov 2017 18:02:59 +0000 (19:02 +0100)]
Fix C++ build failure due to format macros
PRIi64 etc. may not be available without this macro definition, on
pre-C++11 compilers. At least I think that's the issue.
dcarlier [Fri, 24 Nov 2017 14:52:53 +0000 (14:52 +0000)]
fix constant defined undefined behavior warning
Xinchen Hui [Fri, 24 Nov 2017 16:54:28 +0000 (00:54 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #75556 (Invalid opcode 138/1/1)
Xinchen Hui [Fri, 24 Nov 2017 16:54:15 +0000 (00:54 +0800)]
Fixed bug #75556 (Invalid opcode 138/1/1)
Dmitry Stogov [Fri, 24 Nov 2017 11:01:19 +0000 (14:01 +0300)]
Introduced zend_hash_find_ex() that may avoid unnecessary hash value check.
Dmitry Stogov [Fri, 24 Nov 2017 09:03:59 +0000 (12:03 +0300)]
Avoid second hash value check
Dmitry Stogov [Thu, 23 Nov 2017 12:58:34 +0000 (15:58 +0300)]
TYPE_CHECK instruction changed. Now it keeps in extended_value a type mask.
This makes check for "boolean" cheaper and allows check combination e.g. (is_string($a) || is_null($a))
Dmitry Stogov [Thu, 23 Nov 2017 10:45:21 +0000 (13:45 +0300)]
Don't mix TYPE and TYPE_INFO
Dmitry Stogov [Thu, 23 Nov 2017 10:18:52 +0000 (13:18 +0300)]
Delayed unlikely checks for uninitialized variables