Index: branches/2017Q2/ftp/curl/Makefile =================================================================== --- branches/2017Q2/ftp/curl/Makefile (revision 439062) +++ branches/2017Q2/ftp/curl/Makefile (revision 439063) @@ -1,164 +1,163 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.53.1 -PORTREVISION= 1 +PORTVERSION= 7.54.0 CATEGORIES= ftp net www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 METALINK PROXY PSL RTMP SMB TLS_SRP OPTIONS_RADIO= RESOLV SSL OPTIONS_SINGLE= GSSAPI OPTIONS_RADIO_RESOLV= CARES THREADED_RESOLVER OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL WOLFSSL OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP CA_BUNDLE_DESC= Install CA bundle for OpenSSL CA_BUNDLE_IMPLIES= OPENSSL COOKIES_DESC= Cookies support CURL_DEBUG_DESC= cURL debug memory tracking LDAPS_IMPLIES= LDAP LIBSSH2_DESC= SCP/SFTP support via libssh2 LIBSSH2_IMPLIES= OPENSSL RESOLV_DESC= DNS resolving options SMB_DESC= SMB/CIFS support THREADED_RESOLVER_DESC= Threaded DNS resolver TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support CONFIGURE_ARGS= --disable-werror \ --enable-imap --enable-pop3 --enable-rtsp --enable-smtp \ --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \ --without-axtls CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func_SSLv2_client_method=no GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= test USE_LDCONFIG= yes USE_PERL5= build USES= cpe gmake libtool localbase pathfix perl5 shebangfix tar:lzma PORTDOCS= * PORTEXAMPLES= * CPE_VENDOR= haxx DOCS= BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUTE.md FAQ \ FEATURES HISTORY.md HTTP-COOKIES.md HTTP2.md INSTALL \ INTERNALS.md KNOWN_BUGS LICENSE-MIXING.md MAIL-ETIQUETTE \ MANUAL RELEASE-PROCEDURE RESOURCES ROADMAP.md SECURITY.md \ SSL-PROBLEMS.md SSLCERTS.md THANKS TODO TheArtOfHttpScripting \ VERSIONS SHEBANG_FILES= */*.pl CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle CA_BUNDLE_CONFIGURE_ON= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss CARES_CONFIGURE_ENABLE= ares CARES_LIB_DEPENDS= libcares.so:dns/c-ares COOKIES_CONFIGURE_ENABLE= cookies CURL_DEBUG_CONFIGURE_ENABLE= curldebug DEBUG_CONFIGURE_ENABLE= debug GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS} GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_BASE_LIBS= ${GSSAPILIBS} GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS} GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_HEIMDAL_LIBS= ${GSSAPILIBS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_CPPFLAGS= ${GSSAPICPPFLAGS} GSSAPI_MIT_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_MIT_LIBS= ${GSSAPILIBS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi HTTP2_CONFIGURE_WITH= nghttp2 HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 HTTP2_USES= pkgconfig IDN_CONFIGURE_WITH= libidn2 IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_ENABLE= ipv6 LDAP_CONFIGURE_ENABLE= ldap LDAP_USE= OPENLDAP=yes LDAPS_CONFIGURE_ENABLE= ldaps LIBSSH2_CONFIGURE_WITH= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 METALINK_CONFIGURE_WITH=libmetalink METALINK_LIB_DEPENDS= libmetalink.so:misc/libmetalink METALINK_LIBS= -lcrypto NSS_CONFIGURE_WITH= nss NSS_LIB_DEPENDS= libnss3.so:security/nss NSS_USES= pkgconfig OPENSSL_CONFIGURE_OFF= --without-ssl OPENSSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} OPENSSL_USES= ssl POLARSSL_CONFIGURE_WITH=polarssl POLARSSL_LIB_DEPENDS= libmbedtls.so.9:security/polarssl13 PROXY_CONFIGURE_ENABLE= proxy PSL_CONFIGURE_WITH= libpsl PSL_LIB_DEPENDS= libpsl.so:dns/libpsl RTMP_CONFIGURE_WITH= librtmp RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp RTMP_USES= pkgconfig SMB_CONFIGURE_ENABLE= smb THREADED_RESOLVER_CONFIGURE_ENABLE= pthreads threaded-resolver TLS_SRP_CONFIGURE_ENABLE= tls-srp WOLFSSL_CONFIGURE_WITH= cyassl WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl .include .if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP} IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS .endif .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL} && !${PORT_OPTIONS:MWOLFSSL} IGNORE= only supports LDAPS with SSL .endif .if ${PORT_OPTIONS:MTLS_SRP} && ${SSL_DEFAULT:Mlibressl*} IGNORE= unsupported TLS-SRP in LibreSSL .endif post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /cd docs &&/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|include |include |' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h post-install: ${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/ cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/ pre-test-PROXY-off: @${ECHO_MSG} "******************************************" @${ECHO_MSG} "* You have disabled curl proxy support. *" @${ECHO_MSG} "* Some tests SHALL FAIL! *" @${ECHO_MSG} "* This is being addressed. *" @${ECHO_MSG} "******************************************" .include Index: branches/2017Q2/ftp/curl/distinfo =================================================================== --- branches/2017Q2/ftp/curl/distinfo (revision 439062) +++ branches/2017Q2/ftp/curl/distinfo (revision 439063) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488004749 -SHA256 (curl-7.53.1.tar.lzma) = 4b124ff5984f2b537790a8f50dbf3d44da89e57d0505ba567128535a2426f5e2 -SIZE (curl-7.53.1.tar.lzma) = 2076935 +TIMESTAMP = 1492694896 +SHA256 (curl-7.54.0.tar.lzma) = cd6aa6039f13e0b06e0a93e1b93754f6dc07f444812bb6c32be75a8f28c4070a +SIZE (curl-7.54.0.tar.lzma) = 2084912 Index: branches/2017Q2/ftp/curl/files/patch-CVE-2017-7407 =================================================================== --- branches/2017Q2/ftp/curl/files/patch-CVE-2017-7407 (revision 439062) +++ branches/2017Q2/ftp/curl/files/patch-CVE-2017-7407 (nonexistent) @@ -1,164 +0,0 @@ -From 6019f1795b4e3b72507b84b0e02dc8c32024f562 Mon Sep 17 00:00:00 2001 -From: Dan Fandrich -Date: Sat, 11 Mar 2017 10:59:34 +0100 -Subject: [PATCH] CVE-2017-7407: fixed - -Bug: https://curl.haxx.se/docs/adv_20170403.html - -Reported-by: Brian Carpenter ---- src/tool_writeout.c.orig 2017-01-13 09:55:20 UTC -+++ src/tool_writeout.c -@@ -5,7 +5,7 @@ - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. -+ * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms -@@ -113,7 +113,7 @@ void ourWriteOut(CURL *curl, struct OutS - double doubleinfo; - - while(ptr && *ptr) { -- if('%' == *ptr) { -+ if('%' == *ptr && ptr[1]) { - if('%' == ptr[1]) { - /* an escaped %-letter */ - fputc('%', stream); -@@ -341,7 +341,7 @@ void ourWriteOut(CURL *curl, struct OutS - } - } - } -- else if('\\' == *ptr) { -+ else if('\\' == *ptr && ptr[1]) { - switch(ptr[1]) { - case 'r': - fputc('\r', stream); - src/tool_writeout.c | 6 +++--- - tests/data/Makefile.inc | 2 +- - tests/data/test1440 | 31 +++++++++++++++++++++++++++++++ - tests/data/test1441 | 31 +++++++++++++++++++++++++++++++ - tests/data/test1442 | 35 +++++++++++++++++++++++++++++++++++ - 5 files changed, 101 insertions(+), 4 deletions(-) - create mode 100644 tests/data/test1440 - create mode 100644 tests/data/test1441 - create mode 100644 tests/data/test1442 - ---- tests/data/Makefile.inc.orig 2017-02-21 07:09:13 UTC -+++ tests/data/Makefile.inc -@@ -151,7 +151,7 @@ test1408 test1409 test1410 test1411 test - test1416 test1417 test1418 test1419 test1420 test1421 test1422 test1423 \ - test1424 \ - test1428 test1429 test1430 test1431 test1432 test1433 test1434 test1435 \ --test1436 test1437 test1438 test1439 \ -+test1436 test1437 test1438 test1439 test1440 test1441 test1442 \ - \ - test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ - test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ ---- tests/data/test1440.orig 2017-04-05 17:06:44 UTC -+++ tests/data/test1440 -@@ -0,0 +1,31 @@ -+ -+ -+ -+--write-out -+ -+ -+# Server-side -+ -+ -+ -+# Client-side -+ -+ -+file -+ -+ -+ -+Check --write-out with trailing %{ -+ -+ -+file://localhost/%PWD/log/ --write-out '%{' -+ -+ -+ -+# Verify data -+ -+ -+%{ -+ -+ -+ ---- tests/data/test1441.orig 2017-04-05 17:06:44 UTC -+++ tests/data/test1441 -@@ -0,0 +1,31 @@ -+ -+ -+ -+--write-out -+ -+ -+# Server-side -+ -+ -+ -+# Client-side -+ -+ -+file -+ -+ -+ -+Check --write-out with trailing % -+ -+ -+file://localhost/%PWD/log/ --write-out '%' -+ -+ -+ -+# Verify data -+ -+ -+% -+ -+ -+ ---- tests/data/test1442.orig 2017-04-05 17:06:44 UTC -+++ tests/data/test1442 -@@ -0,0 +1,35 @@ -+ -+ -+ -+--write-out -+FILE -+ -+ -+# Server-side -+ -+ -+ -+# Client-side -+ -+ -+file -+ -+ -+ -+Check --write-out with trailing \ -+ -+ -+file://localhost/%PWD/log/non-existent-file.txt --write-out '\' -+ -+ -+ -+# Verify data -+ -+ -+37 -+ -+ -+\ -+ -+ -+ Property changes on: branches/2017Q2/ftp/curl/files/patch-CVE-2017-7407 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/ftp/curl/files/patch-lib-url.c =================================================================== --- branches/2017Q2/ftp/curl/files/patch-lib-url.c (revision 439062) +++ branches/2017Q2/ftp/curl/files/patch-lib-url.c (revision 439063) @@ -1,18 +1,17 @@ Description: Different handling of signals and threads. Forwarded: not-needed Author: Peter Pentchev Last-Update: 2010-12-18 ---- lib/url.c.orig 2015-04-22 05:55:54 UTC +--- lib/url.c.orig 2017-04-18 06:36:20 UTC +++ lib/url.c -@@ -659,6 +659,10 @@ CURLcode Curl_open(struct SessionHandle - data->progress.flags |= PGRS_HIDE; +@@ -671,6 +671,9 @@ CURLcode Curl_open(struct Curl_easy **cu data->state.current_speed = -1; /* init to negative == impossible */ - + data->set.fnmatch = ZERO_NULL; + data->set.maxconnects = DEFAULT_CONNCACHE_SIZE; /* for easy handles */ +#if defined(__FreeBSD_version) + data->set.no_signal = TRUE; /* different handling of signals and threads */ +#endif /* __FreeBSD_version */ -+ - data->wildcard.state = CURLWC_INIT; - data->wildcard.filelist = NULL; - data->set.fnmatch = ZERO_NULL; + + Curl_http2_init_state(&data->state); + } Index: branches/2017Q2/ftp/curl/pkg-plist =================================================================== --- branches/2017Q2/ftp/curl/pkg-plist (revision 439062) +++ branches/2017Q2/ftp/curl/pkg-plist (revision 439063) @@ -1,386 +1,388 @@ bin/curl bin/curl-config include/curl/curl.h include/curl/curlbuild.h include/curl/curlrules.h include/curl/curlver.h include/curl/easy.h include/curl/mprintf.h include/curl/multi.h include/curl/stdcheaders.h +include/curl/system.h include/curl/typecheck-gcc.h lib/libcurl.a lib/libcurl.so lib/libcurl.so.4 lib/libcurl.so.4.4.0 libdata/pkgconfig/libcurl.pc man/man1/curl-config.1.gz man/man1/curl.1.gz man/man3/CURLINFO_ACTIVESOCKET.3.gz man/man3/CURLINFO_APPCONNECT_TIME.3.gz man/man3/CURLINFO_CERTINFO.3.gz man/man3/CURLINFO_CONDITION_UNMET.3.gz man/man3/CURLINFO_CONNECT_TIME.3.gz man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3.gz man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3.gz man/man3/CURLINFO_CONTENT_TYPE.3.gz man/man3/CURLINFO_COOKIELIST.3.gz man/man3/CURLINFO_EFFECTIVE_URL.3.gz man/man3/CURLINFO_FILETIME.3.gz man/man3/CURLINFO_FTP_ENTRY_PATH.3.gz man/man3/CURLINFO_HEADER_SIZE.3.gz man/man3/CURLINFO_HTTPAUTH_AVAIL.3.gz man/man3/CURLINFO_HTTP_CONNECTCODE.3.gz man/man3/CURLINFO_HTTP_VERSION.3.gz man/man3/CURLINFO_LASTSOCKET.3.gz man/man3/CURLINFO_LOCAL_IP.3.gz man/man3/CURLINFO_LOCAL_PORT.3.gz man/man3/CURLINFO_NAMELOOKUP_TIME.3.gz man/man3/CURLINFO_NUM_CONNECTS.3.gz man/man3/CURLINFO_OS_ERRNO.3.gz man/man3/CURLINFO_PRETRANSFER_TIME.3.gz man/man3/CURLINFO_PRIMARY_IP.3.gz man/man3/CURLINFO_PRIMARY_PORT.3.gz man/man3/CURLINFO_PRIVATE.3.gz man/man3/CURLINFO_PROTOCOL.3.gz man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz man/man3/CURLINFO_REDIRECT_COUNT.3.gz man/man3/CURLINFO_REDIRECT_TIME.3.gz man/man3/CURLINFO_REDIRECT_URL.3.gz man/man3/CURLINFO_REQUEST_SIZE.3.gz man/man3/CURLINFO_RESPONSE_CODE.3.gz man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3.gz man/man3/CURLINFO_RTSP_CSEQ_RECV.3.gz man/man3/CURLINFO_RTSP_SERVER_CSEQ.3.gz man/man3/CURLINFO_RTSP_SESSION_ID.3.gz man/man3/CURLINFO_SCHEME.3.gz man/man3/CURLINFO_SIZE_DOWNLOAD.3.gz man/man3/CURLINFO_SIZE_UPLOAD.3.gz man/man3/CURLINFO_SPEED_DOWNLOAD.3.gz man/man3/CURLINFO_SPEED_UPLOAD.3.gz man/man3/CURLINFO_SSL_ENGINES.3.gz man/man3/CURLINFO_SSL_VERIFYRESULT.3.gz man/man3/CURLINFO_STARTTRANSFER_TIME.3.gz man/man3/CURLINFO_TLS_SESSION.3.gz man/man3/CURLINFO_TLS_SSL_PTR.3.gz man/man3/CURLINFO_TOTAL_TIME.3.gz man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz man/man3/CURLMOPT_MAXCONNECTS.3.gz man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3.gz man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3.gz man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3.gz man/man3/CURLMOPT_PIPELINING.3.gz man/man3/CURLMOPT_PIPELINING_SERVER_BL.3.gz man/man3/CURLMOPT_PIPELINING_SITE_BL.3.gz man/man3/CURLMOPT_PUSHDATA.3.gz man/man3/CURLMOPT_PUSHFUNCTION.3.gz man/man3/CURLMOPT_SOCKETDATA.3.gz man/man3/CURLMOPT_SOCKETFUNCTION.3.gz man/man3/CURLMOPT_TIMERDATA.3.gz man/man3/CURLMOPT_TIMERFUNCTION.3.gz man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3.gz man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3.gz man/man3/CURLOPT_ACCEPT_ENCODING.3.gz man/man3/CURLOPT_ADDRESS_SCOPE.3.gz man/man3/CURLOPT_APPEND.3.gz man/man3/CURLOPT_AUTOREFERER.3.gz man/man3/CURLOPT_BUFFERSIZE.3.gz man/man3/CURLOPT_CAINFO.3.gz man/man3/CURLOPT_CAPATH.3.gz man/man3/CURLOPT_CERTINFO.3.gz man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3.gz man/man3/CURLOPT_CHUNK_DATA.3.gz man/man3/CURLOPT_CHUNK_END_FUNCTION.3.gz man/man3/CURLOPT_CLOSESOCKETDATA.3.gz man/man3/CURLOPT_CLOSESOCKETFUNCTION.3.gz man/man3/CURLOPT_CONNECTTIMEOUT.3.gz man/man3/CURLOPT_CONNECTTIMEOUT_MS.3.gz man/man3/CURLOPT_CONNECT_ONLY.3.gz man/man3/CURLOPT_CONNECT_TO.3.gz man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3.gz man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3.gz man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3.gz man/man3/CURLOPT_COOKIE.3.gz man/man3/CURLOPT_COOKIEFILE.3.gz man/man3/CURLOPT_COOKIEJAR.3.gz man/man3/CURLOPT_COOKIELIST.3.gz man/man3/CURLOPT_COOKIESESSION.3.gz man/man3/CURLOPT_COPYPOSTFIELDS.3.gz man/man3/CURLOPT_CRLF.3.gz man/man3/CURLOPT_CRLFILE.3.gz man/man3/CURLOPT_CUSTOMREQUEST.3.gz man/man3/CURLOPT_DEBUGDATA.3.gz man/man3/CURLOPT_DEBUGFUNCTION.3.gz man/man3/CURLOPT_DEFAULT_PROTOCOL.3.gz man/man3/CURLOPT_DIRLISTONLY.3.gz man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3.gz man/man3/CURLOPT_DNS_INTERFACE.3.gz man/man3/CURLOPT_DNS_LOCAL_IP4.3.gz man/man3/CURLOPT_DNS_LOCAL_IP6.3.gz man/man3/CURLOPT_DNS_SERVERS.3.gz man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3.gz man/man3/CURLOPT_EGDSOCKET.3.gz man/man3/CURLOPT_ERRORBUFFER.3.gz man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3.gz man/man3/CURLOPT_FAILONERROR.3.gz man/man3/CURLOPT_FILETIME.3.gz man/man3/CURLOPT_FNMATCH_DATA.3.gz man/man3/CURLOPT_FNMATCH_FUNCTION.3.gz man/man3/CURLOPT_FOLLOWLOCATION.3.gz man/man3/CURLOPT_FORBID_REUSE.3.gz man/man3/CURLOPT_FRESH_CONNECT.3.gz man/man3/CURLOPT_FTPPORT.3.gz man/man3/CURLOPT_FTPSSLAUTH.3.gz man/man3/CURLOPT_FTP_ACCOUNT.3.gz man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3.gz man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3.gz man/man3/CURLOPT_FTP_FILEMETHOD.3.gz man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3.gz man/man3/CURLOPT_FTP_SKIP_PASV_IP.3.gz man/man3/CURLOPT_FTP_SSL_CCC.3.gz man/man3/CURLOPT_FTP_USE_EPRT.3.gz man/man3/CURLOPT_FTP_USE_EPSV.3.gz man/man3/CURLOPT_FTP_USE_PRET.3.gz man/man3/CURLOPT_GSSAPI_DELEGATION.3.gz man/man3/CURLOPT_HEADER.3.gz man/man3/CURLOPT_HEADERDATA.3.gz man/man3/CURLOPT_HEADERFUNCTION.3.gz man/man3/CURLOPT_HEADEROPT.3.gz man/man3/CURLOPT_HTTP200ALIASES.3.gz man/man3/CURLOPT_HTTPAUTH.3.gz man/man3/CURLOPT_HTTPGET.3.gz man/man3/CURLOPT_HTTPHEADER.3.gz man/man3/CURLOPT_HTTPPOST.3.gz man/man3/CURLOPT_HTTPPROXYTUNNEL.3.gz man/man3/CURLOPT_HTTP_CONTENT_DECODING.3.gz man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3.gz man/man3/CURLOPT_HTTP_VERSION.3.gz man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3.gz man/man3/CURLOPT_INFILESIZE.3.gz man/man3/CURLOPT_INFILESIZE_LARGE.3.gz man/man3/CURLOPT_INTERFACE.3.gz man/man3/CURLOPT_INTERLEAVEDATA.3.gz man/man3/CURLOPT_INTERLEAVEFUNCTION.3.gz man/man3/CURLOPT_IOCTLDATA.3.gz man/man3/CURLOPT_IOCTLFUNCTION.3.gz man/man3/CURLOPT_IPRESOLVE.3.gz man/man3/CURLOPT_ISSUERCERT.3.gz man/man3/CURLOPT_KEEP_SENDING_ON_ERROR.3.gz man/man3/CURLOPT_KEYPASSWD.3.gz man/man3/CURLOPT_KRBLEVEL.3.gz man/man3/CURLOPT_LOCALPORT.3.gz man/man3/CURLOPT_LOCALPORTRANGE.3.gz man/man3/CURLOPT_LOGIN_OPTIONS.3.gz man/man3/CURLOPT_LOW_SPEED_LIMIT.3.gz man/man3/CURLOPT_LOW_SPEED_TIME.3.gz man/man3/CURLOPT_MAIL_AUTH.3.gz man/man3/CURLOPT_MAIL_FROM.3.gz man/man3/CURLOPT_MAIL_RCPT.3.gz man/man3/CURLOPT_MAXCONNECTS.3.gz man/man3/CURLOPT_MAXFILESIZE.3.gz man/man3/CURLOPT_MAXFILESIZE_LARGE.3.gz man/man3/CURLOPT_MAXREDIRS.3.gz man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3.gz man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3.gz man/man3/CURLOPT_NETRC.3.gz man/man3/CURLOPT_NETRC_FILE.3.gz man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3.gz man/man3/CURLOPT_NEW_FILE_PERMS.3.gz man/man3/CURLOPT_NOBODY.3.gz man/man3/CURLOPT_NOPROGRESS.3.gz man/man3/CURLOPT_NOPROXY.3.gz man/man3/CURLOPT_NOSIGNAL.3.gz man/man3/CURLOPT_OPENSOCKETDATA.3.gz man/man3/CURLOPT_OPENSOCKETFUNCTION.3.gz man/man3/CURLOPT_PASSWORD.3.gz man/man3/CURLOPT_PATH_AS_IS.3.gz man/man3/CURLOPT_PINNEDPUBLICKEY.3.gz man/man3/CURLOPT_PIPEWAIT.3.gz man/man3/CURLOPT_PORT.3.gz man/man3/CURLOPT_POST.3.gz man/man3/CURLOPT_POSTFIELDS.3.gz man/man3/CURLOPT_POSTFIELDSIZE.3.gz man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3.gz man/man3/CURLOPT_POSTQUOTE.3.gz man/man3/CURLOPT_POSTREDIR.3.gz man/man3/CURLOPT_PREQUOTE.3.gz man/man3/CURLOPT_PRE_PROXY.3.gz man/man3/CURLOPT_PRIVATE.3.gz man/man3/CURLOPT_PROGRESSDATA.3.gz man/man3/CURLOPT_PROGRESSFUNCTION.3.gz man/man3/CURLOPT_PROTOCOLS.3.gz man/man3/CURLOPT_PROXY.3.gz man/man3/CURLOPT_PROXYAUTH.3.gz man/man3/CURLOPT_PROXYHEADER.3.gz man/man3/CURLOPT_PROXYPASSWORD.3.gz man/man3/CURLOPT_PROXYPORT.3.gz man/man3/CURLOPT_PROXYTYPE.3.gz man/man3/CURLOPT_PROXYUSERNAME.3.gz man/man3/CURLOPT_PROXYUSERPWD.3.gz man/man3/CURLOPT_PROXY_CAINFO.3.gz man/man3/CURLOPT_PROXY_CAPATH.3.gz man/man3/CURLOPT_PROXY_CRLFILE.3.gz man/man3/CURLOPT_PROXY_KEYPASSWD.3.gz man/man3/CURLOPT_PROXY_PINNEDPUBLICKEY.3.gz man/man3/CURLOPT_PROXY_SERVICE_NAME.3.gz man/man3/CURLOPT_PROXY_SSLCERT.3.gz man/man3/CURLOPT_PROXY_SSLCERTTYPE.3.gz man/man3/CURLOPT_PROXY_SSLKEY.3.gz man/man3/CURLOPT_PROXY_SSLKEYTYPE.3.gz man/man3/CURLOPT_PROXY_SSLVERSION.3.gz man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3.gz man/man3/CURLOPT_PROXY_SSL_OPTIONS.3.gz man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3.gz man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3.gz man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3.gz man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3.gz man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3.gz man/man3/CURLOPT_PROXY_TRANSFER_MODE.3.gz man/man3/CURLOPT_PUT.3.gz man/man3/CURLOPT_QUOTE.3.gz man/man3/CURLOPT_RANDOM_FILE.3.gz man/man3/CURLOPT_RANGE.3.gz man/man3/CURLOPT_READDATA.3.gz man/man3/CURLOPT_READFUNCTION.3.gz man/man3/CURLOPT_REDIR_PROTOCOLS.3.gz man/man3/CURLOPT_REFERER.3.gz man/man3/CURLOPT_RESOLVE.3.gz man/man3/CURLOPT_RESUME_FROM.3.gz man/man3/CURLOPT_RESUME_FROM_LARGE.3.gz man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3.gz man/man3/CURLOPT_RTSP_REQUEST.3.gz man/man3/CURLOPT_RTSP_SERVER_CSEQ.3.gz man/man3/CURLOPT_RTSP_SESSION_ID.3.gz man/man3/CURLOPT_RTSP_STREAM_URI.3.gz man/man3/CURLOPT_RTSP_TRANSPORT.3.gz man/man3/CURLOPT_SASL_IR.3.gz man/man3/CURLOPT_SEEKDATA.3.gz man/man3/CURLOPT_SEEKFUNCTION.3.gz man/man3/CURLOPT_SERVICE_NAME.3.gz man/man3/CURLOPT_SHARE.3.gz man/man3/CURLOPT_SOCKOPTDATA.3.gz man/man3/CURLOPT_SOCKOPTFUNCTION.3.gz man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3.gz man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3.gz man/man3/CURLOPT_SSH_AUTH_TYPES.3.gz man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3.gz man/man3/CURLOPT_SSH_KEYDATA.3.gz man/man3/CURLOPT_SSH_KEYFUNCTION.3.gz man/man3/CURLOPT_SSH_KNOWNHOSTS.3.gz man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3.gz man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3.gz man/man3/CURLOPT_SSLCERT.3.gz man/man3/CURLOPT_SSLCERTTYPE.3.gz man/man3/CURLOPT_SSLENGINE.3.gz man/man3/CURLOPT_SSLENGINE_DEFAULT.3.gz man/man3/CURLOPT_SSLKEY.3.gz man/man3/CURLOPT_SSLKEYTYPE.3.gz man/man3/CURLOPT_SSLVERSION.3.gz man/man3/CURLOPT_SSL_CIPHER_LIST.3.gz man/man3/CURLOPT_SSL_CTX_DATA.3.gz man/man3/CURLOPT_SSL_CTX_FUNCTION.3.gz man/man3/CURLOPT_SSL_ENABLE_ALPN.3.gz man/man3/CURLOPT_SSL_ENABLE_NPN.3.gz man/man3/CURLOPT_SSL_FALSESTART.3.gz man/man3/CURLOPT_SSL_OPTIONS.3.gz man/man3/CURLOPT_SSL_SESSIONID_CACHE.3.gz man/man3/CURLOPT_SSL_VERIFYHOST.3.gz man/man3/CURLOPT_SSL_VERIFYPEER.3.gz man/man3/CURLOPT_SSL_VERIFYSTATUS.3.gz man/man3/CURLOPT_STDERR.3.gz man/man3/CURLOPT_STREAM_DEPENDS.3.gz man/man3/CURLOPT_STREAM_DEPENDS_E.3.gz man/man3/CURLOPT_STREAM_WEIGHT.3.gz +man/man3/CURLOPT_SUPPRESS_CONNECT_HEADERS.3.gz man/man3/CURLOPT_TCP_FASTOPEN.3.gz man/man3/CURLOPT_TCP_KEEPALIVE.3.gz man/man3/CURLOPT_TCP_KEEPIDLE.3.gz man/man3/CURLOPT_TCP_KEEPINTVL.3.gz man/man3/CURLOPT_TCP_NODELAY.3.gz man/man3/CURLOPT_TELNETOPTIONS.3.gz man/man3/CURLOPT_TFTP_BLKSIZE.3.gz man/man3/CURLOPT_TFTP_NO_OPTIONS.3.gz man/man3/CURLOPT_TIMECONDITION.3.gz man/man3/CURLOPT_TIMEOUT.3.gz man/man3/CURLOPT_TIMEOUT_MS.3.gz man/man3/CURLOPT_TIMEVALUE.3.gz man/man3/CURLOPT_TLSAUTH_PASSWORD.3.gz man/man3/CURLOPT_TLSAUTH_TYPE.3.gz man/man3/CURLOPT_TLSAUTH_USERNAME.3.gz man/man3/CURLOPT_TRANSFERTEXT.3.gz man/man3/CURLOPT_TRANSFER_ENCODING.3.gz man/man3/CURLOPT_UNIX_SOCKET_PATH.3.gz man/man3/CURLOPT_UNRESTRICTED_AUTH.3.gz man/man3/CURLOPT_UPLOAD.3.gz man/man3/CURLOPT_URL.3.gz man/man3/CURLOPT_USERAGENT.3.gz man/man3/CURLOPT_USERNAME.3.gz man/man3/CURLOPT_USERPWD.3.gz man/man3/CURLOPT_USE_SSL.3.gz man/man3/CURLOPT_VERBOSE.3.gz man/man3/CURLOPT_WILDCARDMATCH.3.gz man/man3/CURLOPT_WRITEDATA.3.gz man/man3/CURLOPT_WRITEFUNCTION.3.gz man/man3/CURLOPT_XFERINFODATA.3.gz man/man3/CURLOPT_XFERINFOFUNCTION.3.gz man/man3/CURLOPT_XOAUTH2_BEARER.3.gz man/man3/curl_easy_cleanup.3.gz man/man3/curl_easy_duphandle.3.gz man/man3/curl_easy_escape.3.gz man/man3/curl_easy_getinfo.3.gz man/man3/curl_easy_init.3.gz man/man3/curl_easy_pause.3.gz man/man3/curl_easy_perform.3.gz man/man3/curl_easy_recv.3.gz man/man3/curl_easy_reset.3.gz man/man3/curl_easy_send.3.gz man/man3/curl_easy_setopt.3.gz man/man3/curl_easy_strerror.3.gz man/man3/curl_easy_unescape.3.gz man/man3/curl_escape.3.gz man/man3/curl_formadd.3.gz man/man3/curl_formfree.3.gz man/man3/curl_formget.3.gz man/man3/curl_free.3.gz man/man3/curl_getdate.3.gz man/man3/curl_getenv.3.gz man/man3/curl_global_cleanup.3.gz man/man3/curl_global_init.3.gz man/man3/curl_global_init_mem.3.gz man/man3/curl_mprintf.3.gz man/man3/curl_multi_add_handle.3.gz man/man3/curl_multi_assign.3.gz man/man3/curl_multi_cleanup.3.gz man/man3/curl_multi_fdset.3.gz man/man3/curl_multi_info_read.3.gz man/man3/curl_multi_init.3.gz man/man3/curl_multi_perform.3.gz man/man3/curl_multi_remove_handle.3.gz man/man3/curl_multi_setopt.3.gz man/man3/curl_multi_socket.3.gz man/man3/curl_multi_socket_action.3.gz man/man3/curl_multi_socket_all.3.gz man/man3/curl_multi_strerror.3.gz man/man3/curl_multi_timeout.3.gz man/man3/curl_multi_wait.3.gz man/man3/curl_share_cleanup.3.gz man/man3/curl_share_init.3.gz man/man3/curl_share_setopt.3.gz man/man3/curl_share_strerror.3.gz man/man3/curl_slist_append.3.gz man/man3/curl_slist_free_all.3.gz man/man3/curl_strequal.3.gz man/man3/curl_unescape.3.gz man/man3/curl_version.3.gz man/man3/curl_version_info.3.gz man/man3/libcurl-easy.3.gz man/man3/libcurl-errors.3.gz man/man3/libcurl-multi.3.gz man/man3/libcurl-share.3.gz man/man3/libcurl-symbols.3.gz man/man3/libcurl-thread.3.gz man/man3/libcurl-tutorial.3.gz man/man3/libcurl.3.gz share/aclocal/libcurl.m4 share/zsh/site-functions/_curl Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 439062) +++ branches/2017Q2 (revision 439063) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r438953