diff options
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | ext/ftp/php_ftp.c | 2 | ||||
-rw-r--r-- | ext/openssl/openssl.c | 8 | ||||
-rw-r--r-- | ext/standard/basic_functions.c | 10 |
4 files changed, 15 insertions, 9 deletions
@@ -16,6 +16,9 @@ PHP NEWS . Fixed bug #68406 (calling var_dump on a DateTimeZone object modifies it). (jhdxr) +- FTP: + . Fixed ftp_pasv arginfo. (carusogabriel) + - LDAP: . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke) @@ -54,6 +57,7 @@ PHP NEWS . Fixed bug #75961 (Strange references behavior). (Laruence) . Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike, Philip Sharp) + . Fixed some arginfos. (carusogabriel) 01 Feb 2018, PHP 7.2.2 diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index b9a017a172..aca0e0d934 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -142,7 +142,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fget, 0, 0, 4) ZEND_ARG_INFO(0, resumepos) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ftp_pasv, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_pasv, 0, 0, 2) ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, pasv) ZEND_END_ARG_INFO() 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) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index f2bafb1145..2ce900d512 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -632,7 +632,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_long2ip, 0) ZEND_ARG_INFO(0, proper_address) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_getenv, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_getenv, 0, 0, 0) ZEND_ARG_INFO(0, varname) ZEND_ARG_INFO(0, local_only) ZEND_END_ARG_INFO() @@ -1382,7 +1382,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_vfprintf, 0) ZEND_END_ARG_INFO() /* }}} */ /* {{{ fsock.c */ -ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 1) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, port) ZEND_ARG_INFO(1, errno) @@ -1390,7 +1390,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 2) ZEND_ARG_INFO(0, timeout) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_pfsockopen, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_pfsockopen, 0, 0, 1) ZEND_ARG_INFO(0, hostname) ZEND_ARG_INFO(0, port) ZEND_ARG_INFO(1, errno) @@ -2197,7 +2197,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_implode, 0) ZEND_ARG_INFO(0, pieces) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_strtok, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_strtok, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, token) ZEND_END_ARG_INFO() @@ -2463,7 +2463,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_str_split, 0, 0, 1) ZEND_ARG_INFO(0, split_length) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_strpbrk, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_strpbrk, 0, 0, 2) ZEND_ARG_INFO(0, haystack) ZEND_ARG_INFO(0, char_list) ZEND_END_ARG_INFO() |