Commit 0251563c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

report pid back in the WE ROOLZ message

parent 72673a35

tests/ftpserver.pl

+7 −3
Original line number Diff line number Diff line
@@ -211,9 +211,12 @@ sub RETR_command { 
        # this is the secret command that verifies that this actually is

        # the curl test server

        print "150 Binary junk (10 bytes).\r\n";

        print SOCK "WE ROOLZ\r\n";

        print SOCK "WE ROOLZ: $$\r\n";

        close(SOCK);

        print "226 File transfer complete\r\n";

        if($verbose) {

            print STDERR "FTPD: We returned proof we are the test server\n";

        }

        return 0;

    }
@@ -439,8 +442,9 @@ for ( $waitedpid = 0; 


    print @welcome;

    if($verbose) {

        print STDERR "OUT:\n";

        print STDERR @welcome;

        for(@welcome) {

            print STDERR "OUT: $_";

        }

    }

    my $state="fresh";

tests/server/sws.c

+5 −5
Original line number Diff line number Diff line
@@ -88,10 +88,6 @@ static const char *docbadconnect = 
"HTTP/1.1 501 Forbidden you fool\r\n"

"\r\n";



/* sent as reply to the magic to find out if we are the test server or

   not */

static const char *docfriends = "HTTP/1.1 200 Mighty fine indeed\r\n\r\nWE ROOLZ\r\n";



/* send back this on 404 file not found */

static const char *doc404 = "HTTP/1.1 404 Not Found\n"

    "Server: " VERSION "\n"
@@ -332,6 +328,8 @@ static int send_doc(int sock, int doc, int part_no) 
  int cmdsize=0;

  FILE *dump;



  static char weare[256];



  char filename[256];

  char partbuf[80]="data";
@@ -340,7 +338,9 @@ static int send_doc(int sock, int doc, int part_no) 
    case DOCNUMBER_WERULEZ:

      /* we got a "friends?" question, reply back that we sure are */

      logmsg("Identifying ourselves as friends");

      buffer = docfriends;

      sprintf(weare, "HTTP/1.1 200 OK\r\n\r\nWE ROOLZ: %d\r\n",

              getpid());

      buffer = weare;

      break;

    case DOCNUMBER_INTERNAL:

      logmsg("Bailing out due to internal error");