]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
tests/server/tftpd.c: close upload file right after transfer
authorMarc Hoersken <info@marc-hoersken.de>
Fri, 20 Nov 2020 07:13:47 +0000 (08:13 +0100)
committerMarc Hoersken <info@marc-hoersken.de>
Fri, 20 Nov 2020 11:50:57 +0000 (12:50 +0100)
Make sure uploaded file is no longer locked after the
transfer while waiting for the final ACK to be handled.

Assisted-by: Daniel Stenberg
Bug: #6058
Closes #6209

tests/server/tftpd.c

index 4215bfe4aaad7f7bbdf516db23aea69d7da1b58f..fdd6e061e7daa101ce774c07583349a6c6f907ea 100644 (file)
@@ -821,11 +821,6 @@ int main(int argc, char **argv)
     sclose(peer);
     peer = CURL_SOCKET_BAD;
 
-    if(test.ofile > 0) {
-      close(test.ofile);
-      test.ofile = 0;
-    }
-
     if(got_exit_signal)
       break;
 
@@ -1304,6 +1299,10 @@ send_ack:
     }
   } while(size == SEGSIZE);
   write_behind(test, pf->f_convert);
+  if(test->ofile > 0) {
+    close(test->ofile);
+    test->ofile = 0;
+  }
 
   rap->th_opcode = htons((unsigned short)opcode_ACK);  /* send the "final"
                                                           ack */