]> granicus.if.org Git - php/log
php
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 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.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' 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 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' 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.

7 years agoIt's `--SKIPIF--`, not `--SKIP--`
Christoph M. Becker [Sun, 30 Jul 2017 12:01:51 +0000 (14:01 +0200)]
It's `--SKIPIF--`, not `--SKIP--`

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

* PHP-7.1:
  Skip this test if ext/gd is not available

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

* PHP-7.0:
  Skip this test if ext/gd is not available

7 years agoSkip this test if ext/gd is not available
Christoph M. Becker [Sun, 30 Jul 2017 11:24:10 +0000 (13:24 +0200)]
Skip this test if ext/gd is not available

7 years agosodium ext: let crypto_pwhash() accept an optional algorithm identifier
Frank Denis [Sat, 29 Jul 2017 11:04:54 +0000 (13:04 +0200)]
sodium ext: let crypto_pwhash() accept an optional algorithm identifier

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 28 Jul 2017 11:03:11 +0000 (13:03 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 28 Jul 2017 11:02:52 +0000 (13:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFixed bug #62934
Nikita Popov [Fri, 28 Jul 2017 11:02:25 +0000 (13:02 +0200)]
Fixed bug #62934

7 years agoadd missing makefile fragment for .w32
Anatol Belski [Fri, 28 Jul 2017 00:34:51 +0000 (02:34 +0200)]
add missing makefile fragment for .w32

ensure correct dir

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 27 Jul 2017 22:28:12 +0000 (00:28 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  relax test on travis

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 27 Jul 2017 22:27:52 +0000 (00:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  relax test on travis

7 years agorelax test on travis
Anatol Belski [Thu, 27 Jul 2017 22:27:11 +0000 (00:27 +0200)]
relax test on travis

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Thu, 27 Jul 2017 14:04:59 +0000 (10:04 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Simpler fix for #74974

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sara Golemon [Thu, 27 Jul 2017 14:04:14 +0000 (10:04 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Simpler fix for #74974

7 years agoSimpler fix for #74974
Pedro Magalhães [Sun, 23 Jul 2017 12:41:50 +0000 (14:41 +0200)]
Simpler fix for #74974

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Thu, 27 Jul 2017 04:50:41 +0000 (12:50 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed test

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Thu, 27 Jul 2017 04:50:28 +0000 (12:50 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed test

7 years agoFixed test
Xinchen Hui [Thu, 27 Jul 2017 04:50:17 +0000 (12:50 +0800)]
Fixed test

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Thu, 27 Jul 2017 03:24:53 +0000 (11:24 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update NEWS
  Fixed bug #74949 (null pointer dereference in _function_string)

7 years agoUpdate NEWS
Xinchen Hui [Thu, 27 Jul 2017 03:24:26 +0000 (11:24 +0800)]
Update NEWS

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

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Thu, 27 Jul 2017 03:23:27 +0000 (11:23 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74949 (null pointer dereference in _function_string)

7 years agoFixed bug #74949 (null pointer dereference in _function_string)
Xinchen Hui [Thu, 27 Jul 2017 03:23:06 +0000 (11:23 +0800)]
Fixed bug #74949 (null pointer dereference in _function_string)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Wed, 26 Jul 2017 22:56:06 +0000 (18:56 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sara Golemon [Wed, 26 Jul 2017 22:55:46 +0000 (18:55 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods

7 years agoBugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
Sara Golemon [Wed, 26 Jul 2017 21:59:29 +0000 (17:59 -0400)]
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 26 Jul 2017 15:31:57 +0000 (17:31 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 26 Jul 2017 15:31:10 +0000 (17:31 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

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

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 26 Jul 2017 15:30:40 +0000 (17:30 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 26 Jul 2017 15:30:02 +0000 (17:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 26 Jul 2017 15:29:37 +0000 (17:29 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 26 Jul 2017 11:21:20 +0000 (13:21 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #74833, SID constant created with wrong module number

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 26 Jul 2017 11:20:48 +0000 (13:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74833, SID constant created with wrong module number

7 years agoFixed bug #74833, SID constant created with wrong module number
Anatol Belski [Wed, 26 Jul 2017 11:19:41 +0000 (13:19 +0200)]
Fixed bug #74833, SID constant created with wrong module number

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 26 Jul 2017 09:47:32 +0000 (10:47 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 26 Jul 2017 09:47:02 +0000 (10:47 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases

7 years agoFix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR...
Benjamin W. Broersma [Wed, 26 Jul 2017 06:16:37 +0000 (08:16 +0200)]
Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases

7 years agoUpdate NEWS
Christopher Jones [Wed, 26 Jul 2017 05:25:01 +0000 (15:25 +1000)]
Update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Wed, 26 Jul 2017 05:24:26 +0000 (15:24 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoUpdate NEWS
Christopher Jones [Wed, 26 Jul 2017 05:23:58 +0000 (15:23 +1000)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Wed, 26 Jul 2017 05:23:17 +0000 (15:23 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoExpose oci_unregister_taf_callback()
Christopher Jones [Wed, 26 Jul 2017 05:22:44 +0000 (15:22 +1000)]
Expose oci_unregister_taf_callback()

7 years agoUpdate NEWS
Xinchen Hui [Wed, 26 Jul 2017 04:07:20 +0000 (12:07 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Wed, 26 Jul 2017 04:06:55 +0000 (12:06 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #74980 (Narrowing occurred during type inference)

7 years agoFixed bug #74980 (Narrowing occurred during type inference)
Xinchen Hui [Wed, 26 Jul 2017 04:06:33 +0000 (12:06 +0800)]
Fixed bug #74980 (Narrowing occurred during type inference)

7 years agoRemove obsolete function names from CODING_STANDARDS file
Aleš Rebec [Fri, 14 Apr 2017 20:26:50 +0000 (22:26 +0200)]
Remove obsolete function names from CODING_STANDARDS file

Deprecated and removed function names used as examples in coding standards file.

- Mcrypt is deprecated and will be removed in 7.2
- Mysql functions are deprecated in 5.4 and removed in 7.0.

According to those changes, CODING_STANDARDS file should be updated.

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 25 Jul 2017 05:58:47 +0000 (06:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed finding CURL on systems with multiarch support

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Tue, 25 Jul 2017 05:58:23 +0000 (06:58 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed finding CURL on systems with multiarch support

7 years agoFixed finding CURL on systems with multiarch support
Carsten Brandt [Fri, 14 Jul 2017 11:45:33 +0000 (13:45 +0200)]
Fixed finding CURL on systems with multiarch support

fixes https://bugs.php.net/bug.php?id=74125

This commit makes the cURL config script aware of debian/ubuntu
[multiarch support][1] which installs architecture specific
headers in a different location.

It checks whether the `dpkg-architecture` script exists and is
executeable, if that is the case, the multiarch architecture is
detected by calling `dpkg-architecture -qDEB_HOST_MULTIARCH` as
documented in [debian multiarch implementation docs][2]:

> `/usr/include/<triplet>`: used for arch-varying headers

[1]: https://wiki.debian.org/Multiarch
[2]: https://wiki.debian.org/Multiarch/Implementation

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 25 Jul 2017 05:54:20 +0000 (06:54 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  minor loop optimizations, closes #2633

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Tue, 25 Jul 2017 05:51:44 +0000 (06:51 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  minor loop optimizations, closes #2633

7 years agominor loop optimizations, closes #2633
Joe Watkins [Tue, 25 Jul 2017 05:47:58 +0000 (06:47 +0100)]
minor loop optimizations, closes #2633

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 25 Jul 2017 05:40:08 +0000 (06:40 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed #74977 - Appending AppendIterator leads to segfault

7 years agoFixed #74977 - Appending AppendIterator leads to segfault
andrewnester [Mon, 24 Jul 2017 15:41:02 +0000 (18:41 +0300)]
Fixed #74977 - Appending AppendIterator leads to segfault

7 years agoFix ext/sodium display in phpinfo()
Sammy Kaye Powers [Mon, 24 Jul 2017 22:16:24 +0000 (17:16 -0500)]
Fix ext/sodium display in phpinfo()

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 24 Jul 2017 21:09:20 +0000 (23:09 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  switch to binary sdk 2.0.9 for appveyor

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 24 Jul 2017 21:08:07 +0000 (23:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  switch to binary sdk 2.0.9 for appveyor

7 years agoswitch to binary sdk 2.0.9 for appveyor
Anatol Belski [Mon, 24 Jul 2017 21:07:15 +0000 (23:07 +0200)]
switch to binary sdk 2.0.9 for appveyor

7 years agoFix typo in PHP 7.2 changelog
jrfnl [Mon, 24 Jul 2017 20:12:37 +0000 (22:12 +0200)]
Fix typo in PHP 7.2 changelog

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Mon, 24 Jul 2017 16:24:22 +0000 (17:24 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update copyright year to 2017

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 24 Jul 2017 16:24:10 +0000 (17:24 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Update copyright year to 2017

7 years agoUpdate copyright year to 2017
Peter Kokot [Sat, 22 Jul 2017 18:22:04 +0000 (20:22 +0200)]
Update copyright year to 2017

7 years ago[ci skip] update NEWS
Anatol Belski [Mon, 24 Jul 2017 15:46:31 +0000 (17:46 +0200)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 24 Jul 2017 15:03:24 +0000 (17:03 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Add test for bug #74903

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 24 Jul 2017 15:02:55 +0000 (17:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add test for bug #74903

7 years agoAdd test for bug #74903
Anatol Belski [Mon, 24 Jul 2017 15:02:10 +0000 (17:02 +0200)]
Add test for bug #74903

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 24 Jul 2017 14:38:05 +0000 (16:38 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Followup on 0ec147d3 for another place
  Ensure binary mode for OpenSSL I/O

7 years agoFollowup on 0ec147d3 for another place
Anatol Belski [Mon, 24 Jul 2017 14:24:04 +0000 (16:24 +0200)]
Followup on 0ec147d3 for another place

which requires also to move the macros into the header

(cherry picked from commit b7eb2c060409a8f5809d6e73f53d88844cf9ed09)

7 years agoEnsure binary mode for OpenSSL I/O
Anatol Belski [Mon, 24 Jul 2017 13:43:48 +0000 (15:43 +0200)]
Ensure binary mode for OpenSSL I/O

Essential for OpenSSL 1.1.0 on Windows, some issues was revealed earlier
and now by openssl_pkcs12_export_to_file_basic.phpt.

(cherry picked from commit 0ec147d301b33b2cb0f347c6e81eb7e75e75b521)

7 years agoFollowup on 0ec147d3 for another place
Anatol Belski [Mon, 24 Jul 2017 14:24:04 +0000 (16:24 +0200)]
Followup on 0ec147d3 for another place

which requires also to move the macros into the header

7 years agoEnsure binary mode for OpenSSL I/O
Anatol Belski [Mon, 24 Jul 2017 13:43:48 +0000 (15:43 +0200)]
Ensure binary mode for OpenSSL I/O

Essential for OpenSSL 1.1.0 on Windows, some issues was revealed earlier
and now by openssl_pkcs12_export_to_file_basic.phpt.

7 years agoCombine conditions for the automatic interactive console activation
Anatol Belski [Mon, 24 Jul 2017 12:47:32 +0000 (14:47 +0200)]
Combine conditions for the automatic interactive console activation

as with bug #74979 it seems to have regressions which were not
present before.

7 years agosodium ext: don't reinvent sodium_increment() and sodium_add()
Frank Denis [Mon, 24 Jul 2017 12:26:05 +0000 (14:26 +0200)]
sodium ext: don't reinvent sodium_increment() and sodium_add()

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Mon, 24 Jul 2017 09:47:02 +0000 (10:47 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  openssl: Add openssl_pkcs12_export_to_file tests

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 24 Jul 2017 09:46:52 +0000 (10:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  openssl: Add openssl_pkcs12_export_to_file tests

7 years agoopenssl: Add openssl_pkcs12_export_to_file tests
Jelle van der Waa [Sat, 22 Jul 2017 20:40:10 +0000 (22:40 +0200)]
openssl: Add openssl_pkcs12_export_to_file tests

Add basic tests for openssl_pkcs12_export_to_file.

7 years agoFix typo in UPGRADING for 7.2
Issei.M [Sun, 23 Jul 2017 14:08:49 +0000 (23:08 +0900)]
Fix typo in UPGRADING for 7.2

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Mon, 24 Jul 2017 09:42:48 +0000 (10:42 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update PHP 5 version to 7 in header comments

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 24 Jul 2017 09:42:35 +0000 (10:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Update PHP 5 version to 7 in header comments

7 years agoUpdate PHP 5 version to 7 in header comments
Peter Kokot [Sun, 23 Jul 2017 14:39:30 +0000 (16:39 +0200)]
Update PHP 5 version to 7 in header comments

7 years agoAdd hash_hmac_algos() for filtered is_crypto methods
Sara Golemon [Sun, 23 Jul 2017 19:14:31 +0000 (15:14 -0400)]
Add hash_hmac_algos() for filtered is_crypto methods

7 years agoUpdate Unicode data for Unicode 10
Nikita Popov [Sun, 23 Jul 2017 14:05:39 +0000 (16:05 +0200)]
Update Unicode data for Unicode 10

7 years agoUpdate ucgendat for more bidi properties
Nikita Popov [Sun, 23 Jul 2017 14:03:11 +0000 (16:03 +0200)]
Update ucgendat for more bidi properties

Handle them the same way as others -- by classifying as Other
Neutral.