diff options
| author | Avi Brender <abrender@elitehosts.com> | 2015-12-15 11:51:32 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-12-15 11:51:32 +0200 |
| commit | 71e468e14149169b28439a552f5924330580acab (patch) | |
| tree | 22a014cb49e0a72e1bfc83f1ac9ac16bbea39b70 /ext/ftp/php_ftp.c | |
| parent | e048b3fc6b482d19c3f21e6691b2e0188fc83a77 (diff) | |
| parent | 838e4039d7fc8f79fe71091725ab0a13a5f4ad2a (diff) | |
| download | php-git-71e468e14149169b28439a552f5924330580acab.tar.gz | |
Implement FR #55651 (Option to ignore the returned FTP PASV address)
Diffstat (limited to 'ext/ftp/php_ftp.c')
| -rw-r--r-- | ext/ftp/php_ftp.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index eaed5c6847..ca62720790 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -326,6 +326,7 @@ PHP_MINIT_FUNCTION(ftp) REGISTER_LONG_CONSTANT("FTP_AUTORESUME", PHP_FTP_AUTORESUME, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("FTP_TIMEOUT_SEC", PHP_FTP_OPT_TIMEOUT_SEC, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("FTP_AUTOSEEK", PHP_FTP_OPT_AUTOSEEK, CONST_PERSISTENT | CONST_CS); + REGISTER_LONG_CONSTANT("FTP_USEPASVADDRESS", PHP_FTP_OPT_USEPASVADDRESS, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("FTP_FAILED", PHP_FTP_FAILED, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("FTP_FINISHED", PHP_FTP_FINISHED, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("FTP_MOREDATA", PHP_FTP_MOREDATA, CONST_PERSISTENT | CONST_CS); @@ -379,6 +380,7 @@ PHP_FUNCTION(ftp_connect) /* autoseek for resuming */ ftp->autoseek = FTP_DEFAULT_AUTOSEEK; + ftp->usepasvaddress = FTP_DEFAULT_USEPASVADDRESS; #ifdef HAVE_FTP_SSL /* disable ssl */ ftp->use_ssl = 0; @@ -415,6 +417,7 @@ PHP_FUNCTION(ftp_ssl_connect) /* autoseek for resuming */ ftp->autoseek = FTP_DEFAULT_AUTOSEEK; + ftp->usepasvaddress = FTP_DEFAULT_USEPASVADDRESS; /* enable ssl */ ftp->use_ssl = 1; @@ -1478,6 +1481,15 @@ PHP_FUNCTION(ftp_set_option) ftp->autoseek = Z_TYPE_P(z_value) == IS_TRUE ? 1 : 0; RETURN_TRUE; break; + case PHP_FTP_OPT_USEPASVADDRESS: + if (Z_TYPE_P(z_value) != IS_TRUE && Z_TYPE_P(z_value) != IS_FALSE) { + php_error_docref(NULL, E_WARNING, "Option USEPASVADDRESS expects value of type boolean, %s given", + zend_zval_type_name(z_value)); + RETURN_FALSE; + } + ftp->usepasvaddress = Z_TYPE_P(z_value) == IS_TRUE ? 1 : 0; + RETURN_TRUE; + break; default: php_error_docref(NULL, E_WARNING, "Unknown option '%pd'", option); RETURN_FALSE; @@ -1509,6 +1521,9 @@ PHP_FUNCTION(ftp_get_option) case PHP_FTP_OPT_AUTOSEEK: RETURN_BOOL(ftp->autoseek); break; + case PHP_FTP_OPT_USEPASVADDRESS: + RETURN_BOOL(ftp->usepasvaddress); + break; default: php_error_docref(NULL, E_WARNING, "Unknown option '%pd'", option); RETURN_FALSE; |