Commit aabd27d9 authored May 18, 2010 by Daniel Stenberg

TFTP: send timeout option correctly

Eric Mertens posted bug report #3003005 pointing out that the
libcurl TFTP code was not sending the timeout option properly to
the server, and suggested a fix.

(http://curl.haxx.se/bug/view.cgi?id=3003005)

parent dcc06154

CHANGES

+7 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,13 @@

		Changelog

		Daniel Stenberg (18 May 2010)
		- Eric Mertens posted bug report #3003005 pointing out that the libcurl TFTP
		code was not sending the timeout option properly to the server, and
		suggested a fix.

		(http://curl.haxx.se/bug/view.cgi?id=3003005)

		Kamil Dudka (16 May 2010)
		- Pavel Raiskup introduced a new option CURLOPT_FNMATCH_DATA in order to pass
		a custom data pointer to the callback specified by CURLOPT_FNMATCH_FUNCTION.

RELEASE-NOTES

+2 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ This release includes the following bugfixes:
		o broken CRL support in libcurl-NSS
		o ignore response-body on redirect even if compressed
		o OpenSSL handshake state-machine for multi interface
		o TFTP timeout option sent correctly

		This release includes the following known bugs:

		@@ -40,6 +41,6 @@ advice from friends like these:

		Rainer Canavan, Paul Howarth, Jerome Vouillon, Ruslan Gazizov, Yang Tse,
		Kamil Dudka, Alex Bligh, Ben Greear, Hoi-Ho Chan, Howard Chu, Dirk Manske,
		Pavel Raiskup, John-Mark Bell
		Pavel Raiskup, John-Mark Bell, Eric Mertens

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

lib/tftp.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -87,8 +87,10 @@
		#define TFTP_BLKSIZE_MIN 8
		#define TFTP_BLKSIZE_MAX 65464
		#define TFTP_OPTION_BLKSIZE "blksize"

		/* from RFC2349: */
		#define TFTP_OPTION_TSIZE "tsize"
		#define TFTP_OPTION_INTERVAL "interval"
		#define TFTP_OPTION_INTERVAL "timeout"

		typedef enum {
		TFTP_MODE_NETASCII=0,