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/ftp | |
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/ftp')
-rw-r--r-- | ext/ftp/php_ftp.c | 2 |
1 files changed, 1 insertions, 1 deletions
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() |