diff options
| author | Jani Taskinen <jani@php.net> | 2007-12-29 18:46:27 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-12-29 18:46:27 +0000 |
| commit | 8a313d8e77c9fbfa3d4bd95c277cdbedca6d2ee3 (patch) | |
| tree | db9a0eda0935114832489d8a7c250b0ef5386fd6 | |
| parent | b9c22f2b1e29c31427cbeabc2f812678c72d6f13 (diff) | |
| download | php-git-8a313d8e77c9fbfa3d4bd95c277cdbedca6d2ee3.tar.gz | |
MFH:- This makes no sense with non-ipv6 builds. (and fixes lot of issues with misconfigured servers)
| -rw-r--r-- | ext/standard/ftp_fopen_wrapper.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index b484b6b151..6c643b4a1e 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -300,19 +300,21 @@ connect_errexit: /* {{{ php_fopen_do_pasv */ -static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, int ip_size, char **phoststart TSRMLS_DC) +static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, size_t ip_size, char **phoststart TSRMLS_DC) { char tmp_line[512]; int result, i; unsigned short portno; char *tpath, *ttpath, *hoststart=NULL; +#ifdef HAVE_IPV6 /* We try EPSV first, needed for IPv6 and works on some IPv4 servers */ php_stream_write_string(stream, "EPSV\r\n"); result = GET_FTP_RESULT(stream); /* check if we got a 229 response */ if (result != 229) { +#endif /* EPSV failed, let's try PASV */ php_stream_write_string(stream, "PASV\r\n"); result = GET_FTP_RESULT(stream); @@ -357,6 +359,7 @@ static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, int ip_siz tpath++; /* pull out the LSB of the port */ portno += (unsigned short) strtoul(tpath, &ttpath, 10); +#ifdef HAVE_IPV6 } else { /* parse epsv command (|||6446|) */ for (i = 0, tpath = tmp_line + 4; *tpath; tpath++) { @@ -372,7 +375,7 @@ static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, int ip_siz /* pull out the port */ portno = (unsigned short) strtoul(tpath + 1, &ttpath, 10); } - +#endif if (ttpath == NULL) { /* didn't get correct response from EPSV/PASV */ return 0; |