Merge branch 'PHP-7.1' into PHP-7.2

diff --cc NEWS
index 8c032088c104aebd9b9f9e0c26964312512f3d8d,b8f24827c4346e3bc5234bf045c6179d6c15869e..9a0c39511df0622d27e8aa5e06d3093ec8fc0d65
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -19,23 -19,9 +19,23 @@@ PH
    . Fixed bug #75301 (Exif extension has built in revision version). (Peter
      Kokot)
  
- - Openssl:
-   . Fixed bug #75363 (openssl_x509_parse leaks memory). (Bob)
 +- Fileinfo:
 +  . Upgrade bundled libmagic to 5.31. (Anatol)
 +
 +- JSON:
 +  . Fixed bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null
 +    key). (Jakub Zelenka)
 +
 +- Opcache:
 +  . Fixed bug #75370 (Webserver hangs on valid PHP text). (Laruence)
 +  . Fixed bug #75357 (segfault loading WordPress wp-admin). (Laruence)
 +
+ - OpenSSL:
+   . Fixed bug #75363 (openssl_x509_parse leaks memory). (Bob, Jakub Zelenka)
  
 +- Standard:
 +  . Fixed bug #75221 (Argon2i always throws NUL at the end). (cmb)
 +
  - Zlib:
    . Fixed bug #75299 (Wrong reflection on inflate_init and inflate_add). (Fabien
      Villepinte)

diff --cc ext/openssl/openssl.c
Simple merge