Commit 8ee2576b authored by Pierre Joye's avatar Pierre Joye
Browse files

Merge branch 'master' of github.com:bagder/curl

parents 575f3c30 cf9fb08c
Loading
Loading
Loading
Loading
+9 −105
Original line number Diff line number Diff line
Curl and libcurl 7.24.0
Curl and libcurl 7.24.1

 Public curl releases:         127
 Command line options:         149
@@ -7,65 +7,17 @@ Curl and libcurl 7.24.0
 Known libcurl bindings:       39
 Contributors:                 907

This release includes the following security fixes:

 o 

This release includes the following changes:

 o CURLOPT_QUOTE: SFTP supports the '*'-prefix now [24]
 o CURLOPT_DNS_SERVERS: set name servers if possible [23]
 o Add support for using nettle instead of gcrypt as gnutls backend [22]
 o CURLOPT_INTERFACE: avoid resolving interfaces names with magic prefixes [21]
 o Added CURLOPT_ACCEPTTIMEOUT_MS [30]
 o configure: add symbols versioning option --enable-versioned-symbols [31]
 o 

This release includes the following bugfixes:

 o SSL session share: move the age counter to the share object [1]
 o -J -O: use -O name if no Content-Disposition header comes! [2]
 o protocol_connect: show verbose connect and set connect time [3]
 o query-part: ignore the URI part for given protocols [4]
 o gnutls: only translate winsock errors for old versions [5]
 o POP3: fix end of body detection [6]
 o POP3: detect when LIST returns no mails
 o TELNET: improved treatment of options [7]
 o configure: add support for pkg-config detection of libidn [8]
 o CyaSSL 2.0+ library initialization adjustment [9]
 o multi interface: only use non-NULL socker function pointer
 o call opensocket callback properly for active FTP
 o don't call close socket callback for sockets created with accept() [10]
 o differentiate better between host/proxy errors [11]
 o SSH: fix CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 and --hostpubmd5 [12]
 o multi: handle timeouts on DNS servers by checking for new sockets [13]
 o CURLOPT_DNS_SERVERS: fix return code
 o POP3: fixed escaped dot not being stripped out [14]
 o OpenSSL: check for the SSLv2 function in configure [15]
 o MakefileBuild: fix the static build [16]
 o create_conn: don't switch to HTTP protocol if tunneling is enabled [17]
 o multi interface: fix block when CONNECT_ONLY option is used [18]
 o Fix connection reuse for TLS upgraded connections [19]
 o multiple file upload with -F and custom type [20]
 o multi interface: active FTP connections are no longer blocking [25]
 o Android build fix [26]
 o timer: restore PRETRANSFER timing [27]
 o libcurl.m4: Fix quoting arguments of AC_LANG_PROGRAM [28]
 o appconnect time fixed for non-blocking connect ssl backends [29]
 o do not include SSL handshake into time spent waiting for 100-continue [32]
 o handle dns cache case insensitive
 o use new host name casing for subsequent HTTP requests [33]
 o CURLOPT_RESOLVE: avoid adding already present host names
 o SFTP mkdir: use correct permission [34]
 o resolve: don't leak pre-populated dns entries [35]
 o --retry: Retry transfers on timeout and DNS errors
 o negotiate with SSPI backend: use the correct buffer for input [36]
 o SFTP dir: increase buffer size counter to avoid cut off file names [37]
 o TFTP: fix resending (again) [38]
 o c-ares: don't include getaddrinfo-using code [39]
 o FTP: CURLE_PARTIAL_FILE will not close the control channel [40]
 o win32-threaded-resolver: stop using a dummy socket
 o OpenSSL: remove reference to openssl internal struct [41]
 o OpenSSL: SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG option no longer enabled
 o OpenSSL: fix PKCS#12 certificate parsing related memory leak
 o OpenLDAP: fix LDAP connection phase memory leak [42]
 o Telnet: Use correct file descriptor for telnet upload
 o Telnet: Remove bogus optimisation of telnet upload
 o 

This release includes the following known bugs:

@@ -74,58 +26,10 @@ This release includes the following known bugs:
This release would not have looked like this without help, code, reports and
advice from friends like these:

 Alejandro Alvarez Ayllon, Jason Glasgow, Jonas Schnelli, Mark Brand,
 Martin Storsjo, Yang Tse, Laurent Rabret, Jason Glasgow, Steve Holme,
 Reza Arbab, Jason Liu, Gokhan Sengun, Rob Ward, Dan Fandrich,
 Naveen Chandran, Ward Willats, Vladimir Grishchenko, Colin Hogben,
 Alessandro Ghedini, Cedric Deltheil, Toni Moreno, Bernhard Reutner-Fischer,
 Sven Wegener, Alex Vinnik, Kamil Dudka, Mamoru Tasaka, Patrice Guerin,
 Armel Asselin, Arthur Murray, Steve H Truong, Peter Sylvester,
 Johannes Bauer
 

        Thanks! (and sorry if I forgot to mention someone)

References to bug reports and discussions on issues:

 [1] = http://curl.haxx.se/mail/lib-2011-11/0116.html
 [2] = http://curl.haxx.se/mail/archive-2011-11/0030.htm
 [3] = http://curl.haxx.se/mail/archive-2011-11/0035.html
 [4] = http://curl.haxx.se/mail/lib-2011-11/0218.html
 [5] = http://curl.haxx.se/mail/lib-2011-11/0267.html
 [6] = http://curl.haxx.se/mail/lib-2011-11/0279.html
 [7] = http://curl.haxx.se/mail/lib-2011-11/0247.html
 [8] = http://curl.haxx.se/mail/lib-2011-11/0294.html
 [9] = http://curl.haxx.se/bug/view.cgi?id=3442068
 [10] = http://curl.haxx.se/mail/lib-2011-12/0018.html
 [11] = http://curl.haxx.se/mail/archive-2011-12/0010.html
 [12] = http://curl.haxx.se/bug/view.cgi?id=3451592
 [13] = http://curl.haxx.se/mail/lib-2011-11/0371.html
 [14] = http://curl.haxx.se/mail/lib-2011-11/0368.html
 [15] = http://curl.haxx.se/mail/archive-2011-12/0012.html
 [16] = http://curl.haxx.se/mail/lib-2011-12/0063.html
 [17] = http://curl.haxx.se/mail/lib-2011-12/0010.html
 [18] = http://curl.haxx.se/mail/lib-2011-12/0070.html
 [19] = http://curl.haxx.se/mail/lib-2011-11/0022.html
 [20] = http://curl.haxx.se/mail/lib-2011-12/0121.html
 [21] = http://curl.haxx.se/mail/lib-2011-12/0107.html
 [22] = http://curl.haxx.se/mail/lib-2011-11/0164.html
 [23] = http://curl.haxx.se/mail/lib-2011-11/0067.html
 [24] = http://curl.haxx.se/mail/lib-2011-11/0205.html
 [25] = http://curl.haxx.se/mail/lib-2011-12/0179.html
 [26] = http://curl.haxx.se/mail/lib-2011-12/0215.html
 [27] = http://curl.haxx.se/mail/archive-2011-12/0022.html
 [28] = http://curl.haxx.se/mail/lib-2011-12/0218.html
 [29] = http://curl.haxx.se/mail/lib-2011-12/0211.html
 [30] = http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTACCEPTTIMOUTMS
 [31] = http://curl.haxx.se/mail/lib-2011-12/0133.html
 [32] = https://bugzilla.redhat.com/767490
 [33] = http://curl.haxx.se/mail/lib-2011-12/0314.html
 [34] = http://curl.haxx.se/mail/lib-2011-12/0249.html
 [35] = http://curl.haxx.se/bug/view.cgi?id=3463121
 [36] = http://curl.haxx.se/bug/view.cgi?id=3466497
 [37] = http://curl.haxx.se/mail/lib-2011-12/0249.html
 [38] = http://curl.haxx.se/mail/lib-2012-01/0146.html
 [39] = http://curl.haxx.se/mail/lib-2012-01/0160.html
 [40] = http://curl.haxx.se/mail/lib-2012-01/0096.html
 [41] = http://curl.haxx.se/mail/lib-2012-01/0049.html
 [42] = http://curl.haxx.se/bug/view.cgi?id=3474308
 
+6 −2
Original line number Diff line number Diff line
To be addressed in 7.22.1
To be addressed in 7.24.1
=========================

295 - "RTSP Authentication (#22)" https://github.com/bagder/curl/pull/22
@@ -8,4 +8,8 @@ To be addressed in 7.22.1
300 - "Polling on stray socket on sequential transfers." Andrew S
      http://curl.haxx.se/mail/lib-2011-07/0053.html

308 -
308 - Revisit option --enable-threaded-resolver at least allow selection among
      pthreads and Windows threads when building a Windows target.
      http://curl.haxx.se/mail/lib-2012-01/0291.html

309 - 
+21 −0
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ Albert Choy
Ale Vesely
Alejandro Alvarez
Aleksandar Milivojevic
Alessandro Ghedini
Alessandro Vesely
Alex Bligh
Alex Fishman
Alex Neblett
Alex Suykov
Alex Vinnik
Alex aka WindEagle
Alexander Beedie
Alexander Kourakos
@@ -74,6 +76,7 @@ Anton Kalmykov
Arkadiusz Miskiewicz
Armel Asselin
Arnaud Ebalard
Arthur Murray
Arve Knudsen
Ates Goral
Augustus Saunders
@@ -91,6 +94,7 @@ Ben Winslow
Benbuck Nason
Benjamin Gerard
Bernard Leak
Bernhard Reutner-Fischer
Bertrand Demiddelaer
Bill Egert
Bill Hoffman
@@ -105,6 +109,7 @@ Brad Burdick
Brad Hards
Brad King
Bradford Bruce
Brandon Wang
Brendan Jurd
Brent Beardsley
Brian Akins
@@ -121,6 +126,7 @@ Camille Moncelier
Caolan McNamara
Carsten Lange
Casey O'Donnell
Cedric Deltheil
Chad Monroe
Charles Kerr
Chih-Chung Chang
@@ -133,6 +139,7 @@ Chris Gaukroger
Chris Maltby
Chris Mumford
Chris Smowton
Christian Grothoff
Christian Hagele
Christian Krause
Christian Kurz
@@ -382,6 +389,8 @@ Jan Kunder
Jan Van Boghout
Jared Lundell
Jari Sundell
Jason Glasgow
Jason Liu
Jason McDonald
Jason S. Priebe
Jay Austin
@@ -418,6 +427,7 @@ Jofell Gallardo
Johan Anderson
Johan Nilsson
Johan van Selst
Johannes Bauer
John Bradshaw
John Crow
John Dennis
@@ -437,6 +447,7 @@ Jon Sargeant
Jon Travis
Jon Turner
Jonas Forsman
Jonas Schnelli
Jonatan Lander
Jonathan Hseu
Jongki Suwandi
@@ -524,6 +535,7 @@ Luke Call
Luong Dinh Dung
Maciej Karpiuk
Maciej W. Rozycki
Mamoru Tasaka
Mandy Wu
Manfred Schwarb
Manuel Massing
@@ -614,6 +626,7 @@ Moonesamy
Nathan Coulter
Nathan O'Sullivan
Nathanael Nerode
Naveen Chandran
Naveen Noel
Neil Dunbar
Neil Spring
@@ -631,6 +644,7 @@ Nikita Schmidt
Nikitinskit Dmitriy
Niklas Angebrand
Nikolai Kondrashov
Nikos Mavrogiannopoulos
Ning Dong
Nir Soffer
Nis Jorgensen
@@ -647,6 +661,7 @@ Paolo Piacentini
Pascal Terjan
Pasha Kuznetsov
Pat Ray
Patrice Guerin
Patrick Bihan-Faou
Patrick Monnerat
Patrick Scott
@@ -720,6 +735,7 @@ Renaud Duhaut
Rene Bernhardt
Rene Rebe
Reuven Wachtfogel
Reza Arbab
Ricardo Cadime
Rich Gray
Rich Rauenzahn
@@ -736,11 +752,13 @@ Rick Richardson
Rob Crittenden
Rob Jones
Rob Stanzel
Rob Ward
Robert A. Monat
Robert D. Young
Robert Foreman
Robert Iakobashvili
Robert Olson
Robert Schumann
Robert Weaver
Robin Cornelius
Robin Johnson
@@ -809,6 +827,7 @@ Stephen Kick
Stephen More
Sterling Hughes
Steve Green
Steve H Truong
Steve Holme
Steve Lhomme
Steve Little
@@ -864,6 +883,7 @@ Tomasz Lacki
Tommie Gannert
Tommy Tam
Ton Voon
Toni Moreno
Toon Verwaest
Tor Arntsen
Torsten Foertsch
@@ -892,6 +912,7 @@ Vojtech Janota
Vojtech Minarik
Vsevolod Novikov
Walter J. Mack
Ward Willats
Wayne Haigh
Werner Koch
Wesley Laxton
+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ htmltitle.cc - download a HTML file and extract the <title> tag from a HTML
http-post.c    - HTTP POST
httpput.c      - HTTP PUT a local file
https.c        - simple HTTPS transfer
imap.c         - simple IMAP transfer
multi-app.c    - a multi-interface app
multi-debugcallback.c - a multi-interface app using the debug callback
multi-double.c - a multi-interface app doing two simultaneous transfers
@@ -75,4 +76,5 @@ simple.c - the most simple download a URL source
simplepost.c   - HTTP POST
simplessl.c    - HTTPS example with certificates many options set
synctime.c     - Sync local time by extracting date from remote HTTP servers
url2file.c     - download a document and store it in a file
10-at-a-time.c - Download many files simultaneously, 10 at a time.
+3 −3
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ If you forward the input arguments directly to "fseek" or "lseek", note that
the data type for \fIoffset\fP is not the same as defined for curl_off_t on
many systems! (Option added in 7.18.0)
.IP CURLOPT_SEEKDATA
Data pointer to pass to the file read function. If you use the
Data pointer to pass to the file seek function. If you use the
\fICURLOPT_SEEKFUNCTION\fP option, this is the pointer you'll get as input. If
you don't specify a seek callback, NULL is passed. (Option added in 7.18.0)
.IP CURLOPT_SOCKOPTFUNCTION
@@ -322,7 +322,7 @@ to the \fICURLOPT_OPENSOCKETFUNCTION\fP option. Return 0 to signal success and
1 if there was an error.  (Option added in 7.21.7)
.IP CURLOPT_CLOSESOCKETDATA
Pass a pointer that will be untouched by libcurl and passed as the first
argument in the opensocket callback set with
argument in the closesocket callback set with
\fICURLOPT_CLOSESOCKETFUNCTION\fP.  (Option added in 7.21.7)
.IP CURLOPT_PROGRESSFUNCTION
Function pointer that should match the \fIcurl_progress_callback\fP prototype
@@ -2070,7 +2070,7 @@ This option requires that libcurl was built with a resolver backend that
supports this operation. The c-ares backend is the only such one.

(Added in 7.24.0)
.IP CURLOPT_ACCEPTTIMOUT_MS
.IP CURLOPT_ACCEPTTIMEOUT_MS
Pass a long telling libcurl the maximum number of milliseconds to wait for a
server to connect back to libcurl when an active FTP connection is used. If no
timeout is set, the internal default of 60000 will be used. (Added in 7.24.0)
Loading