diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-23 11:28:16 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-23 11:29:21 +0100 |
| commit | c6cf3d4ada79830fab28778aedb15af66bf238ab (patch) | |
| tree | 458131a8e050bfc068cbada0c454170ac07b3380 /ext/openssl/openssl.c | |
| parent | 2577cdbea2d8c6accd0cb311ee4490ee24d637fd (diff) | |
| parent | 0b8cfa6c786536947cfa0be1aad0e396096aded7 (diff) | |
| download | php-git-c6cf3d4ada79830fab28778aedb15af66bf238ab.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix some arginfos
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index af9f7a4b86..524192a020 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -159,7 +159,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_parse, 0, 0, 1) ZEND_ARG_INFO(0, shortname) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_checkpurpose, 0, 0, 3) +ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_checkpurpose, 0, 0, 2) ZEND_ARG_INFO(0, x509cert) ZEND_ARG_INFO(0, purpose) ZEND_ARG_INFO(0, cainfo) /* array */ @@ -224,12 +224,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_new, 0, 0, 2) ZEND_ARG_INFO(0, extraattribs) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_openssl_csr_get_subject, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_get_subject, 0, 0, 1) ZEND_ARG_INFO(0, csr) + ZEND_ARG_INFO(0, use_shortnames) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_openssl_csr_get_public_key, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_get_public_key, 0, 0, 1) ZEND_ARG_INFO(0, csr) + ZEND_ARG_INFO(0, use_shortnames) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_new, 0, 0, 0) |