Commit d487ade7 authored by Kamil Dudka's avatar Kamil Dudka
Browse files

test536: do not fail with threaded DNS resolver 

Also tweaked comments in certain examples using curl_multi_fdset().
parent 71be565c

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 


                                  Changelog



Kamil Dudka (24 Apr 2010)

- Fixed test536 in order to not fail with threaded DNS resolver and tweaked

  comments in certain examples using curl_multi_fdset().



Daniel Stenberg (21 Apr 2010)

- The -O option caused curl to crash on windows and DOS due to the tool

  writing out of boundary memory.

docs/examples/fopen.c

+5 −3
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ fill_buffer(URL_FILE *file,int want,int waittime) 
    fd_set fdread;

    fd_set fdwrite;

    fd_set fdexcep;

    int maxfd;

    struct timeval timeout;

    int rc;
@@ -144,6 +143,7 @@ fill_buffer(URL_FILE *file,int want,int waittime) 
    /* attempt to fill buffer */

    do

    {

        int maxfd = -1;

        FD_ZERO(&fdread);

        FD_ZERO(&fdwrite);

        FD_ZERO(&fdexcep);
@@ -156,8 +156,10 @@ fill_buffer(URL_FILE *file,int want,int waittime) 
        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! */

           function calls.  On success, the value of maxfd is guaranteed to be

           greater or equal than -1.  We call select(maxfd + 1, ...), specially

           in case of (maxfd == -1), we call select(0, ...), which is basically

           equal to sleep. */



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

docs/examples/multi-app.c

+5 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ int main(int argc, char **argv) 
    fd_set fdread;

    fd_set fdwrite;

    fd_set fdexcep;

    int maxfd;

    int maxfd = -1;



    FD_ZERO(&fdread);

    FD_ZERO(&fdwrite);
@@ -80,8 +80,10 @@ int main(int argc, char **argv) 
    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! */

       function calls.  On success, the value of maxfd is guaranteed to be

       greater or equal than -1.  We call select(maxfd + 1, ...), specially in

       case of (maxfd == -1), we call select(0, ...), which is basically equal

       to sleep. */



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

docs/examples/multi-debugcallback.c

+5 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ int main(int argc, char **argv) 
    fd_set fdread;

    fd_set fdwrite;

    fd_set fdexcep;

    int maxfd;

    int maxfd = -1;



    FD_ZERO(&fdread);

    FD_ZERO(&fdwrite);
@@ -154,8 +154,10 @@ int main(int argc, char **argv) 
    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! */

       function calls.  On success, the value of maxfd is guaranteed to be

       greater or equal than -1.  We call select(maxfd + 1, ...), specially in

       case of (maxfd == -1), we call select(0, ...), which is basically equal

       to sleep. */



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

docs/examples/multi-double.c

+5 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int main(int argc, char **argv) 
    fd_set fdread;

    fd_set fdwrite;

    fd_set fdexcep;

    int maxfd;

    int maxfd = -1;



    FD_ZERO(&fdread);

    FD_ZERO(&fdwrite);
@@ -71,8 +71,10 @@ int main(int argc, char **argv) 
    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! */

       function calls.  On success, the value of maxfd is guaranteed to be

       greater or equal than -1.  We call select(maxfd + 1, ...), specially in

       case of (maxfd == -1), we call select(0, ...), which is basically equal

       to sleep. */



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