mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2'

Browse Source 
* PHP-7.2:
  Fix some arginfos
This commit is contained in:
Christoph M. Becker 2018-02-23 11:32:18 +01:00
commit d5f84fb9c5
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ftp/php_ftp.c
View File

@ -142,7 +142,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fget, 0, 0, 3)
ZEND_ARG_INFO(0, resumepos) ZEND_ARG_INFO(0, resumepos)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_pasv, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_pasv, 0, 0, 2)
ZEND_ARG_INFO(0, ftp) ZEND_ARG_INFO(0, ftp)
ZEND_ARG_INFO(0, pasv) ZEND_ARG_INFO(0, pasv)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()

8
ext/openssl/openssl.c
View File

@ -159,7 +159,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_parse, 0, 0, 1)
ZEND_ARG_INFO(0, shortname) ZEND_ARG_INFO(0, shortname)
ZEND_END_ARG_INFO() 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, x509cert)
ZEND_ARG_INFO(0, purpose) ZEND_ARG_INFO(0, purpose)
ZEND_ARG_INFO(0, cainfo) /* array */ 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_ARG_INFO(0, extraattribs)
ZEND_END_ARG_INFO() 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, csr)
ZEND_ARG_INFO(0, use_shortnames)
ZEND_END_ARG_INFO() 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, csr)
ZEND_ARG_INFO(0, use_shortnames)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_new, 0, 0, 0) ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_new, 0, 0, 0)

10
ext/standard/basic_functions.c
View File

@ -633,7 +633,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_long2ip, 0)
ZEND_ARG_INFO(0, proper_address) ZEND_ARG_INFO(0, proper_address)
ZEND_END_ARG_INFO() 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, varname)
ZEND_ARG_INFO(0, local_only) ZEND_ARG_INFO(0, local_only)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
@ -1386,7 +1386,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_vfprintf, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
/* }}} */ /* }}} */
/* {{{ fsock.c */ /* {{{ 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, hostname)
ZEND_ARG_INFO(0, port) ZEND_ARG_INFO(0, port)
ZEND_ARG_INFO(1, errno) ZEND_ARG_INFO(1, errno)
@ -1394,7 +1394,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 2)
ZEND_ARG_INFO(0, timeout) ZEND_ARG_INFO(0, timeout)
ZEND_END_ARG_INFO() 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, hostname)
ZEND_ARG_INFO(0, port) ZEND_ARG_INFO(0, port)
ZEND_ARG_INFO(1, errno) ZEND_ARG_INFO(1, errno)
@ -2206,7 +2206,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_implode, 0)
ZEND_ARG_INFO(0, pieces) ZEND_ARG_INFO(0, pieces)
ZEND_END_ARG_INFO() 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, str)
ZEND_ARG_INFO(0, token) ZEND_ARG_INFO(0, token)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
@ -2472,7 +2472,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_str_split, 0, 0, 1)
ZEND_ARG_INFO(0, split_length) ZEND_ARG_INFO(0, split_length)
ZEND_END_ARG_INFO() 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, haystack)
ZEND_ARG_INFO(0, char_list) ZEND_ARG_INFO(0, char_list)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()