Commit 19122c07 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

CURLM_ADDED_ALREADY: new error code 

Doing curl_multi_add_handle() on an easy handle that is already added to
a multi handle now returns this error code. It previously returned
CURLM_BAD_EASY_HANDLE for this condition.
parent c346c4c8

docs/libcurl/libcurl-errors.3

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
.\" *                            | (__| |_| |  _ <| |___

.\" *                             \___|\___/|_| \_\_____|

.\" *

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

.\" * Copyright (C) 1998 - 2013, 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
@@ -273,6 +273,9 @@ The passed-in socket is not a valid one that libcurl already knows about. 
.IP "CURLM_UNKNOWN_OPTION (6)"

curl_multi_setopt() with unsupported option

(Added in 7.15.4)

.IP "CURLM_ADDED_ALREADY (7)"

An easy handle already added to a multi handle was attempted to get added a

second time. (Added in 7.32.1)

.SH "CURLSHcode"

The "share" interface will return a CURLSHcode to indicate when an error has

occurred.  Also consider \fIcurl_share_strerror(3)\fP.

docs/libcurl/symbols-in-versions

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ CURLMOPT_TIMERDATA 7.16.0 
CURLMOPT_TIMERFUNCTION          7.16.0

CURLMSG_DONE                    7.9.6

CURLMSG_NONE                    7.9.6

CURLM_ADDED_ALREADY             7.32.1

CURLM_BAD_EASY_HANDLE           7.9.6

CURLM_BAD_HANDLE                7.9.6

CURLM_BAD_SOCKET                7.15.4

include/curl/multi.h

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

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

 *

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

 * Copyright (C) 1998 - 2013, 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
@@ -64,6 +64,8 @@ typedef enum { 
  CURLM_INTERNAL_ERROR,  /* this is a libcurl bug */

  CURLM_BAD_SOCKET,      /* the passed in socket argument did not match */

  CURLM_UNKNOWN_OPTION,  /* curl_multi_setopt() with unsupported option */

  CURLM_ADDED_ALREADY,   /* an easy handle already added to a multi handle was

                            attempted to get added - again */

  CURLM_LAST

} CURLMcode;

lib/multi.c

+1 −2
Original line number Diff line number Diff line
@@ -357,8 +357,7 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle, 
  /* Prevent users from adding same easy handle more than once and prevent

     adding to more than one multi stack */

  if(data->multi)

    /* possibly we should create a new unique error code for this condition */

    return CURLM_BAD_EASY_HANDLE;

    return CURLM_ADDED_ALREADY;



  /* Allocate and initialize timeout list for easy handle */

  timeoutlist = Curl_llist_alloc(multi_freetimeout);

lib/strerror.c

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

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

 *

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

 * Copyright (C) 2004 - 2013, 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
@@ -361,6 +361,9 @@ curl_multi_strerror(CURLMcode error) 
  case CURLM_UNKNOWN_OPTION:

    return "Unknown option";



  case CURLM_ADDED_ALREADY:

    return "The easy handle is already added to a multi handle";



  case CURLM_LAST:

    break;

  }