Commit 6f4ff1f2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

When starting the ftp server, wait a few seconds to make really sure that

a pidfile for the server appears as otherwise it failed.
parent d3eea61f
Loading
Loading
Loading
Loading
+14 −3
Original line number Diff line number Diff line
@@ -557,11 +557,22 @@ sub runftpserver {

    my $ftppid = startnew($cmd);

    if(!kill(0, $ftppid)) {
    if(!$ftppid || !kill(0, $ftppid)) {
        # it is NOT alive
        print "RUN: failed to start the FTP$id$nameext server!\n";
        stopservers($verbose);
        exit;
        return -1;
    }

    # Make sure there is a pidfile present before we proceed. Because if we
    # don't see one within a few secs, the server doesn't work. This mostly
    # happens when the server finds out it cannot use the ipv6 protocol.
    my $count=3;
    while(! -f $pidfile) {
        if(!$count--) {
            print "RUN: failed starting FTP$id$nameext server (no pidfile)!\n";
            return -1;
        }
        sleep(1);
    }

    if($verbose) {