Commit 87fbcb44 authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

Merge branch 'master' of github.com:bagder/curl

parents 4bfe0764 5d93525f

CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
                                  Changelog



Daniel Stenberg (16 Apr 2010)

- Jerome Vouillon made the GnuTLS SSL handshake phase non-blocking.



- The recent overhaul of the SSL recv function made the GnuTLS specific code

  treat a zero returned from gnutls_record_recv() as an error, and this caused

  our HTTPS test cases to fail. We leave it to upper layer code to detect if

RELEASE-NOTES

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ This release includes the following bugfixes: 
 o prevent needless reverse name lookups

 o detect GSS on ancient Linux distros

 o GnuTLS: EOF caused error when it wasn't

 o GnuTLS: SSL handshake phase is non-blocking



This release includes the following known bugs:
@@ -24,6 +25,6 @@ This release includes the following known bugs: 
This release would not have looked like this without help, code, reports and

advice from friends like these:



 Rainer Canavan, Paul Howarth

 Rainer Canavan, Paul Howarth, Jerome Vouillon



        Thanks! (and sorry if I forgot to mention someone)

lib/content_encoding.c

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ static enum { 
      return GZIP_UNDERFLOW;



    len -= 2;

    data += 2;

  }



  *headerlen = totallen - len;

lib/dict.c

+13 −18
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

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

 *

 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -217,14 +217,13 @@ static CURLcode dict_do(struct connectdata *conn, bool *done) 


    free(eword);



    if(result)

    if(result) {

      failf(data, "Failed sending DICT request");

    else

      result = Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, bytecount,

                                   -1, NULL); /* no upload */

    if(result)

      return result;

    }

    Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, bytecount,

                        -1, NULL); /* no upload */

  }

  else if(Curl_raw_nequal(path, DICT_DEFINE, sizeof(DICT_DEFINE)-1) ||

           Curl_raw_nequal(path, DICT_DEFINE2, sizeof(DICT_DEFINE2)-1) ||

           Curl_raw_nequal(path, DICT_DEFINE3, sizeof(DICT_DEFINE3)-1)) {
@@ -265,15 +264,12 @@ static CURLcode dict_do(struct connectdata *conn, bool *done) 


    free(eword);



    if(result)

    if(result) {

      failf(data, "Failed sending DICT request");

    else

      result = Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, bytecount,

                                   -1, NULL); /* no upload */



    if(result)

      return result;



    }

    Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, bytecount,

                        -1, NULL); /* no upload */

  }

  else {
@@ -290,14 +286,13 @@ static CURLcode dict_do(struct connectdata *conn, bool *done) 
                          "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n"

                          "%s\r\n"

                          "QUIT\r\n", ppath);

      if(result)

      if(result) {

        failf(data, "Failed sending DICT request");

      else

        result = Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, bytecount,

                                     -1, NULL);

      if(result)

        return result;

      }



      Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, bytecount, -1, NULL);

    }

  }



  return CURLE_OK;

lib/file.c

+3 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

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

 *

 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -146,7 +146,7 @@ static CURLcode file_range(struct connectdata *conn) 


  if(data->state.use_range && data->state.range) {

    from=curlx_strtoofft(data->state.range, &ptr, 0);

    while(ptr && *ptr && (isspace((int)*ptr) || (*ptr=='-')))

    while(*ptr && (isspace((int)*ptr) || (*ptr=='-')))

      ptr++;

    to=curlx_strtoofft(ptr, &ptr2, 0);

    if(ptr == ptr2) {
@@ -161,11 +161,10 @@ static CURLcode file_range(struct connectdata *conn) 
    }

    else if(from < 0) {

      /* -Y */

      totalsize = -from;

      data->req.maxdownload = -from;

      data->state.resume_from = from;

      DEBUGF(infof(data, "RANGE the last %" FORMAT_OFF_T " bytes\n",

                   totalsize));

                   -from));

    }

    else {

      /* X-Y */