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

Calls to Curl_failf() are not supposed to provide a trailing newline as the 

function itself adds that. Fixed on 50 or something strings!
parent 991505e0

CHANGES

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


                                  Changelog



Daniel S (16 Jan 2008)

- Calls to Curl_failf() are not supposed to provide a trailing newline as the

  function itself adds that. Fixed on 50 or something strings!



Daniel S (15 Jan 2008)

- I made the torture test on test 530 go through. This was actually due to

  silly code left from when we switched to let the multi handle "hold" the dns

RELEASE-NOTES

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ This release includes the following bugfixes: 
 o curl-config --libs skips /usr/lib64

 o range support for file:// transfers

 o libcurl hang with huge POST request and request-body read from callback

 o removed extra newlines from many error messages



This release includes the following known bugs:

lib/ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, 
    rc = getnameinfo((struct sockaddr *)&ss, sslen, hbuf, sizeof(hbuf), NULL,

                     0, NIFLAGS);

    if(rc) {

      failf(data, "getnameinfo() returned %d \n", rc);

      failf(data, "getnameinfo() returned %d", rc);

      return CURLE_FTP_PORT_FAILED;

    }

    host = hbuf; /* use this host name */
@@ -2630,7 +2630,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) 
          ftpc->count1 = 1;

          break;

        default:

          failf(data, "unsupported parameter to CURLOPT_FTPSSLAUTH: %d\n",

          failf(data, "unsupported parameter to CURLOPT_FTPSSLAUTH: %d",

                data->set.ftpsslauth);

          return CURLE_FAILED_INIT; /* we don't know what to do */

        }

lib/krb4.c

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Hgskolan

 * (Royal Institute of Technology, Stockholm, Sweden).

 * Copyright (c) 2004 - 2007 Daniel Stenberg

 * Copyright (c) 2004 - 2008 Daniel Stenberg

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -362,7 +362,7 @@ CURLcode Curl_krb_kauth(struct connectdata *conn) 
    tmp=0;

  }

  if(!tmp || !ptr) {

    Curl_failf(conn->data, "Failed to decode base64 in reply.\n");

    Curl_failf(conn->data, "Failed to decode base64 in reply");

    Curl_set_command_prot(conn, save);

    return CURLE_FTP_WEIRD_SERVER_REPLY;

  }

lib/nss.c

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

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

 *

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

 * Copyright (C) 1998 - 2008, 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
@@ -436,10 +436,10 @@ static int display_error(struct connectdata *conn, PRInt32 err, 
{

  switch(err) {

  case SEC_ERROR_BAD_PASSWORD:

    failf(conn->data, "Unable to load client key: Incorrect password\n");

    failf(conn->data, "Unable to load client key: Incorrect password");

    return 1;

  case SEC_ERROR_UNKNOWN_CERT:

    failf(conn->data, "Unable to load certificate %s\n", filename);

    failf(conn->data, "Unable to load certificate %s", filename);

    return 1;

  default:

    break;
@@ -521,10 +521,10 @@ static SECStatus nss_Init_Tokens(struct connectdata * conn) 


    if(PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) {

      if(slot == PK11_GetInternalKeySlot()) {

        failf(conn->data, "The NSS database has not been initialized.\n");

        failf(conn->data, "The NSS database has not been initialized");

      }

      else {

        failf(conn->data, "The token %s has not been initialized.",

        failf(conn->data, "The token %s has not been initialized",

              PK11_GetTokenName(slot));

      }

      PK11_FreeSlot(slot);
@@ -1057,7 +1057,7 @@ int Curl_nss_send(struct connectdata *conn, /* connection data */ 
      return CURLE_OPERATION_TIMEDOUT;

    }



    failf(conn->data, "SSL write: error %d\n", err);

    failf(conn->data, "SSL write: error %d", err);

    return -1;

  }

  return rc; /* number of bytes */