]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Fri, 23 Jun 2017 22:24:56 +0000 (00:24 +0200)
committerAnatol Belski <ab@php.net>
Fri, 23 Jun 2017 22:24:56 +0000 (00:24 +0200)
* PHP-7.1:
  Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content

1  2 
ext/openssl/openssl.c

Simple merge