]> granicus.if.org Git - php/commit
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)
commit587b8008116bdbd0f8018b57d78ffd3e4da4f00c
tree20c9a645ac6954aebede5343e19a77fd5a6b51e2
parent130f06a8a13cc23c7e3ae5f1b639110f310aea17
parentcbe73b3cfe5945926c8d91dcc0884ce7524764eb
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in
ext/openssl/openssl.c