]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Fri, 9 Jun 2017 15:37:42 +0000 (17:37 +0200)
committerAnatol Belski <ab@php.net>
Fri, 9 Jun 2017 15:37:42 +0000 (17:37 +0200)
* PHP-7.1:
  Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in

1  2 
ext/openssl/openssl.c

Simple merge