]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJakub Zelenka <bukka@php.net>
Mon, 30 Oct 2017 16:42:23 +0000 (16:42 +0000)
committerJakub Zelenka <bukka@php.net>
Mon, 30 Oct 2017 16:42:23 +0000 (16:42 +0000)
commit7c2031bfca3a4c006fbdbd863373dcebc360c7cd
tree6a3c0c6a487ee72d44cc15282153d5b4797d971c
parent37b0ad5537e7ccbdce6d81afa402c01885db79f1
parentfc169d2133a0507addbfd4f3b0cafe224b6e2c38
Merge branch 'PHP-7.0' into PHP-7.1
ext/openssl/openssl.c
ext/openssl/tests/001.phpt
ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt
ext/openssl/tests/openssl_pkcs7_encrypt_basic.phpt
ext/openssl/tests/openssl_pkcs7_sign_basic.phpt
ext/openssl/tests/openssl_pkey_export_basic.phpt