diff options
| -rw-r--r-- | ftp/curl/Makefile | 53 | ||||
| -rw-r--r-- | ftp/curl/distinfo | 6 | ||||
| -rw-r--r-- | ftp/curl/files/patch-Makefile.in | 29 | ||||
| -rw-r--r-- | ftp/curl/files/patch-configure | 18 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::TODO | 80 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::curl.1 | 740 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::curl.html | 436 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::examples::fileupload.c | 16 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::libcurl::curl_easy_pause.3 | 21 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::libcurl::curl_easy_pause.html | 21 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::libcurl::curl_multi_setopt.3 | 12 | ||||
| -rw-r--r-- | ftp/curl/files/patch-docs::libcurl::curl_multi_setopt.html | 12 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib::easy.c | 12 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib::file.c | 12 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib::multi.c | 12 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib::ssh.c | 661 | ||||
| -rw-r--r-- | ftp/curl/files/patch-src::main.c | 116 | ||||
| -rw-r--r-- | ftp/curl/files/patch-tests::libtest::lib505.c | 49 | ||||
| -rw-r--r-- | ftp/curl/files/patch-tests::libtest::lib541.c | 49 | ||||
| -rw-r--r-- | ftp/curl/pkg-plist | 88 |
20 files changed, 1724 insertions, 719 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 7ee412296b19..a6b7442e701f 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -6,8 +6,7 @@ # PORTNAME= curl -PORTVERSION= 7.16.3 -PORTREVISION= 1 +PORTVERSION= 7.18.0 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ ${MASTER_SITE_SOURCEFORGE} \ @@ -22,7 +21,8 @@ COMMENT= Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers MAN1= curl.1 curl-config.1 MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 \ curl_easy_escape.3 curl_easy_getinfo.3 \ - curl_easy_init.3 curl_easy_perform.3 curl_easy_reset.3 \ + curl_easy_init.3 curl_easy_pause.3 \ + curl_easy_perform.3 curl_easy_reset.3 \ curl_easy_setopt.3 curl_easy_strerror.3 curl_easy_unescape.3 \ curl_escape.3 \ curl_unescape.3 curl_formadd.3 curl_formget.3 curl_formfree.3 curl_free.3 \ @@ -54,6 +54,8 @@ OPTIONS= CARES "Asynchronous DNS resolution via c-ares" off \ GNUTLS "Use GNU TLS if OPENSSL is OFF" off \ IPV6 "IPv6 support" on \ KERBEROS4 "Kerberos 4 authentication" off \ + LDAP "LDAP support" off \ + LDAPS "LDAPS support (requires LDAP and SSL)" off \ LIBIDN "Internationalized Domain Names via libidn" off \ LIBSSH2 "SCP/SFTP support via libssh2" off \ NTLM "NTLM authentication" off \ @@ -77,6 +79,16 @@ IGNORE= only supports NTLM with OpenSSL IGNORE= does not support both c-ares and IPv6 - disable one of them .endif +.if defined(WITH_LDAPS) +.if !defined(WITH_LDAP) +IGNORE= only supports LDAPS with LDAP +.else +.if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS) +IGNORE= only supports LDAPS with SSL (OpenSSL or GNUTLS) +.endif +.endif +.endif + .if !defined(WITHOUT_OPENSSL) .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} @@ -116,6 +128,21 @@ CONFIGURE_ARGS += --with-krb4=/usr CONFIGURE_ARGS += --without-krb4 .endif +.if defined(WITH_LDAP) +CONFIGURE_ARGS+= --enable-ldap +USE_OPENLDAP= yes +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +ADDFLAGS= true +.if defined(WITH_LDAPS) +CONFIGURE_ARGS+= --enable-ldaps +.else +CONFIGURE_ARGS+= --disable-ldaps +.endif +.else +CONFIGURE_ARGS+= --disable-ldap --disable-ldaps +.endif + .if defined(WITH_LIBIDN) LIB_DEPENDS+= idn.16:${PORTSDIR}/dns/libidn CONFIGURE_ARGS+= --with-libidn=${LOCALBASE} @@ -140,15 +167,25 @@ CONFIGURE_ARGS+= --enable-ntlm CONFIGURE_ARGS+= --disable-ntlm .endif -post-patch: - @${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \ - ${WRKSRC}/Makefile.in +.if defined(ADDFLAGS) +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +.endif + +DOCS= BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES \ + HISTORY INSTALL INSTALL.devcpp INTERNALS KNOWN_BUGS \ + LICENSE-MIXING MANUAL README.netware README.win32 RESOURCES \ + SSLCERTS THANKS TODO TheArtOfHttpScripting VERSIONS \ + curl-config.html curl-config.pdf curl.html curl.pdf \ + index.html post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - (cd ${WRKSRC}/docs && exec ${COPYTREE_SHARE} \* ${DOCSDIR} \ - "! -name Makefile ! -name Makefile.am ! -name Makefile.in ! -name curl.1 ! -name curl-config.1 ! -name *.3") + ${INSTALL_DATA} ${DOCS:S@^@${WRKSRC}/docs/@} ${DOCSDIR} + @${MKDIR} ${DOCSDIR}/libcurl + (cd ${WRKSRC}/docs/libcurl && exec ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${DOCSDIR}/libcurl/) + @${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/examples/README ${WRKSRC}/docs/examples/Makefile.example ${WRKSRC}/docs/examples/makefile* ${WRKSRC}/docs/examples/*.c ${WRKSRC}/docs/examples/*.cc ${EXAMPLESDIR}/ .endif # Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 8694bf8528c5..6a24d7149964 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,3 +1,3 @@ -MD5 (curl-7.16.3.tar.bz2) = ed55dfa8946ad53f245fae5db3a9d0ca -SHA256 (curl-7.16.3.tar.bz2) = 7dc1ff9b06686650669befd8884f3dab599de6795f24148c56d67b285211e494 -SIZE (curl-7.16.3.tar.bz2) = 1667847 +MD5 (curl-7.18.0.tar.bz2) = 3e50dd887d6a354be312d874e1d3426c +SHA256 (curl-7.18.0.tar.bz2) = 300561ef53ee5971b304142d8570a91f879228c2016e74a142fa3421dfcd3672 +SIZE (curl-7.18.0.tar.bz2) = 1779421 diff --git a/ftp/curl/files/patch-Makefile.in b/ftp/curl/files/patch-Makefile.in new file mode 100644 index 000000000000..b6dccfe10e70 --- /dev/null +++ b/ftp/curl/files/patch-Makefile.in @@ -0,0 +1,29 @@ +diff -urN -x .svn ../../vendor/curl/Makefile.in ./Makefile.in +--- ../../vendor/curl/Makefile.in 2008-03-20 15:23:26.000000000 +0200 ++++ ./Makefile.in 2008-03-21 12:25:17.000000000 +0200 +@@ -259,9 +259,9 @@ + curl-style.el sample.emacs RELEASE-NOTES buildconf buildconf.bat libcurl.pc.in + + bin_SCRIPTS = curl-config +-SUBDIRS = lib src +-DIST_SUBDIRS = $(SUBDIRS) tests include packages docs +-pkgconfigdir = $(libdir)/pkgconfig ++SUBDIRS = lib src docs ++DIST_SUBDIRS = $(SUBDIRS) tests include packages ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = libcurl.pc + all: all-recursive + +@@ -817,12 +817,10 @@ + # We extend the standard install with a custom hook: + install-data-hook: + cd include && $(MAKE) install +- cd docs && $(MAKE) install + + # We extend the standard uninstall with a custom hook: + uninstall-hook: + cd include && $(MAKE) uninstall +- cd docs && $(MAKE) uninstall + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure index f121c24fbc1b..39bb2d34adb2 100644 --- a/ftp/curl/files/patch-configure +++ b/ftp/curl/files/patch-configure @@ -1,6 +1,7 @@ ---- configure.old Fri Apr 13 18:29:31 2007 -+++ configure Fri Apr 13 18:29:33 2007 -@@ -5497,7 +5497,7 @@ +diff -urN -x .svn ../../vendor/curl/configure ./configure +--- ../../vendor/curl/configure 2008-03-20 15:23:26.000000000 +0200 ++++ ./configure 2008-03-20 23:55:32.000000000 +0200 +@@ -5488,7 +5488,7 @@ { echo "$as_me:$LINENO: checking if arch-OS host is AMD64-linux (to build static libraries with PIC)" >&5 echo $ECHO_N "checking if arch-OS host is AMD64-linux (to build static libraries with PIC)... $ECHO_C" >&6; } case $host in @@ -9,7 +10,16 @@ { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } with_pic=yes -@@ -24467,8 +24467,10 @@ +@@ -20913,7 +20913,7 @@ + + case $host in + # +- x86_64*linux*) ++ x86_64*linux*|amd64*freebsd*|ia64*freebsd*) + # + if test "z$ICC" = "z"; then + +@@ -25496,8 +25496,10 @@ PKGTEST="no" PREFIX_OPENSSL=$OPT_SSL LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff" diff --git a/ftp/curl/files/patch-docs::TODO b/ftp/curl/files/patch-docs::TODO new file mode 100644 index 000000000000..805123e3b5e2 --- /dev/null +++ b/ftp/curl/files/patch-docs::TODO @@ -0,0 +1,80 @@ +diff -urN -urN -x .svn ../../vendor/curl/docs/TODO ./docs/TODO +--- ../../vendor/curl/docs/TODO 2008-03-24 00:40:11.000000000 +0200 ++++ ./docs/TODO 2008-03-29 16:08:15.000000000 +0200 +@@ -48,19 +48,19 @@ + + 7. SSL + 7.1 Disable specific versions +- 7.2 Provide mytex locking API ++ 7.2 Provide mutex locking API + 7.3 dumpcert + 7.4 Evaluate SSL patches + 7.5 Cache OpenSSL contexts + 7.6 Export session ids +- 7.7 Provide callback for cert verfication ++ 7.7 Provide callback for cert verification + 7.8 Support other SSL libraries + 7.9 Support SRP on the TLS layer + 7.10 improve configure --with-ssl + + 8. GnuTLS + 8.1 Make NTLM work without OpenSSL functions +- 8.2 SSl engine stuff ++ 8.2 SSL engine stuff + 8.3 SRP + 8.4 non-blocking + 8.5 check connection +@@ -111,7 +111,7 @@ + + 1.1 Zero-copy interface + +- Introdue another callback interface for upload/download that makes one less ++ Introduce another callback interface for upload/download that makes one less + copy of data and thus a faster operation. + [http://curl.haxx.se/dev/no_copy_callbacks.txt] + +@@ -148,7 +148,7 @@ + know MUST have it. This is error-prone. We therefore want the header files to + adapt to configure results. Those results must be stored in a new header and + they must use a curl name space, i.e not be HAVE_* prefix (as that would risk +- collide with other apps that use libcurl and that runs configure). ++ a collision with other apps that use libcurl and that runs configure). + + Work on this has been started but hasn't been finished, and the initial patch + and some details are found here: +@@ -161,7 +161,7 @@ + + 2.1 More non-blocking + +- Make sure we don't ever loop because of non-blocking sockets return ++ Make sure we don't ever loop because of non-blocking sockets returning + EWOULDBLOCK or similar. The GnuTLS connection etc. + + 2.2 Pause transfers +@@ -290,7 +290,7 @@ + Provide an option that allows for disabling specific SSL versions, such as + SSLv2 http://curl.haxx.se/bug/feature.cgi?id=1767276 + +-7.2 Provide mytex locking API ++7.2 Provide mutex locking API + + Provide a libcurl API for setting mutex callbacks in the underlying SSL + library, so that the same application code can use mutex-locking +@@ -324,7 +324,7 @@ + the state from such a buffer at a later date - this is used by mod_ssl for + apache to implement and SSL session ID cache". + +-7.7 Provide callback for cert verfication ++7.7 Provide callback for cert verification + + OpenSSL supports a callback for customised verification of the peer + certificate, but this doesn't seem to be exposed in the libcurl APIs. Could +@@ -355,7 +355,7 @@ + hey... Another option is to get available DES and MD4 source code from the + cryptopp library. They are fine license-wise, but are C++. + +-8.2 SSl engine stuff ++8.2 SSL engine stuff + + Is this even possible? + diff --git a/ftp/curl/files/patch-docs::curl.1 b/ftp/curl/files/patch-docs::curl.1 new file mode 100644 index 000000000000..602e88366cd4 --- /dev/null +++ b/ftp/curl/files/patch-docs::curl.1 @@ -0,0 +1,740 @@ +diff -urN -urN -x .svn ../../vendor/curl/docs/curl.1 ./docs/curl.1 +--- ../../vendor/curl/docs/curl.1 2008-03-24 00:40:11.000000000 +0200 ++++ ./docs/curl.1 2008-03-29 16:08:15.000000000 +0200 +@@ -34,7 +34,7 @@ + FILE). The command is designed to work without user interaction. + + curl offers a busload of useful tricks like proxy support, user +-authentication, ftp upload, HTTP post, SSL connections, cookies, file transfer ++authentication, FTP upload, HTTP post, SSL connections, cookies, file transfer + resume and more. As you will see below, the number of features will make your + head spin! + +@@ -42,7 +42,7 @@ + .BR libcurl (3) + for details. + .SH URL +-The URL syntax is protocol dependent. You'll find a detailed description in ++The URL syntax is protocol-dependent. You'll find a detailed description in + RFC 3986. + + You can specify multiple URLs or parts of URLs by writing part sets within +@@ -64,7 +64,7 @@ + You can specify any amount of URLs on the command line. They will be fetched + in a sequential manner in the specified order. + +-Since curl 7.15.1 you can also specify step counter for the ranges, so that ++Since curl 7.15.1 you can also specify a step counter for the ranges, so that + you can get every Nth number or letter: + + http://www.numericals.com/file[1-100:10].txt +@@ -81,10 +81,10 @@ + specified on a single command line and cannot be used between separate curl + invokes. + .SH "PROGRESS METER" +-curl normally displays a progress meter during operations, indicating amount +-of transferred data, transfer speeds and estimated time left etc. ++curl normally displays a progress meter during operations, indicating the amount ++of transferred data, transfer speeds and estimated time left, etc. + +-However, since curl displays data to the terminal by default, if you invoke ++However, since curl displays this data to the terminal by default, if you invoke + curl to do an operation and it is about to write data to the terminal, it + \fIdisables\fP the progress meter as otherwise it would mess up the output + mixing progress meter and response data. +@@ -93,7 +93,7 @@ + redirect the response output to a file, using shell redirect (>), -o [file] or + similar. + +-It is not the same case for FTP upload as that operation is not spitting out ++It is not the same case for FTP upload as that operation does not spit out + any response data to the terminal. + + If you prefer a progress "bar" instead of the regular meter, \fI-#\fP is your +@@ -114,7 +114,7 @@ + used. + .IP "--anyauth" + (HTTP) Tells curl to figure out authentication method by itself, and use the +-most secure one the remote site claims it supports. This is done by first ++most secure one the remote site claims to support. This is done by first + doing a request and checking the response-headers, thus possibly inducing an + extra network round-trip. This is used instead of setting a specific + authentication method, which you can do with \fI--basic\fP, \fI--digest\fP, +@@ -158,13 +158,13 @@ + (HTTP) Tells curl to use HTTP Basic authentication. This is the default and + this option is usually pointless, unless you use it to override a previously + set option that sets a different authentication method (such as \fI--ntlm\fP, +-\fI--digest\fP and \fI--negotiate\fP). ++\fI--digest\fP, or \fI--negotiate\fP). + + If this option is used several times, the following occurrences make no + difference. + .IP "--ciphers <list of ciphers>" + (SSL) Specifies which ciphers to use in the connection. The list of ciphers +-must be using valid ciphers. Read up on SSL cipher list details on this URL: ++must specify valid ciphers. Read up on SSL cipher list details on this URL: + \fIhttp://www.openssl.org/docs/apps/ciphers.html\fP + + NSS ciphers are done differently than OpenSSL and GnuTLS. The full list of +@@ -204,7 +204,7 @@ + Continue/Resume a previous file transfer at the given offset. The given offset + is the exact number of bytes that will be skipped counted from the beginning + of the source file before it is transferred to the destination. If used with +-uploads, the ftp server command SIZE will not be used by curl. ++uploads, the FTP server command SIZE will not be used by curl. + + Use "-C -" to tell curl to automatically find out where/how to resume the + transfer. It then uses the given output/input files to figure that out. +@@ -231,7 +231,7 @@ + \fI-F/--form\fP. + + \fI-d/--data\fP is the same as \fI--data-ascii\fP. To post data purely binary, +-you should instead use the \fI--data-binary\fP option. To URL encode the value ++you should instead use the \fI--data-binary\fP option. To URL-encode the value + of a form field you may use \fI--data-urlencode\fP. + + If any of these options is used more than once on the same command line, the +@@ -241,7 +241,7 @@ + + If you start the data with the letter @, the rest should be a file name to + read the data from, or - if you want curl to read the data from stdin. The +-contents of the file must already be url-encoded. Multiple files can also be ++contents of the file must already be URL-encoded. Multiple files can also be + specified. Posting data from a file named 'foobar' would thus be done with + \fI--data @foobar\fP. + .IP "--data-binary <data>" +@@ -253,33 +253,33 @@ + are preserved and conversions are never done. + + If this option is used several times, the ones following the first will append +-data. As described in \fI-d/--data\fP. ++data as described in \fI-d/--data\fP. + .IP "--data-urlencode <data>" + (HTTP) This posts data, similar to the other --data options with the exception +-that this performs URL encoding. (Added in 7.18.0) ++that this performs URL-encoding. (Added in 7.18.0) + +-To be CGI compliant, the <data> part should begin with a \fIname\fP followed ++To be CGI-compliant, the <data> part should begin with a \fIname\fP followed + by a separator and a content specification. The <data> part can be passed to + curl using one of the following syntaxes: + .RS + .IP "content" +-This will make curl URL encode the content and pass that on. Just be careful ++This will make curl URL-encode the content and pass that on. Just be careful + so that the content doesn't contain any = or @ letters, as that will then make + the syntax match one of the other cases below! + .IP "=content" +-This will make curl URL encode the content and pass that on. The preceding = ++This will make curl URL-encode the content and pass that on. The preceding = + letter is not included in the data. + .IP "name=content" +-This will make curl URL encode the content part and pass that on. Note that +-the name part is expected to be URL encoded already. ++This will make curl URL-encode the content part and pass that on. Note that ++the name part is expected to be URL-encoded already. + .IP "@filename" + This will make curl load data from the given file (including any newlines), +-URL encode that data and pass it on in the POST. ++URL-encode that data and pass it on in the POST. + .IP "name@filename" + This will make curl load data from the given file (including any newlines), +-URL encode that data and pass it on in the POST. The name part gets an equal ++URL-encode that data and pass it on in the POST. The name part gets an equal + sign appended, resulting in \fIname=urlencoded-file-content\fP. Note that the +-name is expected to be URL encoded already. ++name is expected to be URL-encoded already. + .RE + .IP "--digest" + (HTTP) Enables HTTP Digest authentication. This is a authentication that +@@ -310,10 +310,10 @@ + + This option is handy to use when you want to store the headers that a HTTP + site sends to you. Cookies from the headers could then be read in a second +-curl invoke by using the \fI-b/--cookie\fP option! The \fI-c/--cookie-jar\fP ++curl invocation by using the \fI-b/--cookie\fP option! The \fI-c/--cookie-jar\fP + option is however a better way to store cookies. + +-When used on FTP, the ftp server response lines are considered being "headers" ++When used in FTP, the FTP server response lines are considered being "headers" + and thus are saved there. + + If this option is used several times, the last one will be used. +@@ -365,7 +365,7 @@ + peer. The file may contain multiple CA certificates. The certificate(s) must + be in PEM format. + +-curl recognizes the environment variable named 'CURL_CA_BUNDLE' if that is ++curl recognizes the environment variable named 'CURL_CA_BUNDLE' if it is + set, and uses the given path as a path to a CA cert bundle. This option + overrides that variable. + +@@ -391,7 +391,7 @@ + If this option is used several times, the last one will be used. + .IP "-f/--fail" + (HTTP) Fail silently (no output at all) on server errors. This is mostly done +-like this to better enable scripts etc to better deal with failed attempts. In ++to better enable scripts etc to better deal with failed attempts. In + normal cases when a HTTP server fails to deliver a document, it returns an + HTML document stating so (which often also describes why and more). This flag + will prevent curl from outputting that and return error 22. +@@ -459,7 +459,7 @@ + + If this option is used twice, the second will again disable this. + .IP "--ftp-ssl-control" +-(FTP) Require SSL/TLS for the ftp login, clear for transfer. Allows secure ++(FTP) Require SSL/TLS for the FTP login, clear for transfer. Allows secure + authentication, but non-encrypted data transfers for efficiency. Fails the + transfer if the server doesn't support SSL/TLS. (Added in 7.16.0) + +@@ -487,7 +487,7 @@ + waits for a reply from the server. + (Added in 7.16.2) + .IP "-F/--form <name=content>" +-(HTTP) This lets curl emulate a filled in form in which a user has pressed the ++(HTTP) This lets curl emulate a filled-in form in which a user has pressed the + submit button. This causes curl to POST data using the Content-Type + multipart/form-data according to RFC1867. This enables uploading of binary + files etc. To force the 'content' part to be a file, prefix the file name +@@ -537,7 +537,7 @@ + When used, this option will make all data specified with \fI-d/--data\fP or + \fI--data-binary\fP to be used in a HTTP GET request instead of the POST + request that otherwise would be used. The data will be appended to the URL +-with a '?' separator. ++with a '?' separator. + + If used in combination with -I, the POST data will instead be appended to the + URL with a HEAD request. +@@ -556,9 +556,9 @@ + internal header by giving a replacement without content on the right side of + the colon, as in: -H \&"Host:". + +-curl will make sure that each header you add/replace get sent with the proper +-end of line marker, you should thus \fBnot\fP add that as a part of the header +-content: do not add newlines or carriage returns they will only mess things up ++curl will make sure that each header you add/replace is sent with the proper ++end-of-line marker, you should thus \fBnot\fP add that as a part of the header ++content: do not add newlines or carriage returns, they will only mess things up + for you. + + See also the \fI-A/--user-agent\fP and \fI-e/--referer\fP options. +@@ -606,7 +606,7 @@ + (SSL) This option explicitly allows curl to perform "insecure" SSL connections + and transfers. All SSL connections are attempted to be made secure by using + the CA certificate bundle installed by default. This makes all connections +-considered "insecure" to fail unless \fI-k/--insecure\fP is used. ++considered "insecure" fail unless \fI-k/--insecure\fP is used. + + See this online resource for further details: + \fBhttp://curl.haxx.se/docs/sslcerts.html\fP +@@ -627,16 +627,16 @@ + If this option is used several times, the last one will be used. + .IP "--key-type <type>" + (SSL) Private key file type. Specify which type your \fI--key\fP provided +-private key is. DER, PEM and ENG are supported. If not specified, PEM is ++private key is. DER, PEM, and ENG are supported. If not specified, PEM is + assumed. + + If this option is used several times, the last one will be used. + .IP "--krb <level>" + (FTP) Enable Kerberos authentication and use. The level must be entered and +-should be one of 'clear', 'safe', 'confidential' or 'private'. Should you use ++should be one of 'clear', 'safe', 'confidential', or 'private'. Should you use + a level that is not one of these, 'private' will instead be used. + +-This option requires that the library was built with kerberos4 or GSSAPI ++This option requires a library built with kerberos4 or GSSAPI + (GSS-Negotiate) support. This is not very common. Use \fI-V/--version\fP to + see if your curl supports it. + +@@ -646,11 +646,11 @@ + text file in which command line arguments can be written which then will be + used as if they were written on the actual command line. Options and their + parameters must be specified on the same config file line, separated by +-white space, colon, the equals sign or any combination thereof (however, ++whitespace, colon, the equals sign or any combination thereof (however, + the preferred separator is the equals sign). If the parameter is to contain +-white spaces, the parameter must be enclosed within quotes. Within double ++whitespace, the parameter must be enclosed within quotes. Within double + quotes, the following escape sequences are available: \\\\, \\", \\t, \\n, +-\\r and \\v. A backlash preceding any other letter is ignored. If the ++\\r and \\v. A backslash preceding any other letter is ignored. If the + first column of a config line is a '#' character, the rest of the line will be + treated as a comment. Only write one option per physical line in the config + file. +@@ -673,12 +673,12 @@ + + 1) curl tries to find the "home dir": It first checks for the CURL_HOME and + then the HOME environment variables. Failing that, it uses getpwuid() on +-unix-like systems (which returns the home dir given the current user in your ++UNIX-like systems (which returns the home dir given the current user in your + system). On Windows, it then checks for the APPDATA variable, or as a last +-resort the '%USERPROFILE%\Application Data'. ++resort the '%USERPROFILE%\\Application Data'. + + 2) On windows, if there is no _curlrc file in the home dir, it checks for one +-in the same dir the executable curl is placed. On unix-like systems, it will ++in the same dir the curl executable is placed. On UNIX-like systems, it will + simply try to load .curlrc from the determined home dir. + + .nf +@@ -699,7 +699,7 @@ + .IP "--libcurl <file>" + Append this option to any ordinary curl command line, and you will get a + libcurl-using source code written to the file that does the equivalent +-operation of what your command line operation does! ++of what your command-line operation does! + + NOTE: this does not properly support -F and the sending of multipart + formposts, so in those cases the output program will be missing necessary +@@ -709,18 +709,18 @@ + used. (Added in 7.16.1) + .IP "--limit-rate <speed>" + Specify the maximum transfer rate you want curl to use. This feature is useful +-if you have a limited pipe and you'd like your transfer not use your entire ++if you have a limited pipe and you'd like your transfer not to use your entire + bandwidth. + + The given speed is measured in bytes/second, unless a suffix is appended. + Appending 'k' or 'K' will count the number as kilobytes, 'm' or M' makes it +-megabytes while 'g' or 'G' makes it gigabytes. Examples: 200K, 3m and 1G. ++megabytes, while 'g' or 'G' makes it gigabytes. Examples: 200K, 3m and 1G. + +-The given rate is the average speed, counted during the entire transfer. It ++The given rate is the average speed counted during the entire transfer. It + means that curl might use higher transfer speeds in short bursts, but over + time it uses no more than the given rate. + +-If you are also using the \fI-Y/--speed-limit\fP option, that option will take ++If you also use the \fI-Y/--speed-limit\fP option, that option will take + precedence and might cripple the rate-limiting slightly, to help keeping the + speed-limit logic working. + +@@ -739,12 +739,12 @@ + If this option is used twice, the second will again disable list only. + .IP "--local-port <num>[-num]" + Set a preferred number or range of local port numbers to use for the +-connection(s). Note that port numbers by nature is a scarce resource that ++connection(s). Note that port numbers by nature are a scarce resource that + will be busy at times so setting this range to something too narrow might + cause unnecessary connection setup failures. (Added in 7.15.2) + .IP "-L/--location" + (HTTP/HTTPS) If the server reports that the requested page has moved to a +-different location (indicated with a Location: header and a 3XX response code) ++different location (indicated with a Location: header and a 3XX response code), + this option will make curl redo the request on the new place. If used together + with \fI-i/--include\fP or \fI-I/--head\fP, headers from all requested pages + will be shown. When authentication is used, curl only sends its credentials to +@@ -772,7 +772,7 @@ + requested is larger than this value, the transfer will not start and curl will + return with exit code 63. + +-NOTE: The file size is not always known prior to download, and for such files ++\fBNOTE:\fP The file size is not always known prior to download, and for such files + this option has no effect even if the file transfer ends up being larger than + this given limit. This concerns both FTP and HTTP transfers. + .IP "-m/--max-time <seconds>" +@@ -785,18 +785,18 @@ + Manual. Display the huge help text. + .IP "-n/--netrc" + Makes curl scan the \fI.netrc\fP file in the user's home directory for login +-name and password. This is typically used for ftp on unix. If used with http, ++name and password. This is typically used for FTP on unix. If used with HTTP, + curl will enable user authentication. See + .BR netrc(4) + or + .BR ftp(1) + for details on the file format. Curl will not complain if that file +-hasn't the right permissions (it should not be world nor group +-readable). The environment variable "HOME" is used to find the home ++doesn't have the right permissions (it should not be either world- or ++group-readable). The environment variable "HOME" is used to find the home + directory. + + A quick and very simple example of how to setup a \fI.netrc\fP to allow curl +-to ftp to the machine host.domain.com with user name \&'myself' and password ++to FTP to the machine host.domain.com with user name \&'myself' and password + \&'secret' should look similar to: + + .B "machine host.domain.com login myself password secret" +@@ -804,7 +804,7 @@ + If this option is used twice, the second will again disable netrc usage. + .IP "--netrc-optional" + Very similar to \fI--netrc\fP, but this option makes the .netrc usage +-\fBoptional\fP and not mandatory as the \fI--netrc\fP does. ++\fBoptional\fP and not mandatory as the \fI--netrc\fP option does. + .IP "--negotiate" + (HTTP) Enables GSS-Negotiate authentication. The GSS-Negotiate method was + designed by Microsoft and is used in their web applications. It is primarily +@@ -815,7 +815,7 @@ + If you want to enable Negotiate for your proxy authentication, then use + \fI--proxy-negotiate\fP. + +-This option requires that the library was built with GSSAPI support. This is ++This option requires a library built with GSSAPI support. This is + not very common. Use \fI-V/--version\fP to see if your version supports + GSS-Negotiate. + +@@ -839,7 +839,7 @@ + If this option is used twice, the second will again enable keepalive. + .IP "--no-sessionid" + (SSL) Disable curl's use of SSL session-ID caching. By default all transfers +-are done using the cache. Note that while nothing ever should get hurt by ++are done using the cache. Note that while nothing should ever get hurt by + attempting to reuse SSL session-IDs, there seem to be broken SSL + implementations in the wild that may require you to disable this in order for + you to succeed. (Added in 7.16.0) +@@ -849,15 +849,15 @@ + .IP "--ntlm" + (HTTP) Enables NTLM authentication. The NTLM authentication method was + designed by Microsoft and is used by IIS web servers. It is a proprietary +-protocol, reversed engineered by clever people and implemented in curl based ++protocol, reverse-engineered by clever people and implemented in curl based + on their efforts. This kind of behavior should not be endorsed, you should + encourage everyone who uses NTLM to switch to a public and documented +-authentication method instead. Such as Digest. ++authentication method instead, such as Digest. + + If you want to enable NTLM for your proxy authentication, then use + \fI--proxy-ntlm\fP. + +-This option requires that the library was built with SSL support. Use ++This option requires a library built with SSL support. Use + \fI-V/--version\fP to see if your curl supports NTLM. + + If this option is used several times, the following occurrences make no +@@ -874,7 +874,7 @@ + + curl http://{site,host}.host[1-5].com -o "#1_#2" + +-You may use this option as many times as you have number of URLs. ++You may use this option as many times as the number of URLs you have. + + See also the \fI--create-dirs\fP option to create the local directories + dynamically. +@@ -885,16 +885,16 @@ + The remote file name to use for saving is extracted from the given URL, + nothing else. + +-You may use this option as many times as you have number of URLs. ++You may use this option as many times as the number of URLs you have. + .IP "--pass <phrase>" +-(SSL/SSH) Pass phrase for the private key ++(SSL/SSH) Passphrase for the private key + + If this option is used several times, the last one will be used. + .IP "--post301" + Tells curl to respect RFC 2616/10.3.2 and not convert POST requests into GET + requests when following a 301 redirection. The non-RFC behaviour is ubiquitous + in web browsers, so curl does the conversion by default to maintain +-consistency. However, a server may requires a POST to remain a POST after such ++consistency. However, a server may require a POST to remain a POST after such + a redirection. This option is meaningful only when using \fI-L/--location\fP + (Added in 7.17.1) + .IP "--proxy-anyauth" +@@ -942,18 +942,18 @@ + + If this option is used several times, the last one will be used. + .IP "-P/--ftp-port <address>" +-(FTP) Reverses the initiator/listener roles when connecting with ftp. This +-switch makes Curl use the PORT command instead of PASV. In practise, PORT ++(FTP) Reverses the initiator/listener roles when connecting with FTP. This ++switch makes Curl use the PORT command instead of PASV. In practice, PORT + tells the server to connect to the client's specified address and port, while +-PASV asks the server for an ip address and port to connect to. <address> ++PASV asks the server for an IP address and port to connect to. <address> + should be one of: + .RS + .IP interface +-i.e "eth0" to specify which interface's IP address you want to use (Unix only) ++i.e "eth0" to specify which interface's IP address you want to use (Unix only) + .IP "IP address" +-i.e "192.168.10.1" to specify exact IP number ++i.e "192.168.10.1" to specify the exact IP address + .IP "host name" +-i.e "my.host.domain" to specify machine ++i.e "my.host.domain" to specify the machine + .IP "-" + make curl pick the same IP address that is already used for the control + connection +@@ -968,11 +968,11 @@ + default config file search path. + .IP "-Q/--quote <command>" + (FTP/SFTP) Send an arbitrary command to the remote FTP or SFTP server. Quote +-commands are sent BEFORE the transfer is taking place (just after the ++commands are sent BEFORE the transfer takes place (just after the + initial PWD command in an FTP transfer, to be exact). To make commands + take place after a successful transfer, prefix them with a dash '-'. +-To make commands get sent after libcurl has changed working directory, +-just before the transfer command(s), prefix the command with '+' (this ++To make commands be sent after libcurl has changed the working directory, ++just before the transfer command(s), prefix the command with a '+' (this + is only supported for FTP). You may specify any number of commands. If + the server returns failure for one of the commands, the entire operation + will be aborted. You must send syntactically correct FTP commands as +@@ -987,7 +987,7 @@ + See also the \fI--egd-file\fP option. + .IP "-r/--range <range>" + (HTTP/FTP/FILE) Retrieve a byte range (i.e a partial document) from a +-HTTP/1.1, FTP server or a local FILE. Ranges can be specified in a number of ++HTTP/1.1 or FTP server or a local FILE. Ranges can be specified in a number of + ways. + .RS + .TP 10 +@@ -1010,21 +1010,21 @@ + specifies 300 bytes from offset 500(H) + .TP + .B 100-199,500-599 +-specifies two separate 100 bytes ranges(*)(H) ++specifies two separate 100-byte ranges(*)(H) + .RE + + (*) = NOTE that this will cause the server to reply with a multipart + response! + +-Only digit characters (0-9) are valid in 'start' and 'stop' of range syntax +-\&'start-stop'. If a non-digit character is given in the range, the server's +-response will be indeterminable, depending on different server's configuration. ++Only digit characters (0-9) are valid in the 'start' and 'stop' fields of ++the \&'start-stop' range syntax. If a non-digit character is given in the range, the server's ++response will be unspecified, depending on the server's configuration. + + You should also be aware that many HTTP/1.1 servers do not have this feature + enabled, so that when you attempt to get a range, you'll instead get the whole + document. + +-FTP range downloads only support the simple syntax 'start-stop' (optionally ++FTP range downloads only support the simple 'start-stop' syntax (optionally + with one of the numbers omitted). It depends on the non-RFC command SIZE. + + If this option is used several times, the last one will be used. +@@ -1054,13 +1054,13 @@ + + If this option is used multiple times, the last occurrence decide the amount. + .IP "--retry-delay <seconds>" +-Make curl sleep this amount of time between each retry when a transfer has ++Make curl sleep this amount of time before each retry when a transfer has + failed with a transient error (it changes the default backoff time algorithm + between retries). This option is only interesting if \fI--retry\fP is also + used. Setting this delay to zero will make curl use the default backoff time. + (Added in 7.12.3) + +-If this option is used multiple times, the last occurrence decide the amount. ++If this option is used multiple times, the last occurrence determines the amount. + .IP "--retry-max-time <seconds>" + The retry timer is reset before the first transfer attempt. Retries will be + done as usual (see \fI--retry\fP) as long as the timer hasn't reached this +@@ -1069,14 +1069,14 @@ + period. To limit a single request\'s maximum time, use \fI-m/--max-time\fP. + Set this option to zero to not timeout retries. (Added in 7.12.3) + +-If this option is used multiple times, the last occurrence decide the amount. ++If this option is used multiple times, the last occurrence determines the amount. + .IP "-s/--silent" + Silent mode. Don't show progress meter or error messages. Makes + Curl mute. + + If this option is used twice, the second will again disable silent mode. + .IP "-S/--show-error" +-When used with -s it makes curl show error message if it fails. ++When used with -s it makes curl show an error message if it fails. + + If this option is used twice, the second will again disable show error. + .IP "--socks4 <host[:port]>" +@@ -1141,7 +1141,7 @@ + must use a trailing / on the last directory to really prove to Curl that there + is no file name or curl will think that your last directory name is the remote + file name to use. That will most likely cause the upload operation to fail. If +-this is used on a http(s) server, the PUT command will be used. ++this is used on a HTTP(S) server, the PUT command will be used. + + Use the file name "-" (a single dash) to use stdin instead of a given file. + +@@ -1182,7 +1182,7 @@ + + If this option is used several times, each occurrence will toggle it on/off. + .IP "-u/--user <user:password>" +-Specify user and password to use for server authentication. Overrides ++Specify the user name and password to use for server authentication. Overrides + \fI-n/--netrc\fP and \fI--netrc-optional\fP. + + If you just give the user name (without entering a colon) curl will prompt for +@@ -1194,7 +1194,7 @@ + + If this option is used several times, the last one will be used. + .IP "-U/--proxy-user <user:password>" +-Specify user and password to use for proxy authentication. ++Specify the user name and password to use for proxy authentication. + + If you use an SSPI-enabled curl binary and do NTLM authentication, you can + force curl to pick up the user name and password from your environment by +@@ -1208,9 +1208,9 @@ + This option may be used any number of times. To control where this URL is + written, use the \fI-o/--output\fP or the \fI-O/--remote-name\fP options. + .IP "-v/--verbose" +-Makes the fetching more verbose/talkative. Mostly usable for debugging. Lines ++Makes the fetching more verbose/talkative. Mostly useful for debugging. A line + starting with '>' means "header data" sent by curl, '<' means "header data" +-received by curl that is hidden in normal cases and lines starting with '*' ++received by curl that is hidden in normal cases, and a line starting with '*' + means additional info provided by curl. + + Note that if you only want HTTP headers in the output, \fI-i/--include\fP +@@ -1237,7 +1237,7 @@ + .IP "IPv6" + You can use IPv6 with this. + .IP "krb4" +-Krb4 for ftp is supported. ++Krb4 for FTP is supported. + .IP "SSL" + HTTPS and FTPS are supported. + .IP "libz" +@@ -1245,7 +1245,7 @@ + .IP "NTLM" + NTLM authentication is supported. + .IP "GSS-Negotiate" +-Negotiate authentication and krb5 for ftp is supported. ++Negotiate authentication and krb5 for FTP is supported. + .IP "Debug" + This curl uses a libcurl built with Debug. This enables more error-tracking + and memory debugging etc. For curl-developers only! +@@ -1270,7 +1270,7 @@ + + The variables present in the output format will be substituted by the value or + text that curl thinks fit, as described below. All variables are specified +-like %{variable_name} and to output a normal % you just write them like ++as %{variable_name} and to output a normal % you just it them as + %%. You can output a newline by using \\n, a carriage return with \\r and a tab + space with \\t. + +@@ -1278,11 +1278,11 @@ + The %-letter is a special letter in the win32-environment, where all + occurrences of % must be doubled when using this option. + +-Available variables are at this point: ++The variables available at this point are: + .RS + .TP 15 + .B url_effective +-The URL that was fetched last. This is mostly meaningful if you've told curl ++The URL that was fetched last. This is most meaningful if you've told curl + to follow location: headers. + .TP + .B http_code +@@ -1305,20 +1305,20 @@ + host (or proxy) was completed. + .TP + .B time_pretransfer +-The time, in seconds, it took from the start until the file transfer is just ++The time, in seconds, it took from the start until the file transfer was just + about to begin. This includes all pre-transfer commands and negotiations that + are specific to the particular protocol(s) involved. + .TP + .B time_redirect + The time, in seconds, it took for all redirection steps include name lookup, +-connect, pretransfer and transfer before final transaction was ++connect, pretransfer and transfer before the final transaction was + started. time_redirect shows the complete execution time for multiple + redirections. (Added in 7.12.3) + .TP + .B time_starttransfer +-The time, in seconds, it took from the start until the first byte is just about ++The time, in seconds, it took from the start until the first byte was just about + to be transferred. This includes time_pretransfer and also the time the +-server needs to calculate the result. ++server needed to calculate the result. + .TP + .B size_download + The total amount of bytes that were downloaded. +@@ -1354,10 +1354,10 @@ + + If this option is used several times, the last one will be used. + .IP "-x/--proxy <proxyhost[:port]>" +-Use specified HTTP proxy. If the port number is not specified, it is assumed ++Use the specified HTTP proxy. If the port number is not specified, it is assumed + at port 1080. + +-This option overrides existing environment variables that sets proxy to ++This option overrides existing environment variables that set the proxy to + use. If there's an environment variable setting a proxy, you can set proxy to + \&"" to override it. + +@@ -1367,8 +1367,8 @@ + through the proxy, as done with the \fI-p/--proxytunnel\fP option. + + Starting with 7.14.1, the proxy host can be specified the exact same way as +-the proxy environment variables, include protocol prefix (http://) and +-embedded user + password. ++the proxy environment variables, including the protocol prefix (http://) and ++the embedded user + password. + + If this option is used several times, the last one will be used. + .IP "-X/--request <command>" +@@ -1379,7 +1379,7 @@ + + (FTP) + Specifies a custom FTP command to use instead of LIST when doing file lists +-with ftp. ++with FTP. + + If this option is used several times, the last one will be used. + .IP "-y/--speed-time <time>" +@@ -1421,7 +1421,7 @@ + internally preferred: HTTP 1.1. + .IP "-1/--tlsv1" + (SSL) +-Forces curl to use TSL version 1 when negotiating with a remote TLS server. ++Forces curl to use TLS version 1 when negotiating with a remote TLS server. + .IP "-2/--sslv2" + (SSL) + Forces curl to use SSL version 2 when negotiating with a remote SSL server. +@@ -1430,11 +1430,11 @@ + Forces curl to use SSL version 3 when negotiating with a remote SSL server. + .IP "-4/--ipv4" + If libcurl is capable of resolving an address to multiple IP versions (which +-it is if it is ipv6-capable), this option tells libcurl to resolve names to ++it is if it is IPv6-capable), this option tells libcurl to resolve names to + IPv4 addresses only. + .IP "-6/--ipv6" + If libcurl is capable of resolving an address to multiple IP versions (which +-it is if it is ipv6-capable), this option tells libcurl to resolve names to ++it is if it is IPv6-capable), this option tells libcurl to resolve names to + IPv6 addresses only. + .IP "-#/--progress-bar" + Make curl display progress information as a progress bar instead of the +@@ -1448,13 +1448,13 @@ + + .SH ENVIRONMENT + .IP "http_proxy [protocol://]<host>[:port]" +-Sets proxy server to use for HTTP. ++Sets the proxy server to use for HTTP. + .IP "HTTPS_PROXY [protocol://]<host>[:port]" +-Sets proxy server to use for HTTPS. ++Sets the proxy server to use for HTTPS. + .IP "FTP_PROXY [protocol://]<host>[:port]" +-Sets proxy server to use for FTP. ++Sets the proxy server to use for FTP. + .IP "ALL_PROXY [protocol://]<host>[:port]" +-Sets proxy server to use if no protocol-specific proxy is set. ++Sets the proxy server to use if no protocol-specific proxy is set. + .IP "NO_PROXY <comma-separated list of hosts>" + list of host names that shouldn't go through any proxy. If set to a asterisk + \&'*' only, it matches all hosts. +@@ -1578,7 +1578,7 @@ + .IP 66 + Failed to initialise SSL Engine + .IP 67 +-User, password or similar was not accepted and curl failed to login ++The user name, password, or similar was not accepted and curl failed to log in + .IP 68 + File not found on TFTP server + .IP 69 +@@ -1606,7 +1606,7 @@ + .IP 80 + Failed to shut down the SSL connection + .IP XX +-There will appear more error codes here in future releases. The existing ones ++More error codes will appear here in future releases. The existing ones + are meant to never change. + .SH AUTHORS / CONTRIBUTORS + Daniel Stenberg is the main author, but the whole list of contributors is diff --git a/ftp/curl/files/patch-docs::curl.html b/ftp/curl/files/patch-docs::curl.html new file mode 100644 index 000000000000..cbc1c961c865 --- /dev/null +++ b/ftp/curl/files/patch-docs::curl.html @@ -0,0 +1,436 @@ +diff -urN -urN -x .svn ../../vendor/curl/docs/curl.html ./docs/curl.html +--- ../../vendor/curl/docs/curl.html 2008-03-24 00:40:11.000000000 +0200 ++++ ./docs/curl.html 2008-04-02 15:51:19.000000000 +0300 +@@ -47,9 +47,9 @@ + <p class="level0">curl - transfer a URL <a name="SYNOPSIS"></a><h2 class="nroffsh">SYNOPSIS</h2> + <p class="level0"><span Class="bold">curl [options]</span> <a class="emphasis" href="#URL">[URL...]</a> <a name="DESCRIPTION"></a><h2 class="nroffsh">DESCRIPTION</h2> + <p class="level0"><span Class="bold">curl</span> is a tool to transfer data from or to a server, using one of the supported protocols (HTTP, HTTPS, FTP, FTPS, SCP, SFTP, TFTP, DICT, TELNET, LDAP or FILE). The command is designed to work without user interaction. +-<p class="level0">curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, SSL connections, cookies, file transfer resume and more. As you will see below, the number of features will make your head spin! ++<p class="level0">curl offers a busload of useful tricks like proxy support, user authentication, FTP upload, HTTP post, SSL connections, cookies, file transfer resume and more. As you will see below, the number of features will make your head spin! + <p class="level0">curl is powered by libcurl for all transfer-related features. See <span Class="manpage">libcurl (3)</span> for details. <a name="URL"></a><h2 class="nroffsh">URL</h2> +-<p class="level0">The URL syntax is protocol dependent. You'll find a detailed description in RFC 3986. ++<p class="level0">The URL syntax is protocol-dependent. You'll find a detailed description in RFC 3986. + <p class="level0">You can specify multiple URLs or parts of URLs by writing part sets within braces as in: + <p class="level0"> <a href="http://site">http://site</a>.{one,two,three}.com + <p class="level0">or you can get sequences of alphanumeric series by using [] as in: +@@ -57,14 +57,14 @@ + <p class="level0">No nesting of the sequences is supported at the moment, but you can use several ones next to each other: + <p class="level0"> <a href="http://any.org/archive">http://any.org/archive</a>[1996-1999]/vol[1-4]/part{a,b,c}.html + <p class="level0">You can specify any amount of URLs on the command line. They will be fetched in a sequential manner in the specified order. +-<p class="level0">Since curl 7.15.1 you can also specify step counter for the ranges, so that you can get every Nth number or letter: ++<p class="level0">Since curl 7.15.1 you can also specify a step counter for the ranges, so that you can get every Nth number or letter: + <p class="level0"> <a href="http://www.numericals.com/file">http://www.numericals.com/file</a>[1-100:10].txt <a href="http://www.letters.com/file">http://www.letters.com/file</a>[a-z:2].txt + <p class="level0">If you specify URL without protocol:// prefix, curl will attempt to guess what protocol you might want. It will then default to HTTP but try other protocols based on often-used host name prefixes. For example, for host names starting with "ftp." curl will assume you want to speak FTP. + <p class="level0">Curl will attempt to re-use connections for multiple file transfers, so that getting many files from the same server will not do multiple connects / handshakes. This improves speed. Of course this is only done on files specified on a single command line and cannot be used between separate curl invokes. <a name="PROGRESS"></a><h2 class="nroffsh">PROGRESS METER</h2> +-<p class="level0">curl normally displays a progress meter during operations, indicating amount of transferred data, transfer speeds and estimated time left etc. +-<p class="level0">However, since curl displays data to the terminal by default, if you invoke curl to do an operation and it is about to write data to the terminal, it <span Class="emphasis">disables</span> the progress meter as otherwise it would mess up the output mixing progress meter and response data. ++<p class="level0">curl normally displays a progress meter during operations, indicating the amount of transferred data, transfer speeds and estimated time left, etc. ++<p class="level0">However, since curl displays this data to the terminal by default, if you invoke curl to do an operation and it is about to write data to the terminal, it <span Class="emphasis">disables</span> the progress meter as otherwise it would mess up the output mixing progress meter and response data. + <p class="level0">If you want a progress meter for HTTP POST or PUT requests, you need to redirect the response output to a file, using shell redirect (>), -o [file] or similar. +-<p class="level0">It is not the same case for FTP upload as that operation is not spitting out any response data to the terminal. ++<p class="level0">It is not the same case for FTP upload as that operation does not spit out any response data to the terminal. + <p class="level0">If you prefer a progress "bar" instead of the regular meter, <a class="emphasis" href="#-">-#</a> is your friend. <a name="OPTIONS"></a><h2 class="nroffsh">OPTIONS</h2> + <p class="level0"> + <p class="level0"><a name="-a--append"></a><span class="nroffip">-a/--append</span> +@@ -74,7 +74,7 @@ + <p class="level1">(HTTP) Specify the User-Agent string to send to the HTTP server. Some badly done CGIs fail if this field isn't set to "Mozilla/4.0". To encode blanks in the string, surround the string with single quote marks. This can also be set with the <a class="emphasis" href="#-H--header">-H/--header</a> option of course. + <p class="level1">If this option is set more than once, the last one will be the one that's used. + <p class="level0"><a name="--anyauth"></a><span class="nroffip">--anyauth</span> +-<p class="level1">(HTTP) Tells curl to figure out authentication method by itself, and use the most secure one the remote site claims it supports. This is done by first doing a request and checking the response-headers, thus possibly inducing an extra network round-trip. This is used instead of setting a specific authentication method, which you can do with <a class="emphasis" href="#--basic">--basic</a>, <a class="emphasis" href="#--digest">--digest</a>, <a class="emphasis" href="#--ntlm">--ntlm</a>, and <a class="emphasis" href="#--negotiate">--negotiate</a>. ++<p class="level1">(HTTP) Tells curl to figure out authentication method by itself, and use the most secure one the remote site claims to support. This is done by first doing a request and checking the response-headers, thus possibly inducing an extra network round-trip. This is used instead of setting a specific authentication method, which you can do with <a class="emphasis" href="#--basic">--basic</a>, <a class="emphasis" href="#--digest">--digest</a>, <a class="emphasis" href="#--ntlm">--ntlm</a>, and <a class="emphasis" href="#--negotiate">--negotiate</a>. + <p class="level1">Note that using --anyauth is not recommended if you do uploads from stdin, since it may require data to be sent twice and then the client must be able to rewind. If the need should arise when uploading from stdin, the upload operation will fail. + <p class="level1">If this option is used several times, the following occurrences make no difference. + <p class="level0"><a name="-b--cookie"></a><span class="nroffip">-b/--cookie <name=data></span> +@@ -86,10 +86,10 @@ + <p class="level1">Enable ASCII transfer when using FTP or LDAP. For FTP, this can also be enforced by using an URL that ends with ";type=A". This option causes data sent to stdout to be in text mode for win32 systems. + <p class="level1">If this option is used twice, the second one will disable ASCII usage. + <p class="level0"><a name="--basic"></a><span class="nroffip">--basic</span> +-<p class="level1">(HTTP) Tells curl to use HTTP Basic authentication. This is the default and this option is usually pointless, unless you use it to override a previously set option that sets a different authentication method (such as <a class="emphasis" href="#--ntlm">--ntlm</a>, <a class="emphasis" href="#--digest">--digest</a> and <a class="emphasis" href="#--negotiate">--negotiate</a>). ++<p class="level1">(HTTP) Tells curl to use HTTP Basic authentication. This is the default and this option is usually pointless, unless you use it to override a previously set option that sets a different authentication method (such as <a class="emphasis" href="#--ntlm">--ntlm</a>, <a class="emphasis" href="#--digest">--digest</a>, or <a class="emphasis" href="#--negotiate">--negotiate</a>). + <p class="level1">If this option is used several times, the following occurrences make no difference. + <p class="level0"><a name="--ciphers"></a><span class="nroffip">--ciphers <list of ciphers></span> +-<p class="level1">(SSL) Specifies which ciphers to use in the connection. The list of ciphers must be using valid ciphers. Read up on SSL cipher list details on this URL: <span Class="emphasis"><a href="http://www.openssl.org/docs/apps/ciphers.html">http://www.openssl.org/docs/apps/ciphers.html</a></span> ++<p class="level1">(SSL) Specifies which ciphers to use in the connection. The list of ciphers must specify valid ciphers. Read up on SSL cipher list details on this URL: <span Class="emphasis"><a href="http://www.openssl.org/docs/apps/ciphers.html">http://www.openssl.org/docs/apps/ciphers.html</a></span> + <p class="level1">NSS ciphers are done differently than OpenSSL and GnuTLS. The full list of NSS ciphers is in the NSSCipherSuite entry at this URL: <span Class="emphasis"><a href="http://directory.fedora.redhat.com/docs/mod_nss.html">http://directory.fedora.redhat.com/docs/mod_nss.html</a>#Directives</span> + <p class="level1">If this option is used several times, the last one will override the others. + <p class="level0"><a name="--compressed"></a><span class="nroffip">--compressed</span> +@@ -103,7 +103,7 @@ + <p class="level1"><span Class="bold">NOTE</span> If the cookie jar can't be created or written to, the whole curl operation won't fail or even report an error clearly. Using -v will get a warning displayed, but that is the only visible feedback you get about this possibly lethal situation. + <p class="level1">If this option is used several times, the last specified file name will be used. + <p class="level0"><a name="-C--continue-at"></a><span class="nroffip">-C/--continue-at <offset></span> +-<p class="level1">Continue/Resume a previous file transfer at the given offset. The given offset is the exact number of bytes that will be skipped counted from the beginning of the source file before it is transferred to the destination. If used with uploads, the ftp server command SIZE will not be used by curl. ++<p class="level1">Continue/Resume a previous file transfer at the given offset. The given offset is the exact number of bytes that will be skipped counted from the beginning of the source file before it is transferred to the destination. If used with uploads, the FTP server command SIZE will not be used by curl. + <p class="level1">Use "-C -" to tell curl to automatically find out where/how to resume the transfer. It then uses the given output/input files to figure that out. + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="--create-dirs"></a><span class="nroffip">--create-dirs</span> +@@ -114,27 +114,27 @@ + <p class="level1">If this option is used several times, the following occurrences make no difference. + <p class="level0"><a name="-d--data"></a><span class="nroffip">-d/--data <data></span> + <p class="level1">(HTTP) Sends the specified data in a POST request to the HTTP server, in the same way that a browser does when a user has filled in an HTML form and presses the submit button. This will cause curl to pass the data to the server using the content-type application/x-www-form-urlencoded. Compare to <a class="emphasis" href="#-F--form">-F/--form</a>. +-<p class="level1"><a class="emphasis" href="#-d--data">-d/--data</a> is the same as <span Class="emphasis">--data-ascii</span>. To post data purely binary, you should instead use the <a class="emphasis" href="#--data-binary">--data-binary</a> option. To URL encode the value of a form field you may use <a class="emphasis" href="#--data-urlencode">--data-urlencode</a>. ++<p class="level1"><a class="emphasis" href="#-d--data">-d/--data</a> is the same as <span Class="emphasis">--data-ascii</span>. To post data purely binary, you should instead use the <a class="emphasis" href="#--data-binary">--data-binary</a> option. To URL-encode the value of a form field you may use <a class="emphasis" href="#--data-urlencode">--data-urlencode</a>. + <p class="level1">If any of these options is used more than once on the same command line, the data pieces specified will be merged together with a separating &-letter. Thus, using '-d name=daniel -d skill=lousy' would generate a post chunk that looks like 'name=daniel&skill=lousy'. + <p class="level1">If you start the data with the letter @, the rest should be a file name to read the data from, or - if you want curl to read the data from stdin. The contents of the file must already be url-encoded. Multiple files can also be specified. Posting data from a file named 'foobar' would thus be done with <span Class="emphasis">--data @foobar</span>. + <p class="level0"><a name="--data-binary"></a><span class="nroffip">--data-binary <data></span> + <p class="level1">(HTTP) This posts data exactly as specified with no extra processing whatsoever. + <p class="level1">If you start the data with the letter @, the rest should be a filename. Data is posted in a similar manner as <span Class="emphasis">--data-ascii</span> does, except that newlines are preserved and conversions are never done. +-<p class="level1">If this option is used several times, the ones following the first will append data. As described in <a class="emphasis" href="#-d--data">-d/--data</a>. ++<p class="level1">If this option is used several times, the ones following the first will append data as described in <a class="emphasis" href="#-d--data">-d/--data</a>. + <p class="level0"><a name="--data-urlencode"></a><span class="nroffip">--data-urlencode <data></span> + <p class="level1">(HTTP) This posts data, similar to the other --data options with the exception that this performs URL encoding. (Added in 7.18.0) +-<p class="level1">To be CGI compliant, the <data> part should begin with a <span Class="emphasis">name</span> followed by a separator and a content specification. The <data> part can be passed to curl using one of the following syntaxes: ++<p class="level1">To be CGI-compliant, the <data> part should begin with a <span Class="emphasis">name</span> followed by a separator and a content specification. The <data> part can be passed to curl using one of the following syntaxes: + <p class="level2"> + <p class="level1"><a name="content"></a><span class="nroffip">content</span> +-<p class="level2">This will make curl URL encode the content and pass that on. Just be careful so that the content doesn't contain any = or @ letters, as that will then make the syntax match one of the other cases below! ++<p class="level2">This will make curl URL-encode the content and pass that on. Just be careful so that the content doesn't contain any = or @ letters, as that will then make the syntax match one of the other cases below! + <p class="level1"><a name="content"></a><span class="nroffip">=content</span> +-<p class="level2">This will make curl URL encode the content and pass that on. The preceding = letter is not included in the data. ++<p class="level2">This will make curl URL-encode the content and pass that on. The preceding = letter is not included in the data. + <p class="level1"><a name="namecontent"></a><span class="nroffip">name=content</span> +-<p class="level2">This will make curl URL encode the content part and pass that on. Note that the name part is expected to be URL encoded already. ++<p class="level2">This will make curl URL-encode the content part and pass that on. Note that the name part is expected to be URL-encoded already. + <p class="level1"><a name="filename"></a><span class="nroffip">@filename</span> +-<p class="level2">This will make curl load data from the given file (including any newlines), URL encode that data and pass it on in the POST. ++<p class="level2">This will make curl load data from the given file (including any newlines), URL-encode that data and pass it on in the POST. + <p class="level1"><a name="namefilename"></a><span class="nroffip">name@filename</span> +-<p class="level2">This will make curl load data from the given file (including any newlines), URL encode that data and pass it on in the POST. The name part gets an equal sign appended, resulting in <span Class="emphasis">name=urlencoded-file-content</span>. Note that the name is expected to be URL encoded already. ++<p class="level2">This will make curl load data from the given file (including any newlines), URL-encode that data and pass it on in the POST. The name part gets an equal sign appended, resulting in <span Class="emphasis">name=urlencoded-file-content</span>. Note that the name is expected to be URL-encoded already. + <p class="level1"> + <p class="level0"><a name="--digest"></a><span class="nroffip">--digest</span> + <p class="level1">(HTTP) Enables HTTP Digest authentication. This is a authentication that prevents the password from being sent over the wire in clear text. Use this in combination with the normal <a class="emphasis" href="#-u--user">-u/--user</a> option to set user name and password. See also <a class="emphasis" href="#--ntlm">--ntlm</a>, <a class="emphasis" href="#--negotiate">--negotiate</a> and <a class="emphasis" href="#--anyauth">--anyauth</a> for related options. +@@ -282,14 +282,14 @@ + <p class="level1">This option requires that the library was built with kerberos4 or GSSAPI (GSS-Negotiate) support. This is not very common. Use <a class="emphasis" href="#-V--version">-V/--version</a> to see if your curl supports it. + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="-K--config"></a><span class="nroffip">-K/--config <config file></span> +-<p class="level1">Specify which config file to read curl arguments from. The config file is a text file in which command line arguments can be written which then will be used as if they were written on the actual command line. Options and their parameters must be specified on the same config file line, separated by white space, colon, the equals sign or any combination thereof (however, the preferred separator is the equals sign). If the parameter is to contain white spaces, the parameter must be enclosed within quotes. Within double quotes, the following escape sequences are available: \\, \", \t, \n, \r and \v. A backlash preceding any other letter is ignored. If the first column of a config line is a '#' character, the rest of the line will be treated as a comment. Only write one option per physical line in the config file. ++<p class="level1">Specify which config file to read curl arguments from. The config file is a text file in which command line arguments can be written which then will be used as if they were written on the actual command line. Options and their parameters must be specified on the same config file line, separated by whitespace, colon, the equals sign or any combination thereof (however, the preferred separator is the equals sign). If the parameter is to contain whitespace, the parameter must be enclosed within quotes. Within double quotes, the following escape sequences are available: \\, \", \t, \n, \r and \v. A backslash preceding any other letter is ignored. If the first column of a config line is a '#' character, the rest of the line will be treated as a comment. Only write one option per physical line in the config file. + <p class="level1">Specify the filename to -K/--config as '-' to make curl read the file from stdin. + <p class="level1">Note that to be able to specify a URL in the config file, you need to specify it using the <a class="emphasis" href="#--url">--url</a> option, and not by simply writing the URL on its own line. So, it could look similar to this: + <p class="level1">url = "<a href="http://curl.haxx.se/docs/">http://curl.haxx.se/docs/</a>" + <p class="level1">Long option names can optionally be given in the config file without the initial double dashes. + <p class="level1">When curl is invoked, it always (unless <a class="emphasis" href="#-q">-q</a> is used) checks for a default config file and uses it if found. The default config file is checked for in the following places in this order: +-<p class="level1">1) curl tries to find the "home dir": It first checks for the CURL_HOME and then the HOME environment variables. Failing that, it uses getpwuid() on unix-like systems (which returns the home dir given the current user in your system). On Windows, it then checks for the APPDATA variable, or as a last resort the '%USERPROFILE%Application Data'. +-<p class="level1">2) On windows, if there is no _curlrc file in the home dir, it checks for one in the same dir the executable curl is placed. On unix-like systems, it will simply try to load .curlrc from the determined home dir. ++<p class="level1">1) curl tries to find the "home dir": It first checks for the CURL_HOME and then the HOME environment variables. Failing that, it uses getpwuid() on UNIX-like systems (which returns the home dir given the current user in your system). On Windows, it then checks for the APPDATA variable, or as a last resort the '%USERPROFILE\%Application Data'. ++<p class="level1">2) On windows, if there is no _curlrc file in the home dir, it checks for one in the same dir the curl executable is placed. On UNIX-like systems, it will simply try to load .curlrc from the determined home dir. + <p class="level1"><pre> + <p class="level1"># --- Example file --- + # this is a comment +@@ -306,23 +306,23 @@ + <p class="level1"> + <p class="level1">This option can be used multiple times to load multiple config files. + <p class="level0"><a name="--libcurl"></a><span class="nroffip">--libcurl <file></span> +-<p class="level1">Append this option to any ordinary curl command line, and you will get a libcurl-using source code written to the file that does the equivalent operation of what your command line operation does! ++<p class="level1">Append this option to any ordinary curl command line, and you will get a libcurl-using source code written to the file that does the equivalent of what your command line operation does! + <p class="level1">NOTE: this does not properly support -F and the sending of multipart formposts, so in those cases the output program will be missing necessary calls to <span Class="emphasis">curl_formadd(3)</span>, and possibly more. + <p class="level1">If this option is used several times, the last given file name will be used. (Added in 7.16.1) + <p class="level0"><a name="--limit-rate"></a><span class="nroffip">--limit-rate <speed></span> +-<p class="level1">Specify the maximum transfer rate you want curl to use. This feature is useful if you have a limited pipe and you'd like your transfer not use your entire bandwidth. +-<p class="level1">The given speed is measured in bytes/second, unless a suffix is appended. Appending 'k' or 'K' will count the number as kilobytes, 'm' or M' makes it megabytes while 'g' or 'G' makes it gigabytes. Examples: 200K, 3m and 1G. +-<p class="level1">The given rate is the average speed, counted during the entire transfer. It means that curl might use higher transfer speeds in short bursts, but over time it uses no more than the given rate. +-<p class="level1">If you are also using the <a class="emphasis" href="#-Y--speed-limit">-Y/--speed-limit</a> option, that option will take precedence and might cripple the rate-limiting slightly, to help keeping the speed-limit logic working. ++<p class="level1">Specify the maximum transfer rate you want curl to use. This feature is useful if you have a limited pipe and you'd like your transfer not to use your entire bandwidth. ++<p class="level1">The given speed is measured in bytes/second, unless a suffix is appended. Appending 'k' or 'K' will count the number as kilobytes, 'm' or M' makes it megabytes, while 'g' or 'G' makes it gigabytes. Examples: 200K, 3m and 1G. ++<p class="level1">The given rate is the average speed counted during the entire transfer. It means that curl might use higher transfer speeds in short bursts, but over time it uses no more than the given rate. ++<p class="level1">If you also use the <a class="emphasis" href="#-Y--speed-limit">-Y/--speed-limit</a> option, that option will take precedence and might cripple the rate-limiting slightly, to help keeping the speed-limit logic working. + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="-l--list-only"></a><span class="nroffip">-l/--list-only</span> + <p class="level1">(FTP) When listing an FTP directory, this switch forces a name-only view. Especially useful if you want to machine-parse the contents of an FTP directory since the normal directory view doesn't use a standard look or format. + <p class="level1">This option causes an FTP NLST command to be sent. Some FTP servers list only files in their response to NLST; they do not include subdirectories and symbolic links. + <p class="level1">If this option is used twice, the second will again disable list only. + <p class="level0"><a name="--local-port"></a><span class="nroffip">--local-port <num>[-num]</span> +-<p class="level1">Set a preferred number or range of local port numbers to use for the connection(s). Note that port numbers by nature is a scarce resource that will be busy at times so setting this range to something too narrow might cause unnecessary connection setup failures. (Added in 7.15.2) ++<p class="level1">Set a preferred number or range of local port numbers to use for the connection(s). Note that port numbers by nature are a scarce resource that will be busy at times so setting this range to something too narrow might cause unnecessary connection setup failures. (Added in 7.15.2) + <p class="level0"><a name="-L--location"></a><span class="nroffip">-L/--location</span> +-<p class="level1">(HTTP/HTTPS) If the server reports that the requested page has moved to a different location (indicated with a Location: header and a 3XX response code) this option will make curl redo the request on the new place. If used together with <a class="emphasis" href="#-i--include">-i/--include</a> or <a class="emphasis" href="#-I--head">-I/--head</a>, headers from all requested pages will be shown. When authentication is used, curl only sends its credentials to the initial host. If a redirect takes curl to a different host, it won't be able to intercept the user+password. See also <a class="emphasis" href="#--location-trusted">--location-trusted</a> on how to change this. You can limit the amount of redirects to follow by using the <a class="emphasis" href="#--max-redirs">--max-redirs</a> option. ++<p class="level1">(HTTP/HTTPS) If the server reports that the requested page has moved to a different location (indicated with a Location: header and a 3XX response code), this option will make curl redo the request on the new place. If used together with <a class="emphasis" href="#-i--include">-i/--include</a> or <a class="emphasis" href="#-I--head">-I/--head</a>, headers from all requested pages will be shown. When authentication is used, curl only sends its credentials to the initial host. If a redirect takes curl to a different host, it won't be able to intercept the user+password. See also <a class="emphasis" href="#--location-trusted">--location-trusted</a> on how to change this. You can limit the amount of redirects to follow by using the <a class="emphasis" href="#--max-redirs">--max-redirs</a> option. + <p class="level1">When curl follows a redirect and the request is not a plain GET (for example POST or PUT), it will do the following request with a GET if the HTTP response was 301, 302, or 303. If the response code was any other 3xx code, curl will re-send the following request using the same unmodified method. + <p class="level1">If this option is used twice, the second will again disable location following. + <p class="level0"><a name="--location-trusted"></a><span class="nroffip">--location-trusted</span> +@@ -330,23 +330,23 @@ + <p class="level1">If this option is used twice, the second will again disable location following. + <p class="level0"><a name="--max-filesize"></a><span class="nroffip">--max-filesize <bytes></span> + <p class="level1">Specify the maximum size (in bytes) of a file to download. If the file requested is larger than this value, the transfer will not start and curl will return with exit code 63. +-<p class="level1">NOTE: The file size is not always known prior to download, and for such files this option has no effect even if the file transfer ends up being larger than this given limit. This concerns both FTP and HTTP transfers. ++<p class="level1"><b>NOTE:</b> The file size is not always known prior to download, and for such files this option has no effect even if the file transfer ends up being larger than this given limit. This concerns both FTP and HTTP transfers. + <p class="level0"><a name="-m--max-time"></a><span class="nroffip">-m/--max-time <seconds></span> + <p class="level1">Maximum time in seconds that you allow the whole operation to take. This is useful for preventing your batch jobs from hanging for hours due to slow networks or links going down. See also the <a class="emphasis" href="#--connect-timeout">--connect-timeout</a> option. + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="-M--manual"></a><span class="nroffip">-M/--manual</span> + <p class="level1">Manual. Display the huge help text. + <p class="level0"><a name="-n--netrc"></a><span class="nroffip">-n/--netrc</span> +-<p class="level1">Makes curl scan the <span Class="emphasis">.netrc</span> file in the user's home directory for login name and password. This is typically used for ftp on unix. If used with http, curl will enable user authentication. See <span Class="manpage">netrc(4)</span> or <span Class="manpage">ftp(1)</span> for details on the file format. Curl will not complain if that file hasn't the right permissions (it should not be world nor group readable). The environment variable "HOME" is used to find the home directory. +-<p class="level1">A quick and very simple example of how to setup a <span Class="emphasis">.netrc</span> to allow curl to ftp to the machine host.domain.com with user name 'myself' and password 'secret' should look similar to: ++<p class="level1">Makes curl scan the <span Class="emphasis">.netrc</span> file in the user's home directory for login name and password. This is typically used for FTP on unix. If used with HTTP, curl will enable user authentication. See <span Class="manpage">netrc(4)</span> or <span Class="manpage">ftp(1)</span> for details on the file format. Curl will not complain if that file doesn't have the right permissions (it should not be either world- or group-readable). The environment variable "HOME" is used to find the home directory. ++<p class="level1">A quick and very simple example of how to setup a <span Class="emphasis">.netrc</span> to allow curl to FTP to the machine host.domain.com with user name 'myself' and password 'secret' should look similar to: + <p class="level1"><span Class="bold">machine host.domain.com login myself password secret</span> + <p class="level1">If this option is used twice, the second will again disable netrc usage. + <p class="level0"><a name="--netrc-optional"></a><span class="nroffip">--netrc-optional</span> +-<p class="level1">Very similar to <span Class="emphasis">--netrc</span>, but this option makes the .netrc usage <span Class="bold">optional</span> and not mandatory as the <span Class="emphasis">--netrc</span> does. ++<p class="level1">Very similar to <span Class="emphasis">--netrc</span>, but this option makes the .netrc usage <span Class="bold">optional</span> and not mandatory as the <span Class="emphasis">--netrc</span> option does. + <p class="level0"><a name="--negotiate"></a><span class="nroffip">--negotiate</span> + <p class="level1">(HTTP) Enables GSS-Negotiate authentication. The GSS-Negotiate method was designed by Microsoft and is used in their web applications. It is primarily meant as a support for Kerberos5 authentication but may be also used along with another authentication methods. For more information see IETF draft draft-brezak-spnego-http-04.txt. + <p class="level1">If you want to enable Negotiate for your proxy authentication, then use <a class="emphasis" href="#--proxy-negotiate">--proxy-negotiate</a>. +-<p class="level1">This option requires that the library was built with GSSAPI support. This is not very common. Use <a class="emphasis" href="#-V--version">-V/--version</a> to see if your version supports GSS-Negotiate. ++<p class="level1">This option requires a library built with GSSAPI support. This is not very common. Use <a class="emphasis" href="#-V--version">-V/--version</a> to see if your version supports GSS-Negotiate. + <p class="level1">When using this option, you must also provide a fake -u/--user option to activate the authentication code properly. Sending a '-u :' is enough as the user name and password from the -u option aren't actually used. + <p class="level1">If this option is used several times, the following occurrences make no difference. + <p class="level0"><a name="-N--no-buffer"></a><span class="nroffip">-N/--no-buffer</span> +@@ -356,29 +356,29 @@ + <p class="level1">Disables the use of keepalive messages on the TCP connection, as by default curl enables them. + <p class="level1">If this option is used twice, the second will again enable keepalive. + <p class="level0"><a name="--no-sessionid"></a><span class="nroffip">--no-sessionid</span> +-<p class="level1">(SSL) Disable curl's use of SSL session-ID caching. By default all transfers are done using the cache. Note that while nothing ever should get hurt by attempting to reuse SSL session-IDs, there seem to be broken SSL implementations in the wild that may require you to disable this in order for you to succeed. (Added in 7.16.0) ++<p class="level1">(SSL) Disable curl's use of SSL session-ID caching. By default all transfers are done using the cache. Note that while nothing should ever get hurt by attempting to reuse SSL session-IDs, there seem to be broken SSL implementations in the wild that may require you to disable this in order for you to succeed. (Added in 7.16.0) + <p class="level1">If this option is used twice, the second will again switch on use of the session cache. + <p class="level0"><a name="--ntlm"></a><span class="nroffip">--ntlm</span> +-<p class="level1">(HTTP) Enables NTLM authentication. The NTLM authentication method was designed by Microsoft and is used by IIS web servers. It is a proprietary protocol, reversed engineered by clever people and implemented in curl based on their efforts. This kind of behavior should not be endorsed, you should encourage everyone who uses NTLM to switch to a public and documented authentication method instead. Such as Digest. ++<p class="level1">(HTTP) Enables NTLM authentication. The NTLM authentication method was designed by Microsoft and is used by IIS web servers. It is a proprietary protocol, reverse-engineered by clever people and implemented in curl based on their efforts. This kind of behavior should not be endorsed, you should encourage everyone who uses NTLM to switch to a public and documented authentication method instead, such as Digest. + <p class="level1">If you want to enable NTLM for your proxy authentication, then use <a class="emphasis" href="#--proxy-ntlm">--proxy-ntlm</a>. +-<p class="level1">This option requires that the library was built with SSL support. Use <a class="emphasis" href="#-V--version">-V/--version</a> to see if your curl supports NTLM. ++<p class="level1">This option requires a library built with SSL support. Use <a class="emphasis" href="#-V--version">-V/--version</a> to see if your curl supports NTLM. + <p class="level1">If this option is used several times, the following occurrences make no difference. + <p class="level0"><a name="-o--output"></a><span class="nroffip">-o/--output <file></span> + <p class="level1">Write output to <file> instead of stdout. If you are using {} or [] to fetch multiple documents, you can use '#' followed by a number in the <file> specifier. That variable will be replaced with the current string for the URL being fetched. Like in: + <p class="level1"> curl http://{one,two}.site.com -o "file_#1.txt" + <p class="level1">or use several variables like: + <p class="level1"> curl http://{site,host}.host[1-5].com -o "#1_#2" +-<p class="level1">You may use this option as many times as you have number of URLs. ++<p class="level1">You may use this option as many times as the number of URLs you have. + <p class="level1">See also the <a class="emphasis" href="#--create-dirs">--create-dirs</a> option to create the local directories dynamically. + <p class="level0"><a name="-O--remote-name"></a><span class="nroffip">-O/--remote-name</span> + <p class="level1">Write output to a local file named like the remote file we get. (Only the file part of the remote file is used, the path is cut off.) + <p class="level1">The remote file name to use for saving is extracted from the given URL, nothing else. +-<p class="level1">You may use this option as many times as you have number of URLs. ++<p class="level1">You may use this option as many times as the number of URLs you have. + <p class="level0"><a name="--pass"></a><span class="nroffip">--pass <phrase></span> +-<p class="level1">(SSL/SSH) Pass phrase for the private key ++<p class="level1">(SSL/SSH) Passphrase for the private key + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="--post301"></a><span class="nroffip">--post301</span> +-<p class="level1">Tells curl to respect RFC 2616/10.3.2 and not convert POST requests into GET requests when following a 301 redirection. The non-RFC behaviour is ubiquitous in web browsers, so curl does the conversion by default to maintain consistency. However, a server may requires a POST to remain a POST after such a redirection. This option is meaningful only when using <a class="emphasis" href="#-L--location">-L/--location</a> (Added in 7.17.1) ++<p class="level1">Tells curl to respect RFC 2616/10.3.2 and not convert POST requests into GET requests when following a 301 redirection. The non-RFC behaviour is ubiquitous in web browsers, so curl does the conversion by default to maintain consistency. However, a server may require a POST to remain a POST after such a redirection. This option is meaningful only when using <a class="emphasis" href="#-L--location">-L/--location</a> (Added in 7.17.1) + <p class="level0"><a name="--proxy-anyauth"></a><span class="nroffip">--proxy-anyauth</span> + <p class="level1">Tells curl to pick a suitable authentication method when communicating with the given proxy. This might cause an extra request/response round-trip. (Added in 7.13.2) + <p class="level1">If this option is used twice, the second will again disable the proxy use-any authentication. +@@ -401,14 +401,14 @@ + <p class="level1">(SSH) Public key file name. Allows you to provide your public key in this separate file. + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="-P--ftp-port"></a><span class="nroffip">-P/--ftp-port <address></span> +-<p class="level1">(FTP) Reverses the initiator/listener roles when connecting with ftp. This switch makes Curl use the PORT command instead of PASV. In practise, PORT tells the server to connect to the client's specified address and port, while PASV asks the server for an ip address and port to connect to. <address> should be one of: ++<p class="level1">(FTP) Reverses the initiator/listener roles when connecting with FTP. This switch makes Curl use the PORT command instead of PASV. In practice, PORT tells the server to connect to the client's specified address and port, while PASV asks the server for an IP address and port to connect to. <address> should be one of: + <p class="level2"> + <p class="level1"><a name="interface"></a><span class="nroffip">interface</span> + <p class="level2">i.e "eth0" to specify which interface's IP address you want to use (Unix only) + <p class="level1"><a name="IP"></a><span class="nroffip">IP address</span> +-<p class="level2">i.e "192.168.10.1" to specify exact IP number ++<p class="level2">i.e "192.168.10.1" to specify the exact IP address + <p class="level1"><a name="host"></a><span class="nroffip">host name</span> +-<p class="level2">i.e "my.host.domain" to specify machine ++<p class="level2">i.e "my.host.domain" to specify the machine + <p class="level1"><a name="-"></a><span class="nroffip">-</span> + <p class="level2">make curl pick the same IP address that is already used for the control connection + <p class="level1"> +@@ -416,12 +416,12 @@ + <p class="level0"><a name="-q"></a><span class="nroffip">-q</span> + <p class="level1">If used as the first parameter on the command line, the <span Class="emphasis">curlrc</span> config file will not be read and used. See the <a class="emphasis" href="#-K--config">-K/--config</a> for details on the default config file search path. + <p class="level0"><a name="-Q--quote"></a><span class="nroffip">-Q/--quote <command></span> +-<p class="level1">(FTP/SFTP) Send an arbitrary command to the remote FTP or SFTP server. Quote commands are sent BEFORE the transfer is taking place (just after the initial PWD command in an FTP transfer, to be exact). To make commands take place after a successful transfer, prefix them with a dash '-'. To make commands get sent after libcurl has changed working directory, just before the transfer command(s), prefix the command with '+' (this is only supported for FTP). You may specify any number of commands. If the server returns failure for one of the commands, the entire operation will be aborted. You must send syntactically correct FTP commands as RFC959 defines to FTP servers, or one of the following commands (with appropriate arguments) to SFTP servers: chgrp, chmod, chown, ln, mkdir, pwd, rename, rm, rmdir, symlink. ++<p class="level1">(FTP/SFTP) Send an arbitrary command to the remote FTP or SFTP server. Quote commands are sent BEFORE the transfer takes place (just after the initial PWD command in an FTP transfer, to be exact). To make commands take place after a successful transfer, prefix them with a dash '-'. To make commands be sent after libcurl has changed the working directory, just before the transfer command(s), prefix the command with a '+' (this is only supported for FTP). You may specify any number of commands. If the server returns failure for one of the commands, the entire operation will be aborted. You must send syntactically correct FTP commands as RFC959 defines to FTP servers, or one of the following commands (with appropriate arguments) to SFTP servers: chgrp, chmod, chown, ln, mkdir, pwd, rename, rm, rmdir, symlink. + <p class="level1">This option can be used multiple times. + <p class="level0"><a name="--random-file"></a><span class="nroffip">--random-file <file></span> + <p class="level1">(SSL) Specify the path name to file containing what will be considered as random data. The data is used to seed the random engine for SSL connections. See also the <a class="emphasis" href="#--egd-file">--egd-file</a> option. + <p class="level0"><a name="-r--range"></a><span class="nroffip">-r/--range <range></span> +-<p class="level1">(HTTP/FTP/FILE) Retrieve a byte range (i.e a partial document) from a HTTP/1.1, FTP server or a local FILE. Ranges can be specified in a number of ways. ++<p class="level1">(HTTP/FTP/FILE) Retrieve a byte range (i.e a partial document) from a HTTP/1.1 or FTP server or a local FILE. Ranges can be specified in a number of ways. + <p class="level2"> + <p class="level2"><span Class="bold">0-499</span> specifies the first 500 bytes + <p class="level2"><span Class="bold">500-999</span> specifies the second 500 bytes +@@ -429,12 +429,12 @@ + <p class="level2"><span Class="bold">9500-</span> specifies the bytes from offset 9500 and forward + <p class="level2"><span Class="bold">0-0,-1</span> specifies the first and last byte only(*)(H) + <p class="level2"><span Class="bold">500-700,600-799</span> specifies 300 bytes from offset 500(H) +-<p class="level2"><span Class="bold">100-199,500-599</span> specifies two separate 100 bytes ranges(*)(H) ++<p class="level2"><span Class="bold">100-199,500-599</span> specifies two separate 100-byte ranges(*)(H) + <p class="level1"> + <p class="level1">(*) = NOTE that this will cause the server to reply with a multipart response! +-<p class="level1">Only digit characters (0-9) are valid in 'start' and 'stop' of range syntax 'start-stop'. If a non-digit character is given in the range, the server's response will be indeterminable, depending on different server's configuration. ++<p class="level1">Only digit characters (0-9) are valid in the 'start' and 'stop' fields of the 'start-stop' range syntax. If a non-digit character is given in the range, the server's response will be unspecified, depending on the server's configuration. + <p class="level1">You should also be aware that many HTTP/1.1 servers do not have this feature enabled, so that when you attempt to get a range, you'll instead get the whole document. +-<p class="level1">FTP range downloads only support the simple syntax 'start-stop' (optionally with one of the numbers omitted). It depends on the non-RFC command SIZE. ++<p class="level1">FTP range downloads only support the simple 'start-stop' syntax (optionally with one of the numbers omitted). It depends on the non-RFC command SIZE. + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="--raw"></a><span class="nroffip">--raw</span> + <p class="level1">When used, it disables all internal HTTP decoding of content or transfer encodings and instead makes them passed on unaltered, raw. (Added in 7.16.2) +@@ -447,16 +447,16 @@ + <p class="level1">When curl is about to retry a transfer, it will first wait one second and then for all forthcoming retries it will double the waiting time until it reaches 10 minutes which then will be the delay between the rest of the retries. By using <a class="emphasis" href="#--retry-delay">--retry-delay</a> you disable this exponential backoff algorithm. See also <a class="emphasis" href="#--retry-max-time">--retry-max-time</a> to limit the total time allowed for retries. (Added in 7.12.3) + <p class="level1">If this option is used multiple times, the last occurrence decide the amount. + <p class="level0"><a name="--retry-delay"></a><span class="nroffip">--retry-delay <seconds></span> +-<p class="level1">Make curl sleep this amount of time between each retry when a transfer has failed with a transient error (it changes the default backoff time algorithm between retries). This option is only interesting if <a class="emphasis" href="#--retry">--retry</a> is also used. Setting this delay to zero will make curl use the default backoff time. (Added in 7.12.3) +-<p class="level1">If this option is used multiple times, the last occurrence decide the amount. ++<p class="level1">Make curl sleep this amount of time before each retry when a transfer has failed with a transient error (it changes the default backoff time algorithm between retries). This option is only interesting if <a class="emphasis" href="#--retry">--retry</a> is also used. Setting this delay to zero will make curl use the default backoff time. (Added in 7.12.3) ++<p class="level1">If this option is used multiple times, the last occurrence determines the amount. + <p class="level0"><a name="--retry-max-time"></a><span class="nroffip">--retry-max-time <seconds></span> + <p class="level1">The retry timer is reset before the first transfer attempt. Retries will be done as usual (see <a class="emphasis" href="#--retry">--retry</a>) as long as the timer hasn't reached this given limit. Notice that if the timer hasn't reached the limit, the request will be made and while performing, it may take longer than this given time period. To limit a single request´s maximum time, use <a class="emphasis" href="#-m--max-time">-m/--max-time</a>. Set this option to zero to not timeout retries. (Added in 7.12.3) +-<p class="level1">If this option is used multiple times, the last occurrence decide the amount. ++<p class="level1">If this option is used multiple times, the last occurrence determines the amount. + <p class="level0"><a name="-s--silent"></a><span class="nroffip">-s/--silent</span> + <p class="level1">Silent mode. Don't show progress meter or error messages. Makes Curl mute. + <p class="level1">If this option is used twice, the second will again disable silent mode. + <p class="level0"><a name="-S--show-error"></a><span class="nroffip">-S/--show-error</span> +-<p class="level1">When used with -s it makes curl show error message if it fails. ++<p class="level1">When used with -s it makes curl show an error message if it fails. + <p class="level1">If this option is used twice, the second will again disable show error. + <p class="level0"><a name="--socks4"></a><span class="nroffip">--socks4 <host[:port]></span> + <p class="level1">Use the specified SOCKS4 proxy. If the port number is not specified, it is assumed at port 1080. (Added in 7.15.2) +@@ -486,7 +486,7 @@ + <p class="level1">XDISPLOC=<X display> Sets the X display location. + <p class="level1">NEW_ENV=<var,val> Sets an environment variable. + <p class="level0"><a name="-T--upload-file"></a><span class="nroffip">-T/--upload-file <file></span> +-<p class="level1">This transfers the specified local file to the remote URL. If there is no file part in the specified URL, Curl will append the local file name. NOTE that you must use a trailing / on the last directory to really prove to Curl that there is no file name or curl will think that your last directory name is the remote file name to use. That will most likely cause the upload operation to fail. If this is used on a http(s) server, the PUT command will be used. ++<p class="level1">This transfers the specified local file to the remote URL. If there is no file part in the specified URL, Curl will append the local file name. NOTE that you must use a trailing / on the last directory to really prove to Curl that there is no file name or curl will think that your last directory name is the remote file name to use. That will most likely cause the upload operation to fail. If this is used on a HTTP(S) server, the PUT command will be used. + <p class="level1">Use the file name "-" (a single dash) to use stdin instead of a given file. + <p class="level1">You can specify one -T for each URL on the command line. Each -T + URL pair specifies what to upload and to where. curl also supports "globbing" of the -T argument, meaning that you can upload multiple files to a single URL by using the same URL globbing style supported in the URL, like this: + <p class="level1">curl -T "{file1,file2}" <a href="http://www.uploadtothissite.com">http://www.uploadtothissite.com</a> +@@ -505,19 +505,19 @@ + <p class="level1">Prepends a time stamp to each trace or verbose line that curl displays. (Added in 7.14.0) + <p class="level1">If this option is used several times, each occurrence will toggle it on/off. + <p class="level0"><a name="-u--user"></a><span class="nroffip">-u/--user <user:password></span> +-<p class="level1">Specify user and password to use for server authentication. Overrides <a class="emphasis" href="#-n--netrc">-n/--netrc</a> and <a class="emphasis" href="#--netrc-optional">--netrc-optional</a>. ++<p class="level1">Specify the user name and password to use for server authentication. Overrides <a class="emphasis" href="#-n--netrc">-n/--netrc</a> and <a class="emphasis" href="#--netrc-optional">--netrc-optional</a>. + <p class="level1">If you just give the user name (without entering a colon) curl will prompt for a password. + <p class="level1">If you use an SSPI-enabled curl binary and do NTLM authentication, you can force curl to pick up the user name and password from your environment by simply specifying a single colon with this option: "-u :". + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="-U--proxy-user"></a><span class="nroffip">-U/--proxy-user <user:password></span> +-<p class="level1">Specify user and password to use for proxy authentication. ++<p class="level1">Specify the user name and password to use for proxy authentication. + <p class="level1">If you use an SSPI-enabled curl binary and do NTLM authentication, you can force curl to pick up the user name and password from your environment by simply specifying a single colon with this option: "-U :". + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="--url"></a><span class="nroffip">--url <URL></span> + <p class="level1">Specify a URL to fetch. This option is mostly handy when you want to specify URL(s) in a config file. + <p class="level1">This option may be used any number of times. To control where this URL is written, use the <a class="emphasis" href="#-o--output">-o/--output</a> or the <a class="emphasis" href="#-O--remote-name">-O/--remote-name</a> options. + <p class="level0"><a name="-v--verbose"></a><span class="nroffip">-v/--verbose</span> +-<p class="level1">Makes the fetching more verbose/talkative. Mostly usable for debugging. Lines starting with '>' means "header data" sent by curl, '<' means "header data" received by curl that is hidden in normal cases and lines starting with '*' means additional info provided by curl. ++<p class="level1">Makes the fetching more verbose/talkative. Mostly useful for debugging. A line starting with '>' means "header data" sent by curl, '<' means "header data" received by curl that is hidden in normal cases, and a line starting with '*' means additional info provided by curl. + <p class="level1">Note that if you only want HTTP headers in the output, <a class="emphasis" href="#-i--include">-i/--include</a> might be option you're looking for. + <p class="level1">If you think this option still doesn't give you enough details, consider using <a class="emphasis" href="#--trace">--trace</a> or <a class="emphasis" href="#--trace-ascii">--trace-ascii</a> instead. + <p class="level1">This option overrides previous uses of <a class="emphasis" href="#--trace-ascii">--trace-ascii</a> or <a class="emphasis" href="#--trace">--trace</a>. +@@ -531,7 +531,7 @@ + <p class="level1"><a name="IPv6"></a><span class="nroffip">IPv6</span> + <p class="level2">You can use IPv6 with this. + <p class="level1"><a name="krb4"></a><span class="nroffip">krb4</span> +-<p class="level2">Krb4 for ftp is supported. ++<p class="level2">Krb4 for FTP is supported. + <p class="level1"><a name="SSL"></a><span class="nroffip">SSL</span> + <p class="level2">HTTPS and FTPS are supported. + <p class="level1"><a name="libz"></a><span class="nroffip">libz</span> +@@ -539,7 +539,7 @@ + <p class="level1"><a name="NTLM"></a><span class="nroffip">NTLM</span> + <p class="level2">NTLM authentication is supported. + <p class="level1"><a name="GSS-Negotiate"></a><span class="nroffip">GSS-Negotiate</span> +-<p class="level2">Negotiate authentication and krb5 for ftp is supported. ++<p class="level2">Negotiate authentication and krb5 for FTP is supported. + <p class="level1"><a name="Debug"></a><span class="nroffip">Debug</span> + <p class="level2">This curl uses a libcurl built with Debug. This enables more error-tracking and memory debugging etc. For curl-developers only! + <p class="level1"><a name="AsynchDNS"></a><span class="nroffip">AsynchDNS</span> +@@ -555,19 +555,19 @@ + <p class="level1"> + <p class="level0"><a name="-w--write-out"></a><span class="nroffip">-w/--write-out <format></span> + <p class="level1">Defines what to display on stdout after a completed and successful operation. The format is a string that may contain plain text mixed with any number of variables. The string can be specified as "string", to get read from a particular file you specify it "@filename" and to tell curl to read the format from stdin you write "@-". +-<p class="level1">The variables present in the output format will be substituted by the value or text that curl thinks fit, as described below. All variables are specified like %{variable_name} and to output a normal % you just write them like %%. You can output a newline by using \n, a carriage return with \r and a tab space with \t. ++<p class="level1">The variables present in the output format will be substituted by the value or text that curl thinks fit, as described below. All variables are specified as %{variable_name} and to output a normal % you just write them as %%. You can output a newline by using \n, a carriage return with \r and a tab space with \t. + <p class="level1"><span Class="bold">NOTE:</span> The %-letter is a special letter in the win32-environment, where all occurrences of % must be doubled when using this option. +-<p class="level1">Available variables are at this point: ++<p class="level1">The variables available variables at this point are: + <p class="level2"> +-<p class="level2"><span Class="bold">url_effective</span> The URL that was fetched last. This is mostly meaningful if you've told curl to follow location: headers. ++<p class="level2"><span Class="bold">url_effective</span> The URL that was fetched last. This is most meaningful if you've told curl to follow location: headers. + <p class="level2"><span Class="bold">http_code</span> The numerical code that was found in the last retrieved HTTP(S) page. + <p class="level2"><span Class="bold">http_connect</span> The numerical code that was found in the last response (from a proxy) to a curl CONNECT request. (Added in 7.12.4) + <p class="level2"><span Class="bold">time_total</span> The total time, in seconds, that the full operation lasted. The time will be displayed with millisecond resolution. + <p class="level2"><span Class="bold">time_namelookup</span> The time, in seconds, it took from the start until the name resolving was completed. + <p class="level2"><span Class="bold">time_connect</span> The time, in seconds, it took from the start until the connect to the remote host (or proxy) was completed. +-<p class="level2"><span Class="bold">time_pretransfer</span> The time, in seconds, it took from the start until the file transfer is just about to begin. This includes all pre-transfer commands and negotiations that are specific to the particular protocol(s) involved. +-<p class="level2"><span Class="bold">time_redirect</span> The time, in seconds, it took for all redirection steps include name lookup, connect, pretransfer and transfer before final transaction was started. time_redirect shows the complete execution time for multiple redirections. (Added in 7.12.3) +-<p class="level2"><span Class="bold">time_starttransfer</span> The time, in seconds, it took from the start until the first byte is just about to be transferred. This includes time_pretransfer and also the time the server needs to calculate the result. ++<p class="level2"><span Class="bold">time_pretransfer</span> The time, in seconds, it took from the start until the file transfer was just about to begin. This includes all pre-transfer commands and negotiations that are specific to the particular protocol(s) involved. ++<p class="level2"><span Class="bold">time_redirect</span> The time, in seconds, it took for all redirection steps include name lookup, connect, pretransfer and transfer before the final transaction was started. time_redirect shows the complete execution time for multiple redirections. (Added in 7.12.3) ++<p class="level2"><span Class="bold">time_starttransfer</span> The time, in seconds, it took from the start until the first byte was just about to be transferred. This includes time_pretransfer and also the time the server needed to calculate the result. + <p class="level2"><span Class="bold">size_download</span> The total amount of bytes that were downloaded. + <p class="level2"><span Class="bold">size_upload</span> The total amount of bytes that were uploaded. + <p class="level2"><span Class="bold">size_header</span> The total amount of bytes of the downloaded headers. +@@ -581,14 +581,14 @@ + <p class="level1"> + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="-x--proxy"></a><span class="nroffip">-x/--proxy <proxyhost[:port]></span> +-<p class="level1">Use specified HTTP proxy. If the port number is not specified, it is assumed at port 1080. +-<p class="level1">This option overrides existing environment variables that sets proxy to use. If there's an environment variable setting a proxy, you can set proxy to "" to override it. ++<p class="level1">Use the specified HTTP proxy. If the port number is not specified, it is assumed at port 1080. ++<p class="level1">This option overrides existing environment variables that set proxy to use. If there's an environment variable setting a proxy, you can set proxy to "" to override it. + <p class="level1"><span Class="bold">Note</span> that all operations that are performed over a HTTP proxy will transparently be converted to HTTP. It means that certain protocol specific operations might not be available. This is not the case if you can tunnel through the proxy, as done with the <a class="emphasis" href="#-p--proxytunnel">-p/--proxytunnel</a> option. +-<p class="level1">Starting with 7.14.1, the proxy host can be specified the exact same way as the proxy environment variables, include protocol prefix (http://) and embedded user + password. ++<p class="level1">Starting with 7.14.1, the proxy host can be specified the exact same way as the proxy environment variables, including the protocol prefix (http://) and the embedded user + password. + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="-X--request"></a><span class="nroffip">-X/--request <command></span> + <p class="level1">(HTTP) Specifies a custom request method to use when communicating with the HTTP server. The specified request will be used instead of the method otherwise used (which defaults to GET). Read the HTTP 1.1 specification for details and explanations. +-<p class="level1">(FTP) Specifies a custom FTP command to use instead of LIST when doing file lists with ftp. ++<p class="level1">(FTP) Specifies a custom FTP command to use instead of LIST when doing file lists with FTP. + <p class="level1">If this option is used several times, the last one will be used. + <p class="level0"><a name="-y--speed-time"></a><span class="nroffip">-y/--speed-time <time></span> + <p class="level1">If a download is slower than speed-limit bytes per second during a speed-time period, the download gets aborted. If speed-time is used, the default speed-limit will be 1 unless set with -y. +@@ -607,15 +607,15 @@ + <p class="level0"><a name="-0--http10"></a><span class="nroffip">-0/--http1.0</span> + <p class="level1">(HTTP) Forces curl to issue its requests using HTTP 1.0 instead of using its internally preferred: HTTP 1.1. + <p class="level0"><a name="-1--tlsv1"></a><span class="nroffip">-1/--tlsv1</span> +-<p class="level1">(SSL) Forces curl to use TSL version 1 when negotiating with a remote TLS server. ++<p class="level1">(SSL) Forces curl to use TLS version 1 when negotiating with a remote TLS server. + <p class="level0"><a name="-2--sslv2"></a><span class="nroffip">-2/--sslv2</span> + <p class="level1">(SSL) Forces curl to use SSL version 2 when negotiating with a remote SSL server. + <p class="level0"><a name="-3--sslv3"></a><span class="nroffip">-3/--sslv3</span> + <p class="level1">(SSL) Forces curl to use SSL version 3 when negotiating with a remote SSL server. + <p class="level0"><a name="-4--ipv4"></a><span class="nroffip">-4/--ipv4</span> +-<p class="level1">If libcurl is capable of resolving an address to multiple IP versions (which it is if it is ipv6-capable), this option tells libcurl to resolve names to IPv4 addresses only. ++<p class="level1">If libcurl is capable of resolving an address to multiple IP versions (which it is if it is IPv6-capable), this option tells libcurl to resolve names to IPv4 addresses only. + <p class="level0"><a name="-6--ipv6"></a><span class="nroffip">-6/--ipv6</span> +-<p class="level1">If libcurl is capable of resolving an address to multiple IP versions (which it is if it is ipv6-capable), this option tells libcurl to resolve names to IPv6 addresses only. ++<p class="level1">If libcurl is capable of resolving an address to multiple IP versions (which it is if it is IPv6-capable), this option tells libcurl to resolve names to IPv6 addresses only. + <p class="level0"><a name="---progress-bar"></a><span class="nroffip">-#/--progress-bar</span> + <p class="level1">Make curl display progress information as a progress bar instead of the default statistics. + <p class="level1">If this option is used twice, the second will again disable the progress bar. <a name="FILES"></a><h2 class="nroffsh">FILES</h2> +@@ -624,13 +624,13 @@ + <p class="level1"><a name="ENVIRONMENT"></a><h2 class="nroffsh">ENVIRONMENT</h2> + <p class="level0"> + <p class="level0"><a name="httpproxy"></a><span class="nroffip">http_proxy [protocol://]<host>[:port]</span> +-<p class="level1">Sets proxy server to use for HTTP. ++<p class="level1">Sets the proxy server to use for HTTP. + <p class="level0"><a name="HTTPSPROXY"></a><span class="nroffip">HTTPS_PROXY [protocol://]<host>[:port]</span> +-<p class="level1">Sets proxy server to use for HTTPS. ++<p class="level1">Sets the proxy server to use for HTTPS. + <p class="level0"><a name="FTPPROXY"></a><span class="nroffip">FTP_PROXY [protocol://]<host>[:port]</span> +-<p class="level1">Sets proxy server to use for FTP. ++<p class="level1">Sets the proxy server to use for FTP. + <p class="level0"><a name="ALLPROXY"></a><span class="nroffip">ALL_PROXY [protocol://]<host>[:port]</span> +-<p class="level1">Sets proxy server to use if no protocol-specific proxy is set. ++<p class="level1">Sets the proxy server to use if no protocol-specific proxy is set. + <p class="level0"><a name="NOPROXY"></a><span class="nroffip">NO_PROXY <comma-separated list of hosts></span> + <p class="level1">list of host names that shouldn't go through any proxy. If set to a asterisk '*' only, it matches all hosts. <a name="EXIT"></a><h2 class="nroffsh">EXIT CODES</h2> + <p class="level0">There exists a bunch of different error codes and their corresponding error messages that may appear during bad conditions. At the time of this writing, the exit codes are: +@@ -741,7 +741,7 @@ + <p class="level0"><a name="66"></a><span class="nroffip">66</span> + <p class="level1">Failed to initialise SSL Engine + <p class="level0"><a name="67"></a><span class="nroffip">67</span> +-<p class="level1">User, password or similar was not accepted and curl failed to login ++<p class="level1">The user name, password, or similar was not accepted and curl failed to log in + <p class="level0"><a name="68"></a><span class="nroffip">68</span> + <p class="level1">File not found on TFTP server + <p class="level0"><a name="69"></a><span class="nroffip">69</span> +@@ -769,7 +769,7 @@ + <p class="level0"><a name="80"></a><span class="nroffip">80</span> + <p class="level1">Failed to shut down the SSL connection + <p class="level0"><a name="XX"></a><span class="nroffip">XX</span> +-<p class="level1">There will appear more error codes here in future releases. The existing ones are meant to never change. <a name="AUTHORS"></a><h2 class="nroffsh">AUTHORS / CONTRIBUTORS</h2> ++<p class="level1">More error codes will appear here in future releases. The existing ones are meant to never change. <a name="AUTHORS"></a><h2 class="nroffsh">AUTHORS / CONTRIBUTORS</h2> + <p class="level0">Daniel Stenberg is the main author, but the whole list of contributors is found in the separate THANKS file. <a name="WWW"></a><h2 class="nroffsh">WWW</h2> + <p class="level0"><a href="http://curl.haxx.se">http://curl.haxx.se</a> <a name="FTP"></a><h2 class="nroffsh">FTP</h2> + <p class="level0"><a href="ftp://ftp.sunet.se/pub/www/utilities/curl/">ftp://ftp.sunet.se/pub/www/utilities/curl/</a> <a name="SEE"></a><h2 class="nroffsh">SEE ALSO</h2> diff --git a/ftp/curl/files/patch-docs::examples::fileupload.c b/ftp/curl/files/patch-docs::examples::fileupload.c new file mode 100644 index 000000000000..332465b44417 --- /dev/null +++ b/ftp/curl/files/patch-docs::examples::fileupload.c @@ -0,0 +1,16 @@ +diff -urN -urN -x .svn ../../vendor/curl/docs/examples/fileupload.c ./docs/examples/fileupload.c +--- ../../vendor/curl/docs/examples/fileupload.c 2008-03-19 12:29:25.000000000 +0200 ++++ ./docs/examples/fileupload.c 2008-04-02 13:42:22.000000000 +0300 +@@ -27,7 +27,11 @@ + return 1; /* can't continue */ + } + +- stat("debugit", &file_info); /* to get the file size */ ++ /* to get the file size */ ++ if(fstat(fileno(fd), &file_info) != 0) { ++ ++ return 1; /* can't continue */ ++ } + + curl = curl_easy_init(); + if(curl) { diff --git a/ftp/curl/files/patch-docs::libcurl::curl_easy_pause.3 b/ftp/curl/files/patch-docs::libcurl::curl_easy_pause.3 new file mode 100644 index 000000000000..1ed02a95a162 --- /dev/null +++ b/ftp/curl/files/patch-docs::libcurl::curl_easy_pause.3 @@ -0,0 +1,21 @@ +diff -urN -urN -x .svn ../../vendor/curl/docs/libcurl/curl_easy_pause.3 ./docs/libcurl/curl_easy_pause.3 +--- ../../vendor/curl/docs/libcurl/curl_easy_pause.3 2008-01-08 16:52:07.000000000 +0200 ++++ ./docs/libcurl/curl_easy_pause.3 2008-03-29 16:08:15.000000000 +0200 +@@ -12,7 +12,7 @@ + Using this function, you can explicitly mark a running connection to get + paused, and you can unpause a connection that was previously paused. + +-A connection can made to pause by using this function or by letting the read ++A connection can be paused by using this function or by letting the read + or the write callbacks return the proper magic return code + (\fICURL_READFUNC_PAUSE\fP and \fICURL_WRITEFUNC_PAUSE\fP). + +@@ -53,7 +53,7 @@ + function. + + If the downloaded data is compressed and is asked to get uncompressed +-automatially on download, libcurl will continue to uncompress the entire ++automatically on download, libcurl will continue to uncompress the entire + downloaded chunk and it will cache the data uncompressed. This has the side- + effect that if you download something that is compressed a lot, it can result + in a very large data amount needing to be allocated to save the data during diff --git a/ftp/curl/files/patch-docs::libcurl::curl_easy_pause.html b/ftp/curl/files/patch-docs::libcurl::curl_easy_pause.html new file mode 100644 index 000000000000..3f557dce5782 --- /dev/null +++ b/ftp/curl/files/patch-docs::libcurl::curl_easy_pause.html @@ -0,0 +1,21 @@ +diff -urN -urN -x .svn ../../vendor/curl/docs/libcurl/curl_easy_pause.html ./docs/libcurl/curl_easy_pause.html +--- ../../vendor/curl/docs/libcurl/curl_easy_pause.html 2008-01-28 13:31:59.000000000 +0200 ++++ ./docs/libcurl/curl_easy_pause.html 2008-04-02 15:51:19.000000000 +0300 +@@ -49,7 +49,7 @@ + <p class="level0"><span Class="bold">CURLcode curl_easy_pause(CURL *handle , int bitmask );</span> + <p class="level0"><a name="DESCRIPTION"></a><h2 class="nroffsh">DESCRIPTION</h2> + <p class="level0">Using this function, you can explicitly mark a running connection to get paused, and you can unpause a connection that was previously paused. +-<p class="level0">A connection can made to pause by using this function or by letting the read or the write callbacks return the proper magic return code (<span Class="emphasis">CURL_READFUNC_PAUSE</span> and <span Class="emphasis">CURL_WRITEFUNC_PAUSE</span>). ++<p class="level0">A connection can be paused by using this function or by letting the read or the write callbacks return the proper magic return code (<span Class="emphasis">CURL_READFUNC_PAUSE</span> and <span Class="emphasis">CURL_WRITEFUNC_PAUSE</span>). + <p class="level0">NOTE: while it may feel tempting, take care and notice that you cannot call this function from another thread. + <p class="level0">When this function is called to unpause reading, the chance is high that you will get your write callback called before this function returns. + <p class="level0">The <span Class="bold">handle</span> argument is of course identifying the handle that operates on the connection you want to pause or unpause. +@@ -65,7 +65,7 @@ + <p class="level0">CURLE_OK (zero) means that the option was set properly, and a non-zero return code means something wrong occurred after the new state was set. See the <span Class="emphasis">libcurl-errors(3)</span> man page for the full list with descriptions. <a name="AVAILABILITY"></a><h2 class="nroffsh">AVAILABILITY</h2> + <p class="level0">This function was added in libcurl 7.18.0. Before this version, there was no explicit support for pausing transfers. <a name="MEMORY"></a><h2 class="nroffsh">MEMORY USE</h2> + <p class="level0">When pausing a read by returning the magic return code from a write callback, the read data is already in libcurl's internal buffers so it'll have to keep it in an allocated buffer until the reading is again unpaused using this function. +-<p class="level0">If the downloaded data is compressed and is asked to get uncompressed automatially on download, libcurl will continue to uncompress the entire downloaded chunk and it will cache the data uncompressed. This has the side- effect that if you download something that is compressed a lot, it can result in a very large data amount needing to be allocated to save the data during the pause. This said, you should probably consider not using paused reading if you allow libcurl to uncompress data automatically. <a name="SEE"></a><h2 class="nroffsh">SEE ALSO</h2> ++<p class="level0">If the downloaded data is compressed and is asked to get uncompressed automatically on download, libcurl will continue to uncompress the entire downloaded chunk and it will cache the data uncompressed. This has the side- effect that if you download something that is compressed a lot, it can result in a very large data amount needing to be allocated to save the data during the pause. This said, you should probably consider not using paused reading if you allow libcurl to uncompress data automatically. <a name="SEE"></a><h2 class="nroffsh">SEE ALSO</h2> + <p class="level0"><a class="manpage" href="./curl_easy_cleanup.html">curl_easy_cleanup (3)</a> <a class="manpage" href="./curl_easy_reset.html"> curl_easy_reset (3)</a> <p class="roffit"> + This HTML page was made with <a href="http://daniel.haxx.se/projects/roffit/">roffit</a>. + </body></html> diff --git a/ftp/curl/files/patch-docs::libcurl::curl_multi_setopt.3 b/ftp/curl/files/patch-docs::libcurl::curl_multi_setopt.3 new file mode 100644 index 000000000000..2c7912978253 --- /dev/null +++ b/ftp/curl/files/patch-docs::libcurl::curl_multi_setopt.3 @@ -0,0 +1,12 @@ +diff -urN -urN -x .svn ../../vendor/curl/docs/libcurl/curl_multi_setopt.3 ./docs/libcurl/curl_multi_setopt.3 +--- ../../vendor/curl/docs/libcurl/curl_multi_setopt.3 2008-03-24 00:40:11.000000000 +0200 ++++ ./docs/libcurl/curl_multi_setopt.3 2008-03-29 16:08:14.000000000 +0200 +@@ -49,7 +49,7 @@ + \fIcurl_multi_perform(3)\fP) - to allow libcurl to keep timeouts and retries + etc to work. A timeout value of -1 means that there is no timeout at all, and + 0 means that the timeout is already reached. Libcurl attempts to limit calling +-this only when the fixed future timeout time actually change. See also ++this only when the fixed future timeout time actually changes. See also + \fICURLMOPT_TIMERDATA\fP. This callback can be used instead of, or in addition + to, \fIcurl_multi_timeout(3)\fP. (Added in 7.16.0) + .IP CURLMOPT_TIMERDATA diff --git a/ftp/curl/files/patch-docs::libcurl::curl_multi_setopt.html b/ftp/curl/files/patch-docs::libcurl::curl_multi_setopt.html new file mode 100644 index 000000000000..c7df7d42a840 --- /dev/null +++ b/ftp/curl/files/patch-docs::libcurl::curl_multi_setopt.html @@ -0,0 +1,12 @@ +diff -urN -urN -x .svn ../../vendor/curl/docs/libcurl/curl_multi_setopt.html ./docs/libcurl/curl_multi_setopt.html +--- ../../vendor/curl/docs/libcurl/curl_multi_setopt.html 2008-03-24 00:40:11.000000000 +0200 ++++ ./docs/libcurl/curl_multi_setopt.html 2008-04-02 15:51:19.000000000 +0300 +@@ -57,7 +57,7 @@ + <p class="level0"><a name="CURLMOPTPIPELINING"></a><span class="nroffip">CURLMOPT_PIPELINING</span> + <p class="level1">Pass a long set to 1 to enable or 0 to disable. Enabling pipelining on a multi handle will make it attempt to perform HTTP Pipelining as far as possible for transfers using this handle. This means that if you add a second request that can use an already existing connection, the second request will be "piped" on the same connection rather than being executed in parallell. (Added in 7.16.0) + <p class="level0"><a name="CURLMOPTTIMERFUNCTION"></a><span class="nroffip">CURLMOPT_TIMERFUNCTION</span> +-<p class="level1">Pass a pointer to a function matching the <span Class="bold">curl_multi_timer_callback</span> prototype. This function will then be called when the timeout value changes. The timeout value is at what latest time the application should call one of the "performing" functions of the multi interface (<a class="emphasis" href="./curl_multi_socket.html">curl_multi_socket(3)</a>, <a class="emphasis" href="./curl_multi_socket_all.html">curl_multi_socket_all(3)</a> and <a class="emphasis" href="./curl_multi_perform.html">curl_multi_perform(3)</a>) - to allow libcurl to keep timeouts and retries etc to work. A timeout value of -1 means that there is no timeout at all, and 0 means that the timeout is already reached. Libcurl attempts to limit calling this only when the fixed future timeout time actually change. See also <a class="emphasis" href="#CURLMOPTTIMERDATA">CURLMOPT_TIMERDATA</a>. This callback can be used instead of, or in addition to, <a class="emphasis" href="./curl_multi_timeout.html">curl_multi_timeout(3)</a>. (Added in 7.16.0) ++<p class="level1">Pass a pointer to a function matching the <span Class="bold">curl_multi_timer_callback</span> prototype. This function will then be called when the timeout value changes. The timeout value is at what latest time the application should call one of the "performing" functions of the multi interface (<a class="emphasis" href="./curl_multi_socket.html">curl_multi_socket(3)</a>, <a class="emphasis" href="./curl_multi_socket_all.html">curl_multi_socket_all(3)</a> and <a class="emphasis" href="./curl_multi_perform.html">curl_multi_perform(3)</a>) - to allow libcurl to keep timeouts and retries etc to work. A timeout value of -1 means that there is no timeout at all, and 0 means that the timeout is already reached. Libcurl attempts to limit calling this only when the fixed future timeout time actually changes. See also <a class="emphasis" href="#CURLMOPTTIMERDATA">CURLMOPT_TIMERDATA</a>. This callback can be used instead of, or in addition to, <a class="emphasis" href="./curl_multi_timeout.html">curl_multi_timeout(3)</a>. (Added in 7.16.0) + <p class="level0"><a name="CURLMOPTTIMERDATA"></a><span class="nroffip">CURLMOPT_TIMERDATA</span> + <p class="level1">Pass a pointer to whatever you want passed to the <span Class="bold">curl_multi_timer_callback</span>'s third argument, the userp pointer. This is not used by libcurl but only passed-thru as-is. Set the callback pointer with <a class="emphasis" href="#CURLMOPTTIMERFUNCTION">CURLMOPT_TIMERFUNCTION</a>. (Added in 7.16.0) + <p class="level0"><a name="CURLMOPTMAXCONNECTS"></a><span class="nroffip">CURLMOPT_MAXCONNECTS</span> diff --git a/ftp/curl/files/patch-lib::easy.c b/ftp/curl/files/patch-lib::easy.c new file mode 100644 index 000000000000..a5439c4d95a8 --- /dev/null +++ b/ftp/curl/files/patch-lib::easy.c @@ -0,0 +1,12 @@ +diff -urN -urN -x .svn ../../vendor/curl/lib/easy.c ./lib/easy.c +--- ../../vendor/curl/lib/easy.c 2008-03-24 00:40:11.000000000 +0200 ++++ ./lib/easy.c 2008-03-29 16:08:15.000000000 +0200 +@@ -819,7 +819,7 @@ + if(data->state.tempwrite && (tempsize - chunklen)) { + /* Ouch, the reading is again paused and the block we send is now + "cached". If this is the final chunk we can leave it like this, but +- if we have more chunks that is cached after this, we need to free ++ if we have more chunks that are cached after this, we need to free + the newly cached one and put back a version that is truly the entire + contents that is saved for later + */ diff --git a/ftp/curl/files/patch-lib::file.c b/ftp/curl/files/patch-lib::file.c new file mode 100644 index 000000000000..c7bae9693cbd --- /dev/null +++ b/ftp/curl/files/patch-lib::file.c @@ -0,0 +1,12 @@ +diff -urN -urN -x .svn ../../vendor/curl/lib/file.c ./lib/file.c +--- ../../vendor/curl/lib/file.c 2008-03-24 00:40:11.000000000 +0200 ++++ ./lib/file.c 2008-04-02 13:17:43.000000000 +0300 +@@ -344,7 +344,7 @@ + + /* treat the negative resume offset value as the case of "-" */ + if(data->state.resume_from < 0) { +- if(stat(file->path, &file_stat)) { ++ if(fstat(fileno(fp), &file_stat)) { + fclose(fp); + failf(data, "Can't get the size of %s", file->path); + return CURLE_WRITE_ERROR; diff --git a/ftp/curl/files/patch-lib::multi.c b/ftp/curl/files/patch-lib::multi.c new file mode 100644 index 000000000000..d03f185efa45 --- /dev/null +++ b/ftp/curl/files/patch-lib::multi.c @@ -0,0 +1,12 @@ +diff -urN -urN -x .svn ../../vendor/curl/lib/multi.c ./lib/multi.c +--- ../../vendor/curl/lib/multi.c 2008-03-24 00:40:11.000000000 +0200 ++++ ./lib/multi.c 2008-03-29 16:14:27.000000000 +0200 +@@ -324,7 +324,7 @@ + { + (void) k1_len; (void) k2_len; + +- return ((*((int* ) k1)) == (*((int* ) k2))) ? 1 : 0; ++ return (*((int* ) k1)) == (*((int* ) k2)); + } + + static size_t hash_fd(void* key, size_t key_length, size_t slots_num) diff --git a/ftp/curl/files/patch-lib::ssh.c b/ftp/curl/files/patch-lib::ssh.c deleted file mode 100644 index 7df1acd0d7c4..000000000000 --- a/ftp/curl/files/patch-lib::ssh.c +++ /dev/null @@ -1,661 +0,0 @@ ---- lib/ssh.c.old 2007-06-20 23:32:34.000000000 +0300 -+++ lib/ssh.c 2007-08-27 14:10:01.000000000 +0300 -@@ -70,6 +70,24 @@ - #endif - #endif /* !WIN32 */ - -+#if defined(LIBSSH2_VERSION_NUM) -+# if LIBSSH2_VERSION_NUM >= 0x001000 -+# define HAVE_LIBSSH2_NBLOCK 1 -+# else -+# define HAVE_LIBSSH2_NBLOCK 0 -+# endif -+#else /* !defined(LIBSSH2_VERSION_NUM) */ -+# if defined(LIBSSH2_APINO) -+# if LIBSSH2_APINO >= 200706012030 -+# define HAVE_LIBSSH2_NBLOCK 1 -+# else -+# define HAVE_LIBSSH2_NBLOCK 0 -+# endif -+# else /* !defined(LIBSSH2_APINO) */ -+# define HAVE_LIBSSH2_NBLOCK 0 -+# endif /* defined(LIBSSH2_APINO) */ -+#endif /* defined(LIBSSH2_VERSION_NUM) */ -+ - #if (defined(NETWARE) && defined(__NOVELL_LIBC__)) - #undef in_addr_t - #define in_addr_t unsigned long -@@ -239,7 +257,7 @@ - (void)abstract; - } - --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - /* - * SSH State machine related code - */ -@@ -770,7 +788,7 @@ - - return result; - } --#endif /* (LIBSSH2_APINO >= 200706012030) */ -+#endif /* HAVE_LIBSSH2_NBLOCK */ - - /* - * SSH setup and connection -@@ -854,7 +872,7 @@ - infof(data, "SSH socket: %d\n", sock); - #endif /* CURL_LIBSSH2_DEBUG */ - --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - state(conn, SSH_S_STARTUP); - - if (data->state.used_interface == Curl_if_multi) -@@ -875,7 +893,7 @@ - (void)fingerprint; /* not used */ - (void)i; /* not used */ - --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - - if (libssh2_session_startup(ssh->ssh_session, sock)) { - failf(data, "Failure establishing ssh session"); -@@ -1112,7 +1130,7 @@ - - *done = TRUE; - return CURLE_OK; --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - - CURLcode Curl_scp_do(struct connectdata *conn, bool *done) -@@ -1134,7 +1152,7 @@ - * the destination file will be named the same name as the last directory - * in the path. - */ --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - do { - scp->ssh_channel = libssh2_scp_send_ex(scp->ssh_session, scp->path, - LIBSSH2_SFTP_S_IRUSR| -@@ -1148,7 +1166,7 @@ - return CURLE_FAILED_INIT; - } - } while (!scp->ssh_channel); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - scp->ssh_channel = libssh2_scp_send_ex(scp->ssh_session, scp->path, - LIBSSH2_SFTP_S_IRUSR| - LIBSSH2_SFTP_S_IWUSR| -@@ -1157,7 +1175,7 @@ - conn->data->set.infilesize, 0, 0); - if (!scp->ssh_channel) - return CURLE_FAILED_INIT; --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - - /* upload data */ - res = Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL); -@@ -1169,7 +1187,7 @@ - */ - curl_off_t bytecount; - memset(&sb, 0, sizeof(struct stat)); --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - do { - scp->ssh_channel = libssh2_scp_recv(scp->ssh_session, scp->path, &sb); - if (!scp->ssh_channel && -@@ -1184,7 +1202,7 @@ - libssh2_session_last_error(scp->ssh_session, NULL, NULL, 0)); - } - } while (!scp->ssh_channel); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - scp->ssh_channel = libssh2_scp_recv(scp->ssh_session, scp->path, &sb); - if (!scp->ssh_channel) { - if ((sb.st_mode == 0) && (sb.st_atime == 0) && (sb.st_mtime == 0) && -@@ -1195,7 +1213,7 @@ - return libssh2_session_error_to_CURLE( - libssh2_session_last_error(scp->ssh_session, NULL, NULL, 0)); - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - /* download data */ - bytecount = (curl_off_t) sb.st_size; - conn->data->reqdata.maxdownload = (curl_off_t) sb.st_size; -@@ -1217,7 +1235,7 @@ - scp->path = NULL; - - if (scp->ssh_channel) { --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - if (conn->data->set.upload) { - while ((rc = libssh2_channel_send_eof(scp->ssh_channel)) == - LIBSSH2_ERROR_EAGAIN); -@@ -1235,7 +1253,7 @@ - infof(conn->data, "Channel failed to close\n"); - } - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (conn->data->set.upload && - libssh2_channel_send_eof(scp->ssh_channel) < 0) { - infof(conn->data, "Failed to send libssh2 channel EOF\n"); -@@ -1243,17 +1261,17 @@ - if (libssh2_channel_close(scp->ssh_channel) < 0) { - infof(conn->data, "Failed to stop libssh2 channel subsystem\n"); - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - libssh2_channel_free(scp->ssh_channel); - } - - if (scp->ssh_session) { --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while (libssh2_session_disconnect(scp->ssh_session, "Shutdown") == - LIBSSH2_ERROR_EAGAIN); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - libssh2_session_disconnect(scp->ssh_session, "Shutdown"); --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - libssh2_session_free(scp->ssh_session); - scp->ssh_session = NULL; - } -@@ -1279,7 +1297,7 @@ - * NOTE: we should not store nor rely on connection-related data to be - * in the SessionHandle struct - */ --#if defined(LIBSSH2CHANNEL_EAGAIN) && (LIBSSH2_APINO < 200706012030) -+#if defined(LIBSSH2CHANNEL_EAGAIN) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO < 200706012030) - nwrite = (ssize_t) - libssh2_channel_writenb(conn->data->reqdata.proto.ssh->ssh_channel, - mem, len); -@@ -1287,7 +1305,7 @@ - nwrite = (ssize_t) - libssh2_channel_write(conn->data->reqdata.proto.ssh->ssh_channel, - mem, len); --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - if (nwrite == LIBSSH2_ERROR_EAGAIN) { - return 0; - } -@@ -1313,7 +1331,7 @@ - * in the SessionHandle struct - */ - --#if defined(LIBSSH2CHANNEL_EAGAIN) && (LIBSSH2_APINO < 200706012030) -+#if defined(LIBSSH2CHANNEL_EAGAIN) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO < 200706012030) - /* we prefer the non-blocking API but that didn't exist previously */ - nread = (ssize_t) - libssh2_channel_readnb(conn->data->reqdata.proto.ssh->ssh_channel, -@@ -1358,7 +1376,7 @@ - * If this is not done the destination file will be named the - * same name as the last directory in the path. - */ --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - do { - sftp->sftp_handle = - libssh2_sftp_open(sftp->sftp_session, sftp->path, -@@ -1402,7 +1420,7 @@ - } - } - } while (!sftp->sftp_handle); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - sftp->sftp_handle = - libssh2_sftp_open(sftp->sftp_session, sftp->path, - LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC, -@@ -1431,7 +1449,7 @@ - return sftp_libssh2_error_to_CURLE(err); - } - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - - /* upload data */ - res = Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL); -@@ -1450,7 +1468,7 @@ - int len, totalLen, currLen; - char *line; - --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - do { - sftp->sftp_handle = - libssh2_sftp_opendir(sftp->sftp_session, sftp->path); -@@ -1463,7 +1481,7 @@ - return sftp_libssh2_error_to_CURLE(err); - } - } while (!sftp->sftp_handle); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - sftp->sftp_handle = - libssh2_sftp_opendir(sftp->sftp_session, sftp->path); - if (!sftp->sftp_handle) { -@@ -1472,17 +1490,17 @@ - sftp_libssh2_strerror(err)); - return sftp_libssh2_error_to_CURLE(err); - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - - do { --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((len = libssh2_sftp_readdir(sftp->sftp_handle, filename, - PATH_MAX, &attrs)) == - LIBSSH2_ERROR_EAGAIN); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - len = libssh2_sftp_readdir(sftp->sftp_handle, filename, - PATH_MAX, &attrs); --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - if (len > 0) { - filename[len] = '\0'; - -@@ -1590,14 +1608,14 @@ - char linkPath[PATH_MAX + 1]; - - snprintf(linkPath, PATH_MAX, "%s%s", sftp->path, filename); --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((len = libssh2_sftp_readlink(sftp->sftp_session, linkPath, - filename, PATH_MAX)) == - LIBSSH2_ERROR_EAGAIN); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - len = libssh2_sftp_readlink(sftp->sftp_session, linkPath, - filename, PATH_MAX); --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - line = realloc(line, totalLen + 4 + len); - if (!line) - return CURLE_OUT_OF_MEMORY; -@@ -1615,11 +1633,11 @@ - break; - } - } while (1); --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while (libssh2_sftp_closedir(sftp->sftp_handle) == LIBSSH2_ERROR_EAGAIN); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - libssh2_sftp_closedir(sftp->sftp_handle); --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - sftp->sftp_handle = NULL; - - /* no data to transfer */ -@@ -1629,7 +1647,7 @@ - /* - * Work on getting the specified file - */ --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - do { - sftp->sftp_handle = - libssh2_sftp_open(sftp->sftp_session, sftp->path, LIBSSH2_FXF_READ, -@@ -1644,7 +1662,7 @@ - return sftp_libssh2_error_to_CURLE(err); - } - } while (!sftp->sftp_handle); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - sftp->sftp_handle = - libssh2_sftp_open(sftp->sftp_session, sftp->path, LIBSSH2_FXF_READ, - LIBSSH2_SFTP_S_IRUSR|LIBSSH2_SFTP_S_IWUSR| -@@ -1655,14 +1673,14 @@ - sftp_libssh2_strerror(err)); - return sftp_libssh2_error_to_CURLE(err); - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((rc = libssh2_sftp_stat(sftp->sftp_session, sftp->path, &attrs)) - == LIBSSH2_ERROR_EAGAIN); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - rc = libssh2_sftp_stat(sftp->sftp_session, sftp->path, &attrs); --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - if (rc) { - /* - * libssh2_sftp_open() didn't return an error, so maybe the server -@@ -1689,31 +1707,31 @@ - bytecount, FALSE, NULL, -1, NULL); - #endif - while (res == CURLE_OK) { --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - ssize_t nread; - - while ((nread = libssh2_sftp_read(data->reqdata.proto.ssh->sftp_handle, - buf, BUFSIZE-1)) == LIBSSH2_ERROR_EAGAIN); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - size_t nread; - /* NOTE: most *read() functions return ssize_t but this returns size_t - which normally is unsigned! */ - nread = libssh2_sftp_read(data->reqdata.proto.ssh->sftp_handle, - buf, BUFSIZE-1); --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - - if (nread > 0) - buf[nread] = 0; - --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - if (nread <= 0) - break; --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - /* this check can be changed to a <= 0 when nread is changed to a - signed variable type */ - if ((nread == 0) || (nread == (size_t)~0)) - break; --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - - bytecount += nread; - -@@ -1756,17 +1774,17 @@ - sftp->homedir = NULL; - - if (sftp->sftp_handle) { --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_sftp_close(sftp->sftp_handle)) == - LIBSSH2_ERROR_EAGAIN); - if (ret < 0) { - infof(conn->data, "Failed to close libssh2 file\n"); - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_sftp_close(sftp->sftp_handle) < 0) { - infof(conn->data, "Failed to close libssh2 file\n"); - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - - /* Before we shut down, see if there are any post-quote commands to send: */ -@@ -1776,40 +1794,40 @@ - } - - if (sftp->sftp_session) { --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_sftp_shutdown(sftp->sftp_session)) == - LIBSSH2_ERROR_EAGAIN); - if (ret < 0) { - infof(conn->data, "Failed to stop libssh2 sftp subsystem\n"); - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_sftp_shutdown(sftp->sftp_session) < 0) { - infof(conn->data, "Failed to stop libssh2 sftp subsystem\n"); - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - - if (sftp->ssh_channel) { --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_channel_close(sftp->ssh_channel)) == - LIBSSH2_ERROR_EAGAIN); - if (ret < 0) { - infof(conn->data, "Failed to stop libssh2 channel subsystem\n"); - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_channel_close(sftp->ssh_channel) < 0) { - infof(conn->data, "Failed to stop libssh2 channel subsystem\n"); - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - - if (sftp->ssh_session) { --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while (libssh2_session_disconnect(sftp->ssh_session, "Shutdown") == - LIBSSH2_ERROR_EAGAIN); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - libssh2_session_disconnect(sftp->ssh_session, "Shutdown"); --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - libssh2_session_free(sftp->ssh_session); - sftp->ssh_session = NULL; - } -@@ -1831,14 +1849,14 @@ - ssize_t nwrite; /* libssh2_sftp_write() used to return size_t in 0.14 - but is changed to ssize_t in 0.15! */ - --#if defined(LIBSSH2SFTP_EAGAIN) && (LIBSSH2_APINO < 200706012030) -+#if defined(LIBSSH2SFTP_EAGAIN) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO < 200706012030) - /* we prefer the non-blocking API but that didn't exist previously */ - nwrite = (ssize_t) - libssh2_sftp_writenb(conn->data->reqdata.proto.ssh->sftp_handle, mem, len); - #else - nwrite = (ssize_t) - libssh2_sftp_write(conn->data->reqdata.proto.ssh->sftp_handle, mem, len); --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - if (nwrite == LIBSSH2_ERROR_EAGAIN) { - return 0; - } -@@ -1860,7 +1878,7 @@ - - /* libssh2_sftp_read() returns size_t !*/ - --#if defined(LIBSSH2SFTP_EAGAIN) && (LIBSSH2_APINO < 200706012030) -+#if defined(LIBSSH2SFTP_EAGAIN) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO < 200706012030) - /* we prefer the non-blocking API but that didn't exist previously */ - nread = (ssize_t) - libssh2_sftp_readnb(conn->data->reqdata.proto.ssh->sftp_handle, mem, len); -@@ -2061,7 +2079,7 @@ - return err; - } - memset(&attrs, 0, sizeof(LIBSSH2_SFTP_ATTRIBUTES)); --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_sftp_stat(sftp_session, - path2, &attrs)) == - LIBSSH2_ERROR_EAGAIN); -@@ -2073,7 +2091,7 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_sftp_stat(sftp_session, - path2, &attrs) != 0) { /* get those attributes */ - err = libssh2_sftp_last_error(sftp_session); -@@ -2083,7 +2101,7 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - - /* Now set the new attributes... */ - if (curl_strnequal(item->data, "chgrp", 5)) { -@@ -2115,7 +2133,7 @@ - } - - /* Now send the completed structure... */ --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_sftp_setstat(sftp_session, path2, &attrs)) == - LIBSSH2_ERROR_EAGAIN); - if (ret != 0) { -@@ -2126,7 +2144,7 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_sftp_setstat(sftp_session, path2, &attrs) != 0) { - err = libssh2_sftp_last_error(sftp_session); - free(path1); -@@ -2135,7 +2153,7 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - else if (curl_strnequal(item->data, "ln ", 3) || - curl_strnequal(item->data, "symlink ", 8)) { -@@ -2151,7 +2169,7 @@ - free(path1); - return err; - } --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_sftp_symlink(sftp_session, path1, path2)) == - LIBSSH2_ERROR_EAGAIN); - if (ret != 0) { -@@ -2162,7 +2180,7 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_sftp_symlink(sftp_session, path1, path2) != 0) { - err = libssh2_sftp_last_error(sftp_session); - free(path1); -@@ -2171,10 +2189,10 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - else if (curl_strnequal(item->data, "mkdir ", 6)) { /* create dir */ --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_sftp_mkdir(sftp_session, path1, 0744)) == - LIBSSH2_ERROR_EAGAIN); - if (ret != 0) { -@@ -2183,7 +2201,7 @@ - failf(data, "mkdir command failed: %s", sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_sftp_mkdir(sftp_session, path1, 0744) != 0) { - err = libssh2_sftp_last_error(sftp_session); - free(path1); -@@ -2191,7 +2209,7 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - else if (curl_strnequal(item->data, "rename ", 7)) { /* rename file */ - /* first param is the source path */ -@@ -2205,7 +2223,7 @@ - free(path1); - return err; - } --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_sftp_rename(sftp_session, path1, path2)) == - LIBSSH2_ERROR_EAGAIN); - if (ret != 0) { -@@ -2215,7 +2233,7 @@ - failf(data, "rename command failed: %s", sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_sftp_rename(sftp_session, - path1, path2) != 0) { - err = libssh2_sftp_last_error(sftp_session); -@@ -2225,10 +2243,10 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - else if (curl_strnequal(item->data, "rmdir ", 6)) { /* delete dir */ --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_sftp_rmdir(sftp_session, path1)) == - LIBSSH2_ERROR_EAGAIN); - if (ret != 0) { -@@ -2237,7 +2255,7 @@ - failf(data, "rmdir command failed: %s", sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_sftp_rmdir(sftp_session, - path1) != 0) { - err = libssh2_sftp_last_error(sftp_session); -@@ -2246,10 +2264,10 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - else if (curl_strnequal(item->data, "rm ", 3)) { /* delete file */ --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((ret = libssh2_sftp_unlink(sftp_session, path1)) == - LIBSSH2_ERROR_EAGAIN); - if (ret != 0) { -@@ -2258,7 +2276,7 @@ - failf(data, "rm command failed: %s", sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - if (libssh2_sftp_unlink(sftp_session, path1) != 0) { - err = libssh2_sftp_last_error(sftp_session); - free(path1); -@@ -2266,7 +2284,7 @@ - sftp_libssh2_strerror(err)); - return CURLE_FTP_QUOTE_ERROR; - } --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - } - - if (path1) -@@ -2299,18 +2317,18 @@ - - infof(conn->data, "Creating directory '%s'\n", sftp->path); - /* 'mode' - parameter is preliminary - default to 0644 */ --#if (LIBSSH2_APINO >= 200706012030) -+#if HAVE_LIBSSH2_NBLOCK - while ((rc = libssh2_sftp_mkdir(sftp->sftp_session, sftp->path, - LIBSSH2_SFTP_S_IRWXU | - LIBSSH2_SFTP_S_IRGRP | LIBSSH2_SFTP_S_IXGRP | - LIBSSH2_SFTP_S_IROTH | LIBSSH2_SFTP_S_IXOTH)) == - LIBSSH2_ERROR_EAGAIN); --#else /* !(LIBSSH2_APINO >= 200706012030) */ -+#else /* !HAVE_LIBSSH2_NBLOCK */ - rc = libssh2_sftp_mkdir(sftp->sftp_session, sftp->path, - LIBSSH2_SFTP_S_IRWXU | - LIBSSH2_SFTP_S_IRGRP | LIBSSH2_SFTP_S_IXGRP | - LIBSSH2_SFTP_S_IROTH | LIBSSH2_SFTP_S_IXOTH); --#endif /* !(LIBSSH2_APINO >= 200706012030) */ -+#endif /* !HAVE_LIBSSH2_NBLOCK */ - *slash_pos = '/'; - ++slash_pos; - if (rc == -1) { diff --git a/ftp/curl/files/patch-src::main.c b/ftp/curl/files/patch-src::main.c new file mode 100644 index 000000000000..6322e688d9d9 --- /dev/null +++ b/ftp/curl/files/patch-src::main.c @@ -0,0 +1,116 @@ +diff -urN -urN -x .svn ../../vendor/curl/src/main.c ./src/main.c +--- ../../vendor/curl/src/main.c 2008-03-24 00:40:11.000000000 +0200 ++++ ./src/main.c 2008-04-02 15:51:11.000000000 +0300 +@@ -4190,31 +4190,32 @@ + (-1 == create_dir_hierarchy(outfile))) + return CURLE_WRITE_ERROR; + +- if(config->resume_from_current) { +- /* We're told to continue from where we are now. Get the +- size of the file as it is now and open it for append instead */ +- +- struct_stat fileinfo; +- +- /* VMS -- Danger, the filesize is only valid for stream files */ +- if(0 == stat(outfile, &fileinfo)) +- /* set offset to current file size: */ +- config->resume_from = fileinfo.st_size; +- else +- /* let offset be 0 */ +- config->resume_from = 0; +- } +- + outs.filename = outfile; + +- if(config->resume_from) { +- outs.init = config->resume_from; ++ if(config->resume_from || config->resume_from_current) { + /* open file for output: */ +- outs.stream=(FILE *) fopen(outfile, config->resume_from?"ab":"wb"); ++ /* (always open for appending, it has no effect on new files) */ ++ outs.stream=(FILE *) fopen(outfile, "ab"); + if (!outs.stream) { + helpf("Can't open '%s'!\n", outfile); + return CURLE_WRITE_ERROR; + } ++ ++ if(config->resume_from_current) { ++ /* We're told to continue from where we are now. Get the ++ size of the file as it is now */ ++ ++ struct_stat fileinfo; ++ ++ if(0 == fstat(fileno(outs.stream), &fileinfo)) ++ /* set offset to current file size: */ ++ config->resume_from = fileinfo.st_size; ++ else ++ /* let offset be 0 */ ++ config->resume_from = 0; ++ } ++ ++ outs.init = config->resume_from; + } + else { + outs.stream = NULL; /* open when needed */ +@@ -4289,7 +4290,7 @@ + */ + + infd= open(uploadfile, O_RDONLY | O_BINARY); +- if ((infd == -1) || stat(uploadfile, &fileinfo)) { ++ if ((infd == -1) || fstat(infd, &fileinfo)) { + helpf("Can't open '%s'!\n", uploadfile); + if(infd != -1) + close(infd); +@@ -5155,12 +5156,13 @@ + const char * + msdosify (const char *file_name) + { +- static char dos_name[PATH_MAX]; ++ static char dos_name[PATH_MAX + 16]; + static const char illegal_chars_dos[] = ".+, ;=[]|<>\\\":?*"; + static const char *illegal_chars_w95 = &illegal_chars_dos[8]; + int idx, dot_idx; + const char *s = file_name; + char *d = dos_name; ++ char *dlimit = dos_name + PATH_MAX; + const char *illegal_aliens = illegal_chars_dos; + size_t len = sizeof (illegal_chars_dos) - 1; + int lfn = 0; +@@ -5181,7 +5183,7 @@ + *d++ = *s++; + } + +- for (idx = 0, dot_idx = -1; *s; s++, d++) { ++ for (idx = 0, dot_idx = -1; *s && d < dlimit; s++, d++) { + if (memchr (illegal_aliens, *s, len)) { + /* Dots are special: DOS doesn't allow them as the leading character, + and a file name cannot have more than a single dot. We leave the +@@ -5238,6 +5240,10 @@ + idx++; + } + ++ if(d >= dlimit) { ++ /* should some kind of error be raised? */ ++ d = dlimit - 1; ++ } + *d = '\0'; + return dos_name; + } +@@ -5252,11 +5258,15 @@ + struct stat st_buf; + char fname[PATH_MAX]; + +- strcpy (fname, file_name); ++ snprintf (fname, PATH_MAX, "%s", file_name); + base = basename (fname); + if (((stat(base, &st_buf)) == 0) && (S_ISCHR(st_buf.st_mode))) { +- size_t blen = strlen (base); ++ size_t blen = strlen (base), flen = strlen (fname); + ++ if(flen == PATH_MAX - 1) { ++ blen--; ++ base[blen] = '\0'; ++ } + /* Prepend a '_'. */ + memmove (base + 1, base, blen + 1); + base[0] = '_'; diff --git a/ftp/curl/files/patch-tests::libtest::lib505.c b/ftp/curl/files/patch-tests::libtest::lib505.c new file mode 100644 index 000000000000..819e59c9243c --- /dev/null +++ b/ftp/curl/files/patch-tests::libtest::lib505.c @@ -0,0 +1,49 @@ +diff -urN -urN -x .svn ../../vendor/curl/tests/libtest/lib505.c ./tests/libtest/lib505.c +--- ../../vendor/curl/tests/libtest/lib505.c 2008-03-20 15:26:14.000000000 +0200 ++++ ./tests/libtest/lib505.c 2008-04-02 13:21:07.000000000 +0300 +@@ -54,12 +54,24 @@ + return -1; + } + ++ /* get a FILE * of the same file, could also be made with ++ fdopen() from the previous descriptor, but hey this is just ++ an example! */ ++ hd_src = fopen(libtest_arg2, "rb"); ++ if(NULL == hd_src) { ++ error = ERRNO; ++ fprintf(stderr, "fopen() failed with error: %d %s\n", ++ error, strerror(error)); ++ fprintf(stderr, "Error opening file: %s\n", libtest_arg2); ++ return -2; /* if this happens things are major weird */ ++ } ++ + /* get the file size of the local file */ +- hd = stat(libtest_arg2, &file_info); ++ hd = fstat(fileno(hd_src), &file_info); + if(hd == -1) { + /* can't open file, bail out */ + error = ERRNO; +- fprintf(stderr, "stat() failed with error: %d %s\n", ++ fprintf(stderr, "fstat() failed with error: %d %s\n", + error, strerror(error)); + fprintf(stderr, "WARNING: cannot open file %s\n", libtest_arg2); + return -1; +@@ -70,18 +82,6 @@ + return -4; + } + +- /* get a FILE * of the same file, could also be made with +- fdopen() from the previous descriptor, but hey this is just +- an example! */ +- hd_src = fopen(libtest_arg2, "rb"); +- if(NULL == hd_src) { +- error = ERRNO; +- fprintf(stderr, "fopen() failed with error: %d %s\n", +- error, strerror(error)); +- fprintf(stderr, "Error opening file: %s\n", libtest_arg2); +- return -2; /* if this happens things are major weird */ +- } +- + if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + fclose(hd_src); diff --git a/ftp/curl/files/patch-tests::libtest::lib541.c b/ftp/curl/files/patch-tests::libtest::lib541.c new file mode 100644 index 000000000000..677c50fe76c3 --- /dev/null +++ b/ftp/curl/files/patch-tests::libtest::lib541.c @@ -0,0 +1,49 @@ +diff -urN -urN -x .svn ../../vendor/curl/tests/libtest/lib541.c ./tests/libtest/lib541.c +--- ../../vendor/curl/tests/libtest/lib541.c 2008-03-20 15:26:14.000000000 +0200 ++++ ./tests/libtest/lib541.c 2008-04-02 13:21:49.000000000 +0300 +@@ -46,12 +46,24 @@ + return -1; + } + ++ /* get a FILE * of the same file, could also be made with ++ fdopen() from the previous descriptor, but hey this is just ++ an example! */ ++ hd_src = fopen(libtest_arg2, "rb"); ++ if(NULL == hd_src) { ++ error = ERRNO; ++ fprintf(stderr, "fopen() failed with error: %d %s\n", ++ error, strerror(error)); ++ fprintf(stderr, "Error opening file: %s\n", libtest_arg2); ++ return -2; /* if this happens things are major weird */ ++ } ++ + /* get the file size of the local file */ +- hd = stat(libtest_arg2, &file_info); ++ hd = fstat(fileno(hd_src), &file_info); + if(hd == -1) { + /* can't open file, bail out */ + error = ERRNO; +- fprintf(stderr, "stat() failed with error: %d %s\n", ++ fprintf(stderr, "fstat() failed with error: %d %s\n", + error, strerror(error)); + fprintf(stderr, "WARNING: cannot open file %s\n", libtest_arg2); + return -1; +@@ -62,18 +74,6 @@ + return -4; + } + +- /* get a FILE * of the same file, could also be made with +- fdopen() from the previous descriptor, but hey this is just +- an example! */ +- hd_src = fopen(libtest_arg2, "rb"); +- if(NULL == hd_src) { +- error = ERRNO; +- fprintf(stderr, "fopen() failed with error: %d %s\n", +- error, strerror(error)); +- fprintf(stderr, "Error opening file: %s\n", libtest_arg2); +- return -2; /* if this happens things are major weird */ +- } +- + if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + fclose(hd_src); diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist index 22223f3b8f9b..1a76a6c81e27 100644 --- a/ftp/curl/pkg-plist +++ b/ftp/curl/pkg-plist @@ -40,49 +40,8 @@ libdata/pkgconfig/libcurl.pc %%PORTDOCS%%%%DOCSDIR%%/curl-config.pdf %%PORTDOCS%%%%DOCSDIR%%/curl.html %%PORTDOCS%%%%DOCSDIR%%/curl.pdf -%%PORTDOCS%%%%DOCSDIR%%/examples/10-at-a-time.c -%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.example -%%PORTDOCS%%%%DOCSDIR%%/examples/README -%%PORTDOCS%%%%DOCSDIR%%/examples/anyauthput.c -%%PORTDOCS%%%%DOCSDIR%%/examples/cacertinmem.c -%%PORTDOCS%%%%DOCSDIR%%/examples/cookie_interface.c -%%PORTDOCS%%%%DOCSDIR%%/examples/curlgtk.c -%%PORTDOCS%%%%DOCSDIR%%/examples/curlx.c -%%PORTDOCS%%%%DOCSDIR%%/examples/debug.c -%%PORTDOCS%%%%DOCSDIR%%/examples/fileupload.c -%%PORTDOCS%%%%DOCSDIR%%/examples/fopen.c -%%PORTDOCS%%%%DOCSDIR%%/examples/ftp3rdparty.c -%%PORTDOCS%%%%DOCSDIR%%/examples/ftpget.c -%%PORTDOCS%%%%DOCSDIR%%/examples/ftpgetresp.c -%%PORTDOCS%%%%DOCSDIR%%/examples/ftpupload.c -%%PORTDOCS%%%%DOCSDIR%%/examples/ftpuploadresume.c -%%PORTDOCS%%%%DOCSDIR%%/examples/getinfo.c -%%PORTDOCS%%%%DOCSDIR%%/examples/getinmemory.c -%%PORTDOCS%%%%DOCSDIR%%/examples/ghiper.c -%%PORTDOCS%%%%DOCSDIR%%/examples/hiperfifo.c -%%PORTDOCS%%%%DOCSDIR%%/examples/htmltidy.c -%%PORTDOCS%%%%DOCSDIR%%/examples/htmltitle.cc -%%PORTDOCS%%%%DOCSDIR%%/examples/http-post.c -%%PORTDOCS%%%%DOCSDIR%%/examples/httpput.c -%%PORTDOCS%%%%DOCSDIR%%/examples/https.c -%%PORTDOCS%%%%DOCSDIR%%/examples/makefile.dj -%%PORTDOCS%%%%DOCSDIR%%/examples/multi-app.c -%%PORTDOCS%%%%DOCSDIR%%/examples/multi-debugcallback.c -%%PORTDOCS%%%%DOCSDIR%%/examples/multi-double.c -%%PORTDOCS%%%%DOCSDIR%%/examples/multi-post.c -%%PORTDOCS%%%%DOCSDIR%%/examples/multi-single.c -%%PORTDOCS%%%%DOCSDIR%%/examples/multithread.c -%%PORTDOCS%%%%DOCSDIR%%/examples/opensslthreadlock.c -%%PORTDOCS%%%%DOCSDIR%%/examples/persistant.c -%%PORTDOCS%%%%DOCSDIR%%/examples/post-callback.c -%%PORTDOCS%%%%DOCSDIR%%/examples/postit2.c -%%PORTDOCS%%%%DOCSDIR%%/examples/sampleconv.c -%%PORTDOCS%%%%DOCSDIR%%/examples/sepheaders.c -%%PORTDOCS%%%%DOCSDIR%%/examples/simple.c -%%PORTDOCS%%%%DOCSDIR%%/examples/simplepost.c -%%PORTDOCS%%%%DOCSDIR%%/examples/simplessl.c -%%PORTDOCS%%%%DOCSDIR%%/examples/synctime.c %%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.html %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.pdf %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html @@ -93,6 +52,8 @@ libdata/pkgconfig/libcurl.pc %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.html %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.pdf +%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.html +%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.pdf %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.html %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.pdf %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.html @@ -184,5 +145,46 @@ libdata/pkgconfig/libcurl.pc %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%%/libcurl -%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%%%EXAMPLESDIR%%/10-at-a-time.c +%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.example +%%PORTDOCS%%%%EXAMPLESDIR%%/README +%%PORTDOCS%%%%EXAMPLESDIR%%/anyauthput.c +%%PORTDOCS%%%%EXAMPLESDIR%%/cacertinmem.c +%%PORTDOCS%%%%EXAMPLESDIR%%/cookie_interface.c +%%PORTDOCS%%%%EXAMPLESDIR%%/curlgtk.c +%%PORTDOCS%%%%EXAMPLESDIR%%/curlx.c +%%PORTDOCS%%%%EXAMPLESDIR%%/debug.c +%%PORTDOCS%%%%EXAMPLESDIR%%/fileupload.c +%%PORTDOCS%%%%EXAMPLESDIR%%/fopen.c +%%PORTDOCS%%%%EXAMPLESDIR%%/ftpget.c +%%PORTDOCS%%%%EXAMPLESDIR%%/ftpgetresp.c +%%PORTDOCS%%%%EXAMPLESDIR%%/ftpupload.c +%%PORTDOCS%%%%EXAMPLESDIR%%/ftpuploadresume.c +%%PORTDOCS%%%%EXAMPLESDIR%%/getinfo.c +%%PORTDOCS%%%%EXAMPLESDIR%%/getinmemory.c +%%PORTDOCS%%%%EXAMPLESDIR%%/ghiper.c +%%PORTDOCS%%%%EXAMPLESDIR%%/hiperfifo.c +%%PORTDOCS%%%%EXAMPLESDIR%%/htmltidy.c +%%PORTDOCS%%%%EXAMPLESDIR%%/htmltitle.cc +%%PORTDOCS%%%%EXAMPLESDIR%%/http-post.c +%%PORTDOCS%%%%EXAMPLESDIR%%/httpput.c +%%PORTDOCS%%%%EXAMPLESDIR%%/https.c +%%PORTDOCS%%%%EXAMPLESDIR%%/makefile.dj +%%PORTDOCS%%%%EXAMPLESDIR%%/multi-app.c +%%PORTDOCS%%%%EXAMPLESDIR%%/multi-debugcallback.c +%%PORTDOCS%%%%EXAMPLESDIR%%/multi-double.c +%%PORTDOCS%%%%EXAMPLESDIR%%/multi-post.c +%%PORTDOCS%%%%EXAMPLESDIR%%/multi-single.c +%%PORTDOCS%%%%EXAMPLESDIR%%/multithread.c +%%PORTDOCS%%%%EXAMPLESDIR%%/opensslthreadlock.c +%%PORTDOCS%%%%EXAMPLESDIR%%/persistant.c +%%PORTDOCS%%%%EXAMPLESDIR%%/post-callback.c +%%PORTDOCS%%%%EXAMPLESDIR%%/postit2.c +%%PORTDOCS%%%%EXAMPLESDIR%%/sampleconv.c +%%PORTDOCS%%%%EXAMPLESDIR%%/sepheaders.c +%%PORTDOCS%%%%EXAMPLESDIR%%/simple.c +%%PORTDOCS%%%%EXAMPLESDIR%%/simplepost.c +%%PORTDOCS%%%%EXAMPLESDIR%%/simplessl.c +%%PORTDOCS%%%%EXAMPLESDIR%%/synctime.c +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% |