]> granicus.if.org Git - php/log
php
7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 3 Aug 2017 10:22:02 +0000 (12:22 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Rework automatic interactive cli activation

7 years agoRework automatic interactive cli activation
Anatol Belski [Thu, 3 Aug 2017 09:23:50 +0000 (11:23 +0200)]
Rework automatic interactive cli activation

There are still systems delivering buggy console info. If a file was
passed, obviously no interaction is meant.

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Wed, 2 Aug 2017 19:52:15 +0000 (21:52 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  [ci skip] update NEWS
  [ci skip] update NEWS
  update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 2 Aug 2017 19:51:35 +0000 (21:51 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 2 Aug 2017 19:51:01 +0000 (21:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] update NEWS
  update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 2 Aug 2017 19:50:26 +0000 (21:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 2 Aug 2017 19:49:56 +0000 (21:49 +0200)]
[ci skip] update NEWS

7 years agoupdate NEWS
Anatol Belski [Wed, 2 Aug 2017 19:49:21 +0000 (21:49 +0200)]
update NEWS

7 years agoAdjust ftp arginfos for optional mode
Nikita Popov [Wed, 2 Aug 2017 18:57:49 +0000 (20:57 +0200)]
Adjust ftp arginfos for optional mode

This was changed in 00cd671233e8181746ff2853365fb2362dd178e8, but
the arginfos were not adjusted.

7 years agoDefault ftp_append() mode to FTPTYPE_IMAGE
Andreas Treichel [Wed, 2 Aug 2017 17:26:29 +0000 (19:26 +0200)]
Default ftp_append() mode to FTPTYPE_IMAGE

To be consistent with other ftp_*() functions in master.

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Wed, 2 Aug 2017 18:53:32 +0000 (20:53 +0200)]
Merge branch 'PHP-7.2'

7 years agoAdd ftp_append to create a new file or append data to an existing file (RFC959)
Andreas Treichel [Sat, 8 Jul 2017 17:36:22 +0000 (19:36 +0200)]
Add ftp_append to create a new file or append data to an existing file (RFC959)

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Wed, 2 Aug 2017 16:50:31 +0000 (18:50 +0200)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 2 Aug 2017 16:50:10 +0000 (18:50 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 2 Aug 2017 16:49:48 +0000 (18:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoBug #74975: Different serialization for classes
Andreas Treichel [Sun, 23 Jul 2017 03:29:18 +0000 (05:29 +0200)]
Bug #74975: Different serialization for classes

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Wed, 2 Aug 2017 16:18:29 +0000 (18:18 +0200)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 2 Aug 2017 16:18:23 +0000 (18:18 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 2 Aug 2017 16:16:56 +0000 (18:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoMerge remote-tracking branch 'php-src/PHP-7.0' into PHP-7.0
Nikita Popov [Wed, 2 Aug 2017 16:16:18 +0000 (18:16 +0200)]
Merge remote-tracking branch 'php-src/PHP-7.0' into PHP-7.0

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Wed, 2 Aug 2017 16:11:17 +0000 (18:11 +0200)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 2 Aug 2017 16:10:59 +0000 (18:10 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 2 Aug 2017 16:08:58 +0000 (18:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix Bug #75001: Wrong reflection on mb_eregi_replace
Fabien Villepinte [Fri, 28 Jul 2017 11:41:09 +0000 (13:41 +0200)]
Fix Bug #75001: Wrong reflection on mb_eregi_replace

7 years agoFix test transliterator_create_inverse_basic.phpt
Fabien Villepinte [Fri, 28 Jul 2017 12:38:51 +0000 (14:38 +0200)]
Fix test transliterator_create_inverse_basic.phpt

7 years agotake care of compile warnings.
George Wang [Wed, 2 Aug 2017 15:59:41 +0000 (11:59 -0400)]
take care of compile warnings.

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Wed, 2 Aug 2017 15:54:14 +0000 (17:54 +0200)]
Merge branch 'PHP-7.2'

7 years agoImplement spl_object_id(object $x) : int
Tyson Andre [Fri, 23 Jun 2017 06:18:47 +0000 (23:18 -0700)]
Implement spl_object_id(object $x) : int

spl_object_id is a new function returning the object handle,
as a signed integer.

Discussion for this new function is ongoing on php-internals, see
https://marc.info/?t=143835274500003&r=1&w=2

The object id is unique for the lifetime of the object.
When the object is garbage collected,
different objects may & will have the same object id.

- This is also the case for the string generated by spl_object_hash

It is always possible to cast the object handle to a **signed** zend_long
in php 7.2. _zend_object->handle is always of the type `uint32_t`.
(zend_long is 32 bits on 32 bit builds, 64 bits on 64 bit builds)

As of php 7.0, the object id uniquely identifies the object,
there can't be two objects with the same id but different handlers
(See the implementation of spl_object_hash)

Skip the pointless XORing, as discussed in internals.

- It was intended to avoid exposing in-memory addresses.
- The object handle is not a memory address.
- The output of var_dump() includes the object handle(id)

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Wed, 2 Aug 2017 14:43:10 +0000 (16:43 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75002 Null Pointer Dereference in timelib_time_clone

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 2 Aug 2017 14:42:20 +0000 (16:42 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75002 Null Pointer Dereference in timelib_time_clone

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 2 Aug 2017 14:41:48 +0000 (16:41 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75002 Null Pointer Dereference in timelib_time_clone

7 years agoFixed bug #75002 Null Pointer Dereference in timelib_time_clone
Derick Rethans [Wed, 2 Aug 2017 14:40:48 +0000 (16:40 +0200)]
Fixed bug #75002 Null Pointer Dereference in timelib_time_clone

7 years agoMerge branch 'PHP-7.2'
Remi Collet [Wed, 2 Aug 2017 14:09:42 +0000 (16:09 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  fix build with old system libsqlite (sqlite3_close_v2 may be missing)

7 years agofix build with old system libsqlite (sqlite3_close_v2 may be missing)
Remi Collet [Wed, 2 Aug 2017 14:09:36 +0000 (16:09 +0200)]
fix build with old system libsqlite (sqlite3_close_v2 may be missing)

7 years agoMerge branch 'PHP-7.2'
Remi Collet [Wed, 2 Aug 2017 12:03:38 +0000 (14:03 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  fix build with old system libsqlite (sqlite3_errstr may be missing)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Remi Collet [Wed, 2 Aug 2017 12:03:23 +0000 (14:03 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  fix build with old system libsqlite (sqlite3_errstr may be missing)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Wed, 2 Aug 2017 12:03:02 +0000 (14:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix build with old system libsqlite (sqlite3_errstr may be missing)

7 years agofix build with old system libsqlite (sqlite3_errstr may be missing)
Remi Collet [Wed, 2 Aug 2017 12:01:56 +0000 (14:01 +0200)]
fix build with old system libsqlite (sqlite3_errstr may be missing)

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 2 Aug 2017 07:36:36 +0000 (08:36 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  fixed #endif comments

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 2 Aug 2017 07:35:51 +0000 (08:35 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  fixed #endif comments

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 2 Aug 2017 07:35:38 +0000 (08:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fixed #endif comments

7 years agofixed #endif comments
clwu [Wed, 2 Aug 2017 02:49:10 +0000 (10:49 +0800)]
fixed #endif comments

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Tue, 1 Aug 2017 22:11:40 +0000 (00:11 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS

7 years agoUpdate NEWS
Christoph M. Becker [Tue, 1 Aug 2017 22:07:39 +0000 (00:07 +0200)]
Update NEWS

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Tue, 1 Aug 2017 22:05:48 +0000 (00:05 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS for 7.2.0beta3
  Update NEWS for PHP 7.2.0beta2

7 years agoUpdate NEWS for 7.2.0beta3
Sara Golemon [Tue, 1 Aug 2017 16:35:08 +0000 (16:35 +0000)]
Update NEWS for 7.2.0beta3

7 years agoUpdate NEWS for PHP 7.2.0beta2
Sara Golemon [Tue, 1 Aug 2017 16:13:38 +0000 (16:13 +0000)]
Update NEWS for PHP 7.2.0beta2

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Tue, 1 Aug 2017 16:31:43 +0000 (18:31 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update to SQLite 3.20.0

7 years agoUpdate to SQLite 3.20.0
Christoph M. Becker [Tue, 1 Aug 2017 16:26:14 +0000 (18:26 +0200)]
Update to SQLite 3.20.0

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Tue, 1 Aug 2017 16:10:38 +0000 (18:10 +0200)]
Merge branch 'PHP-7.2'

7 years agoOptimize array_unique()
Nikita Popov [Tue, 1 Aug 2017 16:07:26 +0000 (18:07 +0200)]
Optimize array_unique()

In SORT_STRING mode, instead of sorting the array, build a hash of
seen elements.

7 years agoMerge branch 'PHP-7.2'
Julien Pauli [Tue, 1 Aug 2017 14:03:09 +0000 (16:03 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Updated NEWS
  Updated NEWS
  Updated NEWS
  Fix #75015. Crash in SPL destructors

7 years agoUpdated NEWS
Julien Pauli [Tue, 1 Aug 2017 14:03:00 +0000 (16:03 +0200)]
Updated NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Julien Pauli [Tue, 1 Aug 2017 14:02:36 +0000 (16:02 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Updated NEWS
  Updated NEWS
  Fix #75015. Crash in SPL destructors

7 years agoUpdated NEWS
Julien Pauli [Tue, 1 Aug 2017 14:02:26 +0000 (16:02 +0200)]
Updated NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Julien Pauli [Tue, 1 Aug 2017 14:02:00 +0000 (16:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Updated NEWS
  Fix #75015. Crash in SPL destructors

7 years agoUpdated NEWS
Julien Pauli [Tue, 1 Aug 2017 14:01:43 +0000 (16:01 +0200)]
Updated NEWS

7 years agoFix #75015. Crash in SPL destructors
Julien Pauli [Tue, 1 Aug 2017 10:59:19 +0000 (12:59 +0200)]
Fix #75015. Crash in SPL destructors

7 years agoMerge branch 'PHP-7.2'
Julien Pauli [Tue, 1 Aug 2017 12:58:28 +0000 (14:58 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix use of uninitialised value in uniqid() where more_entropy=0

7 years agoFix use of uninitialised value in uniqid() where more_entropy=0
Julien Pauli [Tue, 1 Aug 2017 12:42:15 +0000 (14:42 +0200)]
Fix use of uninitialised value in uniqid() where more_entropy=0

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Tue, 1 Aug 2017 10:51:56 +0000 (12:51 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Test to cover the change in ce1a0d97

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Tue, 1 Aug 2017 10:51:20 +0000 (12:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Test to cover the change in ce1a0d97

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 1 Aug 2017 10:50:52 +0000 (12:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Test to cover the change in ce1a0d97

7 years agoTest to cover the change in ce1a0d97
Anatol Belski [Tue, 1 Aug 2017 10:49:45 +0000 (12:49 +0200)]
Test to cover the change in ce1a0d97

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Tue, 1 Aug 2017 10:02:16 +0000 (12:02 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  fix test
  fix NULL deref

7 years agofix test
Anatol Belski [Tue, 1 Aug 2017 09:56:23 +0000 (11:56 +0200)]
fix test

7 years agofix NULL deref
Anatol Belski [Tue, 1 Aug 2017 09:55:32 +0000 (11:55 +0200)]
fix NULL deref

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Mon, 31 Jul 2017 03:52:33 +0000 (11:52 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS

7 years agoUpdate NEWS
Xinchen Hui [Mon, 31 Jul 2017 03:52:23 +0000 (11:52 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Mon, 31 Jul 2017 03:51:51 +0000 (11:51 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Req #74963 (Improved error message on fetching property of non-object)

7 years agoReq #74963 (Improved error message on fetching property of non-object)
Xinchen Hui [Thu, 27 Jul 2017 02:42:36 +0000 (10:42 +0800)]
Req #74963 (Improved error message on fetching property of non-object)

7 years agoMerge branch 'req74963' of https://github.com/laruence/php-src
Xinchen Hui [Mon, 31 Jul 2017 03:45:19 +0000 (11:45 +0800)]
Merge branch 'req74963' of https://github.com/laruence/php-src

* 'req74963' of https://github.com/laruence/php-src:
  Req #74963 (Improved error message on fetching property of non-object)

7 years agoReq #74963 (Improved error message on fetching property of non-object)
Xinchen Hui [Thu, 27 Jul 2017 02:42:36 +0000 (10:42 +0800)]
Req #74963 (Improved error message on fetching property of non-object)

7 years agoMerge branch 'PHP-7.2'
Kalle Sommer Nielsen [Sun, 30 Jul 2017 20:01:31 +0000 (22:01 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Reduce EXIF test image sizes, there is still one large image left that I will look into reducing if possible (bug50845.jpg)
  Lowercase the file extension

7 years agoReduce EXIF test image sizes, there is still one large image left that I will look...
Kalle Sommer Nielsen [Sun, 30 Jul 2017 19:49:02 +0000 (21:49 +0200)]
Reduce EXIF test image sizes, there is still one large image left that I will look into reducing if possible (bug50845.jpg)

The changes in phpts are due to exiftool, I verified that all the images still remain relevant for testing

7 years agoLowercase the file extension
Kalle Sommer Nielsen [Sun, 30 Jul 2017 19:30:33 +0000 (21:30 +0200)]
Lowercase the file extension

7 years agoReduce EXIF test image sizes, there is still one large image left that I will look...
Kalle Sommer Nielsen [Sun, 30 Jul 2017 19:49:02 +0000 (21:49 +0200)]
Reduce EXIF test image sizes, there is still one large image left that I will look into reducing if possible (bug50845.jpg)

The changes in phpts are due to exiftool, I verified that all the images still remain relevant for testing

7 years agoLowercase the file extension
Kalle Sommer Nielsen [Sun, 30 Jul 2017 19:30:33 +0000 (21:30 +0200)]
Lowercase the file extension

7 years agoremove casts
Anatol Belski [Sat, 29 Jul 2017 04:31:47 +0000 (06:31 +0200)]
remove casts

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Sun, 30 Jul 2017 15:53:02 +0000 (17:53 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  remove dup of the binary file, rely on a test runtime copy instead

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Sun, 30 Jul 2017 15:52:36 +0000 (17:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  remove dup of the binary file, rely on a test runtime copy instead

7 years agoremove dup of the binary file, rely on a test runtime copy instead
Anatol Belski [Sun, 30 Jul 2017 15:51:27 +0000 (17:51 +0200)]
remove dup of the binary file, rely on a test runtime copy instead

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Sun, 30 Jul 2017 14:40:25 +0000 (16:40 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Shrink another large image

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sun, 30 Jul 2017 14:35:07 +0000 (16:35 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Shrink another large image

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 30 Jul 2017 14:27:38 +0000 (16:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Shrink another large image

7 years agoShrink another large image
Christoph M. Becker [Sun, 30 Jul 2017 14:24:40 +0000 (16:24 +0200)]
Shrink another large image

This image is only used for testing `BITMAPV5HEADER` support in
`getimagesize()` (see bf9ad4e). Therefore it is not necessary to have
a big image; a single pixel is sufficient.

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Sun, 30 Jul 2017 13:50:48 +0000 (15:50 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  sodium ext: skip scrypt if it is not available
  sodium ext: fix tests/pwhash_argon2i description
  sodium ext: check hash length for scrypt

7 years agoMerge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2
Frank Denis [Sun, 30 Jul 2017 13:42:24 +0000 (15:42 +0200)]
Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2

* 'PHP-7.2' of git.php.net:php-src:
  Shrink test image

7 years agosodium ext: skip scrypt if it is not available
Frank Denis [Sun, 30 Jul 2017 13:05:41 +0000 (15:05 +0200)]
sodium ext: skip scrypt if it is not available

scrypt was removed from minimal libsodium builds in version 1.0.13

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Sun, 30 Jul 2017 13:07:19 +0000 (15:07 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Shrink test image

7 years agosodium ext: fix tests/pwhash_argon2i description
Frank Denis [Sun, 30 Jul 2017 13:05:21 +0000 (15:05 +0200)]
sodium ext: fix tests/pwhash_argon2i description

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sun, 30 Jul 2017 13:01:59 +0000 (15:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Shrink test image

7 years agosodium ext: check hash length for scrypt
Frank Denis [Sun, 30 Jul 2017 13:00:03 +0000 (15:00 +0200)]
sodium ext: check hash length for scrypt

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Sun, 30 Jul 2017 12:49:16 +0000 (14:49 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES
  sodium ext: check that message sizes are safe, to avoid hitting abort() in libsodium
  sodium ext: use unexpand -t 4 --first-only to convert from spaces to tabs

7 years agoMerge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2
Frank Denis [Sun, 30 Jul 2017 12:48:44 +0000 (14:48 +0200)]
Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2

* 'PHP-7.2' of git.php.net:php-src:
  It's `--SKIPIF--`, not `--SKIP--`

7 years agosodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES
Frank Denis [Sun, 30 Jul 2017 12:46:10 +0000 (14:46 +0200)]
sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES

chacha20poly1305_ietf was implemented in libsodium 1.0.4 which is way earlier
than the minimum version we support.

7 years agosodium ext: check that message sizes are safe, to avoid hitting abort() in libsodium
Frank Denis [Sun, 30 Jul 2017 12:45:06 +0000 (14:45 +0200)]
sodium ext: check that message sizes are safe, to avoid hitting abort() in libsodium

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 30 Jul 2017 12:44:52 +0000 (14:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Shrink test image

7 years agoShrink test image
Christoph M. Becker [Sun, 30 Jul 2017 12:43:37 +0000 (14:43 +0200)]
Shrink test image

The last (`IDAT`) chunk in this file starting at `0x5e265` reports to
have a length of `0x2000` bytes, but there are only `0x1D9B` bytes
left. Simply cutting the first `IDAT` chunk which starts at `0x31` and
also reports a length of `0x2000` at the same offset should produce the
same test results (while reducing the file size to 7.628 bytes).

7 years agosodium ext: use unexpand -t 4 --first-only to convert from spaces to tabs
Frank Denis [Sun, 30 Jul 2017 12:34:55 +0000 (14:34 +0200)]
sodium ext: use unexpand -t 4 --first-only to convert from spaces to tabs

No actual code changes.

Fun fact: macOS' unexpand(1) tool doesn't work as documented, and always
converts everything to tabs, regardless of the -a switch.