Commit 2b839853 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Added test case 504, using multi interface and a local proxy without anything 

listening on the port we use.
parent 66b6cd68

tests/data/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ test107 test116 test125 test2 test26 test33 test45 test126 \ 
test304  test39   test32   test128  test48 test306 \

test130  test131  test132  test133  test134 test135 test403 test305 \

test49 test50 test51 test52 test53 test54 test55 test56 \

test500 test501 test502 test503
 
test500 test501 test502 test503 test504

tests/data/test504

0 → 100644
+29 −0
Original line number Diff line number Diff line 
rrl#

# Server-side

<reply>

</reply>



# Client-side

<client>

<server>

file

</server>

# tool is what to use instead of 'curl'

<tool>

lib504

</tool>



 <name>

simple multi through local proxy without listener

 </name>

 <command>

http://%HOSTIP:%HTTPSPORT/504 localhost:55555

</command>

</client>



# Verify data after the test has been "shot"

<verify>

<errorcode>

100

</errorcode>

</verify>

tests/libtest/Makefile.am

+6 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ INCLUDES = -I$(top_srcdir)/include/curl 
LIBDIR = ../../lib



# here are all tools used for running libcurl tests

bin_PROGRAMS = lib500 lib501 lib502 lib503

bin_PROGRAMS = lib500 lib501 lib502 lib503 lib504



lib500_SOURCES = lib500.c first.c test.h

lib500_LDADD = $(LIBDIR)/libcurl.la
@@ -26,3 +26,8 @@ lib502_DEPENDENCIES = $(LIBDIR)/libcurl.la 
lib503_SOURCES = lib503.c first.c test.h

lib503_LDADD = $(LIBDIR)/libcurl.la

lib503_DEPENDENCIES = $(LIBDIR)/libcurl.la



lib504_SOURCES = lib504.c first.c test.h

lib504_LDADD = $(LIBDIR)/libcurl.la

lib504_DEPENDENCIES = $(LIBDIR)/libcurl.la

tests/libtest/lib504.c

0 → 100644
+76 −0
Original line number Diff line number Diff line 
#include "test.h"



/*

 * Source code in here hugely as reported in bug report 651464 by

 * Christopher R. Palmer.

 *

 * Use multi interface to get document over proxy with bad port number.

 * This caused the interface to "hang" in libcurl 7.10.2.

 */

CURLcode test(char *URL)

{

  CURL *c;

  CURLcode ret=CURLE_OK;

  CURLM *m;

  fd_set rd, wr, exc;

  CURLMcode res;

  int running;

  int max_fd;



  curl_global_init(CURL_GLOBAL_ALL);

  c = curl_easy_init();



  /* the point here being that there must not run anything on the given

     proxy port */

  curl_easy_setopt(c, CURLOPT_PROXY, arg2);

  curl_easy_setopt(c, CURLOPT_URL, URL);

  curl_easy_setopt(c, CURLOPT_VERBOSE, 1);



  m = curl_multi_init();



  do {

    res = curl_multi_add_handle(m, c);

    while (res == CURLM_CALL_MULTI_PERFORM)

      res = curl_multi_perform(m, &running);



    if(!running) {

      /* This is where this code is expected to reach */

      int numleft;

      CURLMsg *msg = curl_multi_info_read(m, &numleft);

      fprintf(stderr, "Not running\n");

      if(msg && !numleft)

        ret = 100; /* this is where we should be */

      else

        ret = 99; /* not correct */

      break;

    }



    if (res != CURLM_OK) {

      fprintf(stderr, "not okay???\n");

      ret = 2;

      break;

    }



    FD_ZERO(&rd);

    FD_ZERO(&wr);

    FD_ZERO(&exc);

    max_fd = 0;



    if (curl_multi_fdset(m, &rd, &wr, &exc, &max_fd) != CURLM_OK) {

      fprintf(stderr, "unexpected failured of fdset.\n");

      ret = 3;

      break;

    }



    select(max_fd+1, &rd, &wr, &exc, NULL);



    fprintf(stderr, "not reached!\n");

  } while(0);



  curl_multi_remove_handle(m, c);

  curl_easy_cleanup(c);

  curl_multi_cleanup(m);



  return ret;

}