]>
granicus.if.org Git - php/log
Xinchen Hui [Fri, 13 Oct 2017 10:21:41 +0000 (18:21 +0800)]
Added skipf
Xinchen Hui [Fri, 13 Oct 2017 10:18:10 +0000 (18:18 +0800)]
Fixed bug #75370 (Webserver hangs on valid PHP text)
Xinchen Hui [Fri, 13 Oct 2017 09:35:02 +0000 (17:35 +0800)]
Fixed typo
Christoph M. Becker [Mon, 18 Sep 2017 16:09:53 +0000 (18:09 +0200)]
Fixed bug #75221 (Argon2i always throws NUL at the end)
Apparently, `argon2_encodedlen()` also counts the terminating NUL byte;
that doesn't appear to be documented somewhere, but from looking at the
implementation[1] it is pretty obvious. Therefore, the respective
`zend_string` has to be one byte shorter.
[1] <https://github.com/P-H-C/phc-winner-argon2/blob/
20161029 /src/argon2.c#L431-L436>
Bob Weinand [Thu, 12 Oct 2017 10:32:30 +0000 (12:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Bob Weinand [Thu, 12 Oct 2017 10:31:20 +0000 (12:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Thu, 12 Oct 2017 10:30:20 +0000 (12:30 +0200)]
Fixed bug #75363 (openssl_x509_parse leaks memory)
Anatol Belski [Wed, 11 Oct 2017 20:25:27 +0000 (22:25 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
It looks like i should've taken joint response on ext/fileinfo long ago
Anatol Belski [Wed, 11 Oct 2017 20:24:52 +0000 (22:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
It looks like i should've taken joint response on ext/fileinfo long ago
Anatol Belski [Wed, 11 Oct 2017 20:21:34 +0000 (22:21 +0200)]
It looks like i should've taken joint response on ext/fileinfo long ago
Anatol Belski [Wed, 11 Oct 2017 18:31:58 +0000 (20:31 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Put php-sdk-2.0.12beta1 for AppVeyor
Anatol Belski [Wed, 11 Oct 2017 18:30:40 +0000 (20:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Put php-sdk-2.0.12beta1 for AppVeyor
Anatol Belski [Wed, 11 Oct 2017 18:27:27 +0000 (20:27 +0200)]
Put php-sdk-2.0.12beta1 for AppVeyor
Quite some tool upgrades there, especially re2c 1.0.2
Anatol Belski [Wed, 11 Oct 2017 17:02:51 +0000 (19:02 +0200)]
[ci skip] update NEWS
Anatol Belski [Wed, 11 Oct 2017 16:40:16 +0000 (18:40 +0200)]
Cleanup irrelevant info
Anatol Belski [Wed, 11 Oct 2017 16:18:55 +0000 (18:18 +0200)]
Upgrade bundled libmagic to 5.31
Christoph M. Becker [Wed, 11 Oct 2017 15:30:17 +0000 (17:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
Christoph M. Becker [Wed, 11 Oct 2017 15:29:02 +0000 (17:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
Christoph M. Becker [Wed, 11 Oct 2017 15:05:53 +0000 (17:05 +0200)]
Merge branch 'pull-request/2798' into PHP-7.0
* pull-request/2798:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
Christoph M. Becker [Wed, 11 Oct 2017 12:44:19 +0000 (14:44 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use PHP_VERSION for exif
Christoph M. Becker [Wed, 11 Oct 2017 12:43:30 +0000 (14:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use PHP_VERSION for exif
Christoph M. Becker [Wed, 11 Oct 2017 12:42:02 +0000 (14:42 +0200)]
Merge branch 'pull-request/2799' into PHP-7.0
* pull-request/2799:
Use PHP_VERSION for exif
Christoph M. Becker [Wed, 11 Oct 2017 12:38:12 +0000 (14:38 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
bump version
Anatol Belski [Wed, 11 Oct 2017 06:58:59 +0000 (08:58 +0200)]
Fix datatype
Dmitry Stogov [Tue, 10 Oct 2017 16:25:51 +0000 (19:25 +0300)]
Fixed cleanup after optimization passes
Sara Golemon [Tue, 10 Oct 2017 15:55:50 +0000 (11:55 -0400)]
Revert "Update NEWS for PHP 7.2.0RC4"
This reverts commit
1ea657c65e64d8338e47ead04cfe64c88bf47f2c .
Sara Golemon [Tue, 10 Oct 2017 15:55:41 +0000 (11:55 -0400)]
Revert "Update NEWS for 7.2.0RC5"
This reverts commit
ef25e56ae6a9df1d8fe409707c208d71c067f285 .
Sara Golemon [Tue, 10 Oct 2017 15:49:16 +0000 (15:49 +0000)]
Update NEWS for 7.2.0RC5
Sara Golemon [Tue, 10 Oct 2017 15:27:31 +0000 (15:27 +0000)]
Update NEWS for PHP 7.2.0RC4
Joe Watkins [Tue, 10 Oct 2017 15:12:36 +0000 (16:12 +0100)]
bump version
Anatol Belski [Tue, 10 Oct 2017 12:32:02 +0000 (14:32 +0200)]
Fix path in makefile fragment
Christoph M. Becker [Tue, 10 Oct 2017 11:59:09 +0000 (13:59 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Add NEWS entry for bug #75349
Christoph M. Becker [Tue, 10 Oct 2017 11:55:45 +0000 (13:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Add NEWS entry for bug #75349
Christoph M. Becker [Tue, 10 Oct 2017 11:54:52 +0000 (13:54 +0200)]
[ci skip] Add NEWS entry for bug #75349
Anatol Belski [Tue, 10 Oct 2017 11:00:26 +0000 (13:00 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix re2c version detection
Anatol Belski [Tue, 10 Oct 2017 10:59:14 +0000 (12:59 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix re2c version detection
Remi Collet [Tue, 10 Oct 2017 10:27:37 +0000 (10:27 +0000)]
Update NEWS for 7.2.0RC5
Remi Collet [Tue, 10 Oct 2017 10:12:30 +0000 (10:12 +0000)]
Update NEWS for PHP 7.2.0RC4
Anatol Belski [Tue, 10 Oct 2017 08:52:52 +0000 (10:52 +0200)]
Fix re2c version detection
Anatol Belski [Tue, 10 Oct 2017 06:28:09 +0000 (08:28 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Move dev to 7.0.26
Anatol Belski [Tue, 10 Oct 2017 06:27:37 +0000 (08:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move dev to 7.0.26
Anatol Belski [Tue, 10 Oct 2017 06:26:04 +0000 (08:26 +0200)]
Move dev to 7.0.26
Anatol Belski [Mon, 9 Oct 2017 13:38:37 +0000 (15:38 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix array access on undeclared properties in DateInterval
Anatol Belski [Mon, 9 Oct 2017 13:38:21 +0000 (15:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix array access on undeclared properties in DateInterval
Anatol Belski [Mon, 9 Oct 2017 13:35:38 +0000 (15:35 +0200)]
Fix array access on undeclared properties in DateInterval
Anatol Belski [Mon, 9 Oct 2017 11:13:51 +0000 (13:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix ftok() multibyte path support
Anatol Belski [Mon, 9 Oct 2017 11:07:40 +0000 (13:07 +0200)]
Fix ftok() multibyte path support
Sara Golemon [Sat, 7 Oct 2017 14:14:03 +0000 (10:14 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
Sara Golemon [Sat, 7 Oct 2017 14:13:54 +0000 (10:13 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
Sara Golemon [Sat, 7 Oct 2017 14:08:34 +0000 (10:08 -0400)]
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
Rasmus Lerdorf [Fri, 6 Oct 2017 20:18:12 +0000 (17:18 -0300)]
Add line numbers to Optimizer debug output
Christoph M. Becker [Fri, 6 Oct 2017 14:56:46 +0000 (16:56 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
Christoph M. Becker [Fri, 6 Oct 2017 14:46:22 +0000 (16:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
Christoph M. Becker [Fri, 6 Oct 2017 14:45:07 +0000 (16:45 +0200)]
Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
Of course, reflection has to know that as well.
Nikita Popov [Thu, 5 Oct 2017 10:25:52 +0000 (12:25 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Thu, 5 Oct 2017 10:25:20 +0000 (12:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Mathieu CARBONNEAUX [Wed, 4 Oct 2017 23:34:20 +0000 (01:34 +0200)]
Fixed bug #75311
Peter Kokot [Sun, 1 Oct 2017 16:27:11 +0000 (18:27 +0200)]
Use PHP_VERSION for exif
Dmitry Stogov [Wed, 4 Oct 2017 13:39:47 +0000 (16:39 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed rarely possible use-after-free
Dmitry Stogov [Wed, 4 Oct 2017 13:38:55 +0000 (16:38 +0300)]
Fixed rarely possible use-after-free
Dmitry Stogov [Wed, 4 Oct 2017 06:59:27 +0000 (09:59 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Bumped ext/oci8 version
Use dereferenced value
Fixed compilation errors
Restored code for BOOL variables
Fixed few ext/oci8 bugs
Dmitry Stogov [Wed, 4 Oct 2017 06:58:32 +0000 (09:58 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bumped ext/oci8 version
Use dereferenced value
Fixed compilation errors
Restored code for BOOL variables
Fixed few ext/oci8 bugs
Dmitry Stogov [Wed, 4 Oct 2017 06:56:25 +0000 (09:56 +0300)]
Bumped ext/oci8 version
Dmitry Stogov [Wed, 4 Oct 2017 06:49:40 +0000 (09:49 +0300)]
Merge branch 'oci8_fix' into PHP-7.0
* oci8_fix:
Use dereferenced value
Fixed compilation errors
Restored code for BOOL variables
Fixed few ext/oci8 bugs
Christoph M. Becker [Tue, 3 Oct 2017 22:26:47 +0000 (00:26 +0200)]
[ci skip] Merge branch 'pull-request/2776' into PHP-7.2
* pull-request/2776:
Change EXTENSIONS file encoding from iso-8859-1 to utf-8
Dmitry Stogov [Tue, 3 Oct 2017 07:49:56 +0000 (10:49 +0300)]
Use dereferenced value
Joe Watkins [Tue, 3 Oct 2017 06:22:15 +0000 (07:22 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Typo in status.html
Joe Watkins [Tue, 3 Oct 2017 06:22:04 +0000 (07:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Typo in status.html
Viktor Szépe [Fri, 29 Sep 2017 12:36:23 +0000 (14:36 +0200)]
Typo in status.html
feet needs -> fit needs
Joe Watkins [Tue, 3 Oct 2017 06:19:23 +0000 (07:19 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #74905
Joe Watkins [Tue, 3 Oct 2017 06:19:00 +0000 (07:19 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #74905
Peter Kokot [Thu, 28 Sep 2017 01:13:18 +0000 (03:13 +0200)]
Fix bug #74905
Joe Watkins [Tue, 3 Oct 2017 06:15:14 +0000 (07:15 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Remove ident gitattribute for ext/zip/php_zip.c
Joe Watkins [Tue, 3 Oct 2017 06:15:02 +0000 (07:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove ident gitattribute for ext/zip/php_zip.c
Peter Kokot [Wed, 27 Sep 2017 23:17:04 +0000 (01:17 +0200)]
Remove ident gitattribute for ext/zip/php_zip.c
Dmitry Stogov [Tue, 3 Oct 2017 06:08:28 +0000 (09:08 +0300)]
Fixed compilation errors
Remi Collet [Tue, 3 Oct 2017 04:42:39 +0000 (06:42 +0200)]
NEWS
Remi Collet [Fri, 29 Sep 2017 12:38:21 +0000 (14:38 +0200)]
Fix Bug #75284 sha3 is not supported on bigendian machine
Frank Denis [Mon, 2 Oct 2017 20:47:06 +0000 (22:47 +0200)]
NEWS
Frank Denis [Mon, 2 Oct 2017 20:28:46 +0000 (22:28 +0200)]
ext/sodium: untab tests
Frank Denis [Mon, 2 Oct 2017 20:28:33 +0000 (22:28 +0200)]
ext/sodium: import secretstream test
Frank Denis [Mon, 2 Oct 2017 20:23:53 +0000 (22:23 +0200)]
ext/sodium: sodium_compare() is always available
Frank Denis [Mon, 2 Oct 2017 20:22:22 +0000 (22:22 +0200)]
ext/sodium: fix funky indentation
Frank Denis [Mon, 2 Oct 2017 20:19:55 +0000 (22:19 +0200)]
ext/sodium: move pwhash_scrypt() after pwhash()
Frank Denis [Mon, 2 Oct 2017 20:11:29 +0000 (22:11 +0200)]
ext/sodium: checks for crypto_box_SEALBYTES are not required
Frank Denis [Mon, 2 Oct 2017 20:10:30 +0000 (22:10 +0200)]
ext/sodium: explicitly include <string.h>
Frank Denis [Mon, 2 Oct 2017 20:05:59 +0000 (22:05 +0200)]
ext/sodium: zend_parse_parameters -> zend_parse_parameters_throw
Frank Denis [Mon, 2 Oct 2017 20:02:47 +0000 (22:02 +0200)]
ext/sodium: fix funky indent on zend_parse_parameters_throw() calls
Frank Denis [Mon, 2 Oct 2017 19:59:51 +0000 (21:59 +0200)]
ext/sodium: import bindings for secretstream
Frank Denis [Mon, 2 Oct 2017 19:54:50 +0000 (21:54 +0200)]
ext/sodium: add crypto_pwhash_str_needs_rehash()
Also properly define xchacha20poly1305_ietf_keygen()
Frank Denis [Mon, 2 Oct 2017 19:43:54 +0000 (21:43 +0200)]
ext/sodium: +base64 codecs (timing-safe)
Frank Denis [Mon, 2 Oct 2017 19:40:38 +0000 (21:40 +0200)]
ext/sodium: add arginfo definitions that will be required later
Don't check for existence of aesgcm symbols, since we only support
libsodium >= 1.0.8
Frank Denis [Mon, 2 Oct 2017 19:36:35 +0000 (21:36 +0200)]
ext/sodium: sort prototypes
Dmitry Stogov [Mon, 2 Oct 2017 14:04:26 +0000 (17:04 +0300)]
Restored code for BOOL variables
Remi Collet [Mon, 2 Oct 2017 09:26:46 +0000 (11:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
NEWS
Fixed bug #75303 sha3 hangs on bigendian
Remi Collet [Mon, 2 Oct 2017 09:26:08 +0000 (11:26 +0200)]
NEWS
Remi Collet [Mon, 2 Oct 2017 09:25:23 +0000 (11:25 +0200)]
Fixed bug #75303 sha3 hangs on bigendian
Sara Golemon [Mon, 2 Oct 2017 01:32:06 +0000 (21:32 -0400)]
Guard against AI_NUMERICSERV not being defined.
Frank Denis [Sun, 1 Oct 2017 14:00:41 +0000 (16:00 +0200)]
ext/sodium: fix pwhash_argon2i test
Fabien Villepinte [Sun, 1 Oct 2017 09:27:16 +0000 (11:27 +0200)]
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add