From aabd27d9aaefdb1c6f815567c2ff05a4449a36c3 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 18 May 2010 23:14:00 +0200
Subject: [PATCH] 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)
---
 CHANGES       | 7 +++++++
 RELEASE-NOTES | 3 ++-
 lib/tftp.c    | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 115e33cf8..9e4ec8e59 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b73997900..614b47c29 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -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)
diff --git a/lib/tftp.c b/lib/tftp.c
index 3c288b66e..141c57570 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -87,8 +87,10 @@
 #define TFTP_BLKSIZE_MIN 8
 #define TFTP_BLKSIZE_MAX 65464
 #define TFTP_OPTION_BLKSIZE "blksize"
-#define TFTP_OPTION_TSIZE "tsize"
-#define TFTP_OPTION_INTERVAL "interval"
+
+/* from RFC2349: */
+#define TFTP_OPTION_TSIZE    "tsize"
+#define TFTP_OPTION_INTERVAL "timeout"
 
 typedef enum {
   TFTP_MODE_NETASCII=0,