aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames Dury <purplepolecat@users.sf.net>2013-12-07 15:53:08 +0100
committerDaniel Stenberg <daniel@haxx.se>2013-12-07 15:53:08 +0100
commitc4f46e97ca6c0f495d7c81d808fbd414deba1457 (patch)
treebdfb905c0cfe6ff6b5099f9779aa1816d48a6f2d /lib
parentbd3ca6630a447426f583c19fe72c502639ff4845 (diff)
TFTP: let tftp_multi_statemach()'s return codes through
It would otherwise always clobber the return code with new function calls and it couldn't return timeout etc. Bug: http://curl.haxx.se/bug/view.cgi?id=1310
Diffstat (limited to 'lib')
-rw-r--r--lib/tftp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tftp.c b/lib/tftp.c
index f1ffd2a3a..04e8fa798 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -1256,7 +1256,7 @@ static CURLcode tftp_doing(struct connectdata *conn, bool *dophase_done)
if(*dophase_done) {
DEBUGF(infof(conn->data, "DO phase is complete\n"));
}
- else {
+ else if(!result) {
/* The multi code doesn't have this logic for the DOING state so we
provide it for TFTP since it may do the entire transfer in this
state. */