aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2009-05-07 08:30:43 +0000
committerDaniel Stenberg <daniel@haxx.se>2009-05-07 08:30:43 +0000
commit7bdd14a9946e1b93e2e1614ad436405e9c497147 (patch)
tree4d6065d80bc275e7b79c782efd681c21925524f4
parentafe06b48d62d6ac9d572e0cc82241998f3fc3931 (diff)
- Vijay G filed bug report #2723236
(http://curl.haxx.se/bug/view.cgi?id=2723236) identifying a problem with libcurl's TFTP code and its lack of dealing with the OACK packet.
-rw-r--r--CHANGES5
-rw-r--r--RELEASE-NOTES1
-rw-r--r--TODO-RELEASE10
-rw-r--r--lib/tftp.c2
4 files changed, 14 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 334d6252d..5ac787891 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
Changelog
+Daniel Stenberg (7 May 2009)
+- Vijay G filed bug report #2723236
+ (http://curl.haxx.se/bug/view.cgi?id=2723236) identifying a problem with
+ libcurl's TFTP code and its lack of dealing with the OACK packet.
+
Yang Tse (5 May 2009)
- Fixed the --ftp-port address of test #251 to the CLIENTIP address, and
reverted the change affecting test suite harness committed 4 May.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1d4dee3eb..fb4e004db 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -40,6 +40,7 @@ This release includes the following bugfixes:
o improved out of the box TPF compatibility
o HTTP PUT protocol line endings portions mangled from CRLF to CRCRLF
o Rejected SSL session ids are killed properly (for OpenSSL and GnuTLS builds)
+ o Deal with the TFTP OACK packet
This release includes the following known bugs:
diff --git a/TODO-RELEASE b/TODO-RELEASE
index cf571516e..2d2dac0a0 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -3,10 +3,6 @@ To be addressed in 7.19.5 (planned release: May 2009)
221 - debian man page warnings
-223 - TFTP flaw, #2723236
-
-226 - Active Mode FTPS Data Port Range
-
228 - rpath problems in linking with custom openssl
232 - [PATCH] transfer.c fixes for CURL_DO_LINEEND_CONV and non-ASCII
@@ -21,3 +17,9 @@ To be addressed in 7.19.5 (planned release: May 2009)
235 - #2784055, connect race with multi and socks proxy
236 -
+
+To be addressed in 7.19.6 (planned release: July 2009)
+=========================
+
+226 - Active Mode FTPS Data Port Range
+
diff --git a/lib/tftp.c b/lib/tftp.c
index b095cc532..1cb128454 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -695,6 +695,8 @@ static CURLcode tftp_tx(tftp_state_data_t *state, tftp_event_t event)
}
return res;
}
+ /* fall-through */
+ case TFTP_EVENT_OACK:
/* This is the expected packet. Reset the counters and send the next
block */
state->block++;