]>
granicus.if.org Git - php/log
Anatol Belski [Sun, 23 Jul 2017 09:08:49 +0000 (11:08 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
fix skipif
Anatol Belski [Sun, 23 Jul 2017 09:08:11 +0000 (11:08 +0200)]
fix skipif
Kalle Sommer Nielsen [Sun, 23 Jul 2017 08:41:35 +0000 (10:41 +0200)]
Change Côme's name to Come, sorry but Visual Studio just butchers everything =(
Kalle Sommer Nielsen [Sun, 23 Jul 2017 08:36:35 +0000 (10:36 +0200)]
Redesigned ext_skel to be written entirely in PHP with no dependencies, this means it will now run on Windows without Cygwin and other nonsense.
It no longer includes a way to generate XML documentation (the PHP documentation utilities already got tools for that in svn under phpdoc/doc-base) and it no longer support function stubs.
$ php ext_skel.php --help
php ext_skel.php --ext=<name> [--experimental] [--author=<name>]
[--dir=<path>] [--std] [--onlyunix]
[--onlywindows] [--help]
--ext=<name> The name of the extension defined as <name>
--experimental Passed if this extension is experimental, this creates
the EXPERIMENTAL file in the root of the extension
--author=<name> Your name, this is used if --header is passed and
for the CREDITS file
--dir=<path> Path to the directory for where extension should be
created. Defaults to the directory of where this script
lives
--std If passed, the standard header and vim rules footer used
in extensions that is included in the core, will be used
--onlyunix Only generate configure scripts for Unix
--onlywindows Only generate configure scripts for Windows
--help This help
Example usage:
$ php ext_skel.php --ext test --std --experimental
$ php ext_skel.php --ext kalle --author "Kalle Sommer Nielsen"
$ php ext_skel.php --ext phpfi --dir "/home/kalle/dev/" --onlyunix
Kalle Sommer Nielsen [Sun, 23 Jul 2017 08:02:38 +0000 (10:02 +0200)]
Fix line feeds
Kalle Sommer Nielsen [Sun, 23 Jul 2017 06:48:06 +0000 (08:48 +0200)]
FAST_ZPP variant of zend_parse_parameters_none(), ZEND_PARSE_PARAMETERS_NONE()
Sara Golemon [Sun, 23 Jul 2017 01:33:34 +0000 (21:33 -0400)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Use compatability zend_isnan() instead of POSIX isnan()
Sara Golemon [Sun, 23 Jul 2017 01:33:28 +0000 (21:33 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use compatability zend_isnan() instead of POSIX isnan()
Sara Golemon [Sun, 23 Jul 2017 01:33:20 +0000 (21:33 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use compatability zend_isnan() instead of POSIX isnan()
Sara Golemon [Sun, 23 Jul 2017 01:28:43 +0000 (21:28 -0400)]
Use compatability zend_isnan() instead of POSIX isnan()
s/isnan/zend_isnan/g
Sara Golemon [Sun, 23 Jul 2017 01:23:35 +0000 (21:23 -0400)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix compile-time optimization of NAN comparisons
Sara Golemon [Sun, 23 Jul 2017 01:23:29 +0000 (21:23 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix compile-time optimization of NAN comparisons
Sara Golemon [Sun, 23 Jul 2017 01:23:17 +0000 (21:23 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix compile-time optimization of NAN comparisons
Sara Golemon [Sun, 23 Jul 2017 00:58:54 +0000 (20:58 -0400)]
Fix compile-time optimization of NAN comparisons
Anatol Belski [Sat, 22 Jul 2017 22:47:24 +0000 (00:47 +0200)]
touch yet more places for datatypes
Anatol Belski [Sat, 22 Jul 2017 22:22:13 +0000 (00:22 +0200)]
add missing header
Kalle Sommer Nielsen [Sat, 22 Jul 2017 21:55:55 +0000 (23:55 +0200)]
Merge branch 'master' of git.php.net:/php-src
Kalle Sommer Nielsen [Sat, 22 Jul 2017 21:54:15 +0000 (23:54 +0200)]
--with-mp is only available for VS anyway, so don't make the argument available if it doesn't have any effect
Anatol Belski [Sat, 22 Jul 2017 21:53:00 +0000 (23:53 +0200)]
sync libmbfl allocator with the size_t changes
Anatol Belski [Sat, 22 Jul 2017 20:33:18 +0000 (22:33 +0200)]
Mitigation for ssize_t issue in
22a5f554a8766d63fd2c2ce91a90ebacb13c0f6a
and some more
Frank Denis [Sat, 22 Jul 2017 20:09:21 +0000 (22:09 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
sodium ext: require libsodium >= 1.0.8
sodium ext: define crypto_aead_chacha20poly1305_ietf_KEYBYTES if needed
sodium ext: remove redundant and obsolete macros
Frank Denis [Sat, 22 Jul 2017 20:07:53 +0000 (22:07 +0200)]
sodium ext: require libsodium >= 1.0.8
(but really, 1.0.9 should be the bare minimum)
Frank Denis [Sat, 22 Jul 2017 17:57:44 +0000 (19:57 +0200)]
sodium ext: define crypto_aead_chacha20poly1305_ietf_KEYBYTES if needed
Some old libsodium versions didn't had a dedicated constant for the
IETF version of this construction.
Frank Denis [Sat, 22 Jul 2017 15:49:32 +0000 (17:49 +0200)]
sodium ext: remove redundant and obsolete macros
Frank Denis [Sat, 22 Jul 2017 15:49:32 +0000 (17:49 +0200)]
sodium ext: remove redundant and obsolete macros
Nikita Popov [Sat, 22 Jul 2017 15:24:49 +0000 (17:24 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Sat, 22 Jul 2017 15:21:48 +0000 (17:21 +0200)]
Fix incorrect propagation of ZEND_BOOL in pass 1
BOOL (next to QM_ASSIGN) is one of the opcodes that can assign to
a temporary that is assigned in multiple branches. Pass 1 does
not check for this, so we should not try to handle it at that
point. Block pass and sccp will be able to treat this correctly.
Nikita Popov [Sat, 22 Jul 2017 12:54:47 +0000 (14:54 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Sat, 22 Jul 2017 12:53:23 +0000 (14:53 +0200)]
Fix block removal if there are duplicate successors
Anatol Belski [Sat, 22 Jul 2017 12:15:53 +0000 (14:15 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] update NEWS
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Sat, 22 Jul 2017 12:15:32 +0000 (14:15 +0200)]
[ci skip] update NEWS
Anatol Belski [Sat, 22 Jul 2017 12:14:22 +0000 (14:14 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Sat, 22 Jul 2017 12:13:51 +0000 (14:13 +0200)]
[ci skip] update NEWS
Anatol Belski [Sat, 22 Jul 2017 12:13:25 +0000 (14:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Sat, 22 Jul 2017 12:12:45 +0000 (14:12 +0200)]
[ci skip] update NEWS
Bob Weinand [Sat, 22 Jul 2017 09:17:05 +0000 (11:17 +0200)]
Merge branch 'PHP-7.2'
Bob Weinand [Sat, 22 Jul 2017 09:16:48 +0000 (11:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Bob Weinand [Sat, 22 Jul 2017 09:14:54 +0000 (11:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 22 Jul 2017 09:14:00 +0000 (11:14 +0200)]
Fixed bug #74954 (null deref and segfault in zend_generator_resume())
Anatol Belski [Sat, 22 Jul 2017 08:37:11 +0000 (10:37 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
Anatol Belski [Sat, 22 Jul 2017 08:36:58 +0000 (10:36 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
Anatol Belski [Sat, 22 Jul 2017 08:36:31 +0000 (10:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
Anatol Belski [Sat, 22 Jul 2017 08:35:26 +0000 (10:35 +0200)]
Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
Nikita Popov [Fri, 21 Jul 2017 21:23:55 +0000 (23:23 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Fri, 21 Jul 2017 21:22:56 +0000 (23:22 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 21 Jul 2017 21:13:44 +0000 (23:13 +0200)]
Fix DFG construction for VERIFY_RETURN
`use` only contains uses prior to definition. This was not
honoured for VERIFY_RETURN with a temporary operand.
The test case only breaks on PHP 7.2.
Kalle Sommer Nielsen [Fri, 21 Jul 2017 20:43:44 +0000 (22:43 +0200)]
Merge branch 'master' of git.php.net:/php-src
Kalle Sommer Nielsen [Fri, 21 Jul 2017 20:43:25 +0000 (22:43 +0200)]
win32/install.txt is no more, just copy INSTALL instead
Anatol Belski [Fri, 21 Jul 2017 20:27:34 +0000 (22:27 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
remove casts and ensure no out of bounds access
sodium ext: delete copypasta from sodium_crypto_kdf_derive_from_key()
Anatol Belski [Fri, 21 Jul 2017 20:26:37 +0000 (22:26 +0200)]
remove casts and ensure no out of bounds access
Kalle Sommer Nielsen [Fri, 21 Jul 2017 20:24:14 +0000 (22:24 +0200)]
Free the HMODULE handle after use
Kalle Sommer Nielsen [Fri, 21 Jul 2017 20:22:41 +0000 (22:22 +0200)]
Free the HMODULE handle after use
Kalle Sommer Nielsen [Fri, 21 Jul 2017 20:21:25 +0000 (22:21 +0200)]
Free the HMODULE handle after use
Kalle Sommer Nielsen [Fri, 21 Jul 2017 19:55:11 +0000 (21:55 +0200)]
Test case for bug #64739
Kalle Sommer Nielsen [Fri, 21 Jul 2017 16:42:57 +0000 (18:42 +0200)]
Point to the online documentation for installation of PHP in INSTALL, and remove the almost duplicate win32/install.txt, one place for all docs should be enough
Kalle Sommer Nielsen [Fri, 21 Jul 2017 16:33:42 +0000 (18:33 +0200)]
Don't bail configure on Windows if a configure argument was not found, this mimics that of the Unix build system.
configure --hello-world will now yield the following in the bottom of the configure summary:
WARNING
The following arguments is invalid, and therefore ignored:
--hello-world
Frank Denis [Fri, 21 Jul 2017 16:25:25 +0000 (18:25 +0200)]
sodium ext: delete copypasta from sodium_crypto_kdf_derive_from_key()
/via @fredemmott
Anatol Belski [Fri, 21 Jul 2017 14:13:52 +0000 (16:13 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
sodium ext: use crypto_scalarmult_BYTES for points coordinates
sodium ext: clear the hash state after we're done hashing
sodium ext: drop unused code /via @remicollet
Frank Denis [Thu, 20 Jul 2017 20:30:58 +0000 (22:30 +0200)]
sodium ext: use crypto_scalarmult_BYTES for points coordinates
Just for consistency.
Frank Denis [Thu, 20 Jul 2017 18:17:52 +0000 (20:17 +0200)]
sodium ext: clear the hash state after we're done hashing
Frank Denis [Tue, 18 Jul 2017 14:53:45 +0000 (16:53 +0200)]
sodium ext: drop unused code
/via @remicollet
Xinchen Hui [Fri, 21 Jul 2017 10:18:09 +0000 (18:18 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Update NEWS
Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
Xinchen Hui [Fri, 21 Jul 2017 10:17:54 +0000 (18:17 +0800)]
Update NEWS
Xinchen Hui [Fri, 21 Jul 2017 10:17:33 +0000 (18:17 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
Xinchen Hui [Fri, 21 Jul 2017 10:17:12 +0000 (18:17 +0800)]
Update NEWS
Xinchen Hui [Fri, 21 Jul 2017 10:16:54 +0000 (18:16 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
Xinchen Hui [Fri, 21 Jul 2017 10:16:37 +0000 (18:16 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Move the define into the header to reduce diff for future upgrade
Xinchen Hui [Fri, 21 Jul 2017 10:16:11 +0000 (18:16 +0800)]
Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
Anatol Belski [Fri, 21 Jul 2017 09:17:01 +0000 (11:17 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Move the define into the header to reduce diff for future upgrade
Anatol Belski [Fri, 21 Jul 2017 09:16:38 +0000 (11:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Move the define into the header to reduce diff for future upgrade
Anatol Belski [Fri, 21 Jul 2017 09:16:15 +0000 (11:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move the define into the header to reduce diff for future upgrade
Anatol Belski [Fri, 21 Jul 2017 07:12:06 +0000 (09:12 +0200)]
Move the define into the header to reduce diff for future upgrade
Xinchen Hui [Fri, 21 Jul 2017 04:04:40 +0000 (12:04 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Update NEWS
Fixed bug #74947 (Segfault in scanner on INF number)
Xinchen Hui [Fri, 21 Jul 2017 04:03:17 +0000 (12:03 +0800)]
Update NEWS
Xinchen Hui [Fri, 21 Jul 2017 04:02:54 +0000 (12:02 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fixed bug #74947 (Segfault in scanner on INF number)
Conflicts:
Zend/zend_language_scanner.c
Xinchen Hui [Fri, 21 Jul 2017 03:58:30 +0000 (11:58 +0800)]
Update NEWS
Xinchen Hui [Fri, 21 Jul 2017 03:58:07 +0000 (11:58 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74947 (Segfault in scanner on INF number)
Conflicts:
Zend/zend_language_scanner.c
Xinchen Hui [Fri, 21 Jul 2017 03:52:56 +0000 (11:52 +0800)]
Fixed bug #74947 (Segfault in scanner on INF number)
Frank Denis [Thu, 20 Jul 2017 20:30:58 +0000 (22:30 +0200)]
sodium ext: use crypto_scalarmult_BYTES for points coordinates
Just for consistency.
Dmitry Stogov [Thu, 20 Jul 2017 20:29:44 +0000 (23:29 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
fixed comments
Fixed wrong edges_count re-calculation.
Dmitry Stogov [Thu, 20 Jul 2017 20:29:22 +0000 (23:29 +0300)]
fixed comments
Dmitry Stogov [Thu, 20 Jul 2017 20:28:05 +0000 (23:28 +0300)]
Fixed wrong edges_count re-calculation.
Anatol Belski [Thu, 20 Jul 2017 20:08:55 +0000 (22:08 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
increment sdk version
Anatol Belski [Thu, 20 Jul 2017 20:08:39 +0000 (22:08 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
increment sdk version
Anatol Belski [Thu, 20 Jul 2017 20:07:32 +0000 (22:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increment sdk version
Anatol Belski [Thu, 20 Jul 2017 20:06:34 +0000 (22:06 +0200)]
increment sdk version
Nikita Popov [Thu, 20 Jul 2017 19:14:01 +0000 (21:14 +0200)]
Only write single terminating byte
As far as I could determine this is sufficient. It avoids
reallocating the buffer, if it was perfectly allocated beforehand.
Nikita Popov [Thu, 20 Jul 2017 18:38:11 +0000 (20:38 +0200)]
Use fast zpp in mb_strlen()
For short strings this function is now sufficiently fast for zpp
to be a bottleneck.
Nikita Popov [Thu, 20 Jul 2017 17:35:48 +0000 (19:35 +0200)]
Directly use encodings instead of no_encoding in libmbfl
In particular strings now store encoding rather than the
no_encoding.
I've also pruned out libmbfl APIs that existed in two forms, one
using no_encoding and the other using encoding. We were not actually
using any of the former.
Anatol Belski [Thu, 20 Jul 2017 18:41:02 +0000 (20:41 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
remove another cygwin instance in AppVeyor run
Anatol Belski [Thu, 20 Jul 2017 18:40:47 +0000 (20:40 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
remove another cygwin instance in AppVeyor run
Anatol Belski [Thu, 20 Jul 2017 18:39:36 +0000 (20:39 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
remove another cygwin instance in AppVeyor run
Anatol Belski [Thu, 20 Jul 2017 18:39:04 +0000 (20:39 +0200)]
remove another cygwin instance in AppVeyor run
Frank Denis [Thu, 20 Jul 2017 18:17:52 +0000 (20:17 +0200)]
sodium ext: clear the hash state after we're done hashing
Nikita Popov [Thu, 20 Jul 2017 16:29:44 +0000 (18:29 +0200)]
Temporary fix for windows build
This API should be changed to stop using negative offsets. For now
I'm replacing ssize_t with long.
Nikita Popov [Thu, 20 Jul 2017 16:09:05 +0000 (18:09 +0200)]
Free last_used_encoding_name in RSHUTDOWN
efree() cannot be used in GSHUTDOWN
Côme Chilliet [Thu, 20 Jul 2017 14:14:47 +0000 (16:14 +0200)]
Added ldap_exop_refresh helper for EXOP REFRESH operation on dds overlay
ldap_exop_refresh(resource link, string dn, int ttl)
Returns FALSE on failure, newttl on success
Nikita Popov [Thu, 20 Jul 2017 13:33:24 +0000 (15:33 +0200)]
Reduce number of encoding conversions in case conversion
Don't indirect through UCS4BE, instead directly work on wchars
using a custom filter.
This replaces the pipeline
utf8 -> wchar -> ucs4be -> wchar -case-> wchar -> ucs4be -> wchar -> utf8
with
utf8 -> wchar -case-> -> wchar -> utf8
Nikita Popov [Thu, 20 Jul 2017 11:57:18 +0000 (13:57 +0200)]
Optimize php_unicode_tolower/upper for ASCII
Nikita Popov [Thu, 20 Jul 2017 11:45:25 +0000 (13:45 +0200)]
Add basic mbstring encoding cache
Store the last used encoding and compare against it. It's quite
likely that an application is going to be using the same encoding
again and again.
The actual mbfl_name2encoding() function could also be optimized
to use a hash lookup rather than a linear scan, but we don't have
a hashtable implmentation in libmbfl...