Commit d07d1a6e authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Added test case 560: 

This test was added after the HTTPS-using-multi-interface with OpenSSL
regression of 7.19.1 to hopefully prevent this embarassing mistake from
appearing again... Unfortunately the bug wasn't triggered by this test, which
presumably is because the connect to a local server is too fast/different
compared to the real/distant servers we saw the bug happen with.
parent 8bdd60fa

tests/data/test560

0 → 100644
+56 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

HTTPS

HTTP GET

multi

</keywords>

</info>



#

# Server-side

<reply>

<data>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Content-Length: 7



MooMoo

</data>

</reply>



#

# Client-side

<client>

<features>

SSL

</features>

<server>

https

</server>

<tool>

lib560

</tool>

 <name>

simple HTTPS GET with multi interface

 </name>

 <command>

https://%HOSTIP:%HTTPSPORT/560

</command>

</client>



#

# Verify data after the test has been "shot"

<verify>

<strip>

^User-Agent:.*

</strip>

<protocol>

GET /560 HTTP/1.1

Host: %HOSTIP:%HTTPSPORT

Accept: */*



</protocol>

</verify>

</testcase>

tests/libtest/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \ 
  lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527	\

  lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \

  lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 \

  lib539 lib557 lib558 lib559

  lib539 lib557 lib558 lib559 lib560



# Dependencies (may need to be overriden)

LDADD = $(LIBDIR)/libcurl.la
@@ -168,3 +168,5 @@ lib558_CFLAGS = -DLIB558 


lib559_SOURCES = lib558.c $(SUPPORTFILES)

lib559_CFLAGS = -DLIB559



lib560_SOURCES = lib560.c $(SUPPORTFILES)

tests/libtest/lib560.c

0 → 100644
+92 −0
Original line number Diff line number Diff line 
/*****************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *                             / __| | | | |_) | |

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * $Id$

 *

 */

#include "test.h"



/*

 * Simply download a HTTPS file!

 *

 * This test was added after the HTTPS-using-multi-interface with OpenSSL

 * regression of 7.19.1 to hopefully prevent this embarassing mistake from

 * appearing again... Unfortunately the bug wasn't triggered by this test,

 * which presumably is because the connect to a local server is too

 * fast/different compared to the real/distant servers we saw the bug happen

 * with.

 */

int test(char *URL)

{

  CURL *http_handle;

  CURLM *multi_handle;



  int still_running; /* keep number of running handles */



  http_handle = curl_easy_init();



  /* set options */

  curl_easy_setopt(http_handle, CURLOPT_URL, URL);

  curl_easy_setopt(http_handle, CURLOPT_HEADER, 1L);

  curl_easy_setopt(http_handle, CURLOPT_SSL_VERIFYPEER, 0L);

  curl_easy_setopt(http_handle, CURLOPT_SSL_VERIFYHOST, 0L);



  /* init a multi stack */

  multi_handle = curl_multi_init();



  /* add the individual transfers */

  curl_multi_add_handle(multi_handle, http_handle);



  /* we start some action by calling perform right away */

  while(CURLM_CALL_MULTI_PERFORM ==

        curl_multi_perform(multi_handle, &still_running));



  while(still_running) {

    struct timeval timeout;

    int rc; /* select() return code */



    fd_set fdread;

    fd_set fdwrite;

    fd_set fdexcep;

    int maxfd;



    FD_ZERO(&fdread);

    FD_ZERO(&fdwrite);

    FD_ZERO(&fdexcep);



    /* set a suitable timeout to play around with */

    timeout.tv_sec = 1;

    timeout.tv_usec = 0;



    /* get file descriptors from the transfers */

    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);



    /* In a real-world program you OF COURSE check the return code of the

       function calls, *and* you make sure that maxfd is bigger than -1 so

       that the call to select() below makes sense! */



    rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);



    switch(rc) {

    case -1:

      /* select error */

      break;

    case 0:

    default:

      /* timeout or readable/writable sockets */

      while(CURLM_CALL_MULTI_PERFORM ==

            curl_multi_perform(multi_handle, &still_running));

      break;

    }

  }



  curl_multi_cleanup(multi_handle);



  curl_easy_cleanup(http_handle);



  return 0;

}