diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-20 16:26:06 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-20 16:26:06 +0100 |
| commit | e8affd805ffb24c8f481765f5705ffb442bb5bae (patch) | |
| tree | 60ebed1b5ff9b9ba85b6aa1fb3f7e43b7e620685 | |
| parent | d1466bf4ac5ccab81dcd660f8af0a4fd0a6cf6c1 (diff) | |
| parent | e80e38ab7caa09b91c841d9b0e711791d75d8883 (diff) | |
| download | php-git-e8affd805ffb24c8f481765f5705ffb442bb5bae.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix openssl_* arginfos
| -rw-r--r-- | ext/openssl/openssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 4d2b1714da..2231f751ea 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -154,7 +154,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_check_private_key, 0) ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_parse, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_parse, 0, 0, 1) ZEND_ARG_INFO(0, x509) ZEND_ARG_INFO(0, shortname) ZEND_END_ARG_INFO() @@ -182,7 +182,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs12_export_to_file, 0, 0, 4) ZEND_ARG_INFO(0, args) /* array */ ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkcs12_export, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs12_export, 0, 0, 4) ZEND_ARG_INFO(0, x509) ZEND_ARG_INFO(1, out) ZEND_ARG_INFO(0, priv_key) |