Commit ecc4940d authored by Yamada Yasuharu's avatar Yamada Yasuharu Committed by Daniel Stenberg
Browse files

curl_easy_recv/send: make them work with the multi interface 

By making sure Curl_getconnectinfo() uses the correct connection cache
to find the last connection.
parent 4b02b848

docs/libcurl/curl_easy_recv.3

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

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

.\" *

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

.\" * Copyright (C) 1998 - 2015, 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
@@ -42,8 +42,9 @@ buffer. The variable \fBn\fP points to will receive the number of received 
bytes.



To establish the connection, set \fBCURLOPT_CONNECT_ONLY(3)\fP option before

calling \fIcurl_easy_perform(3)\fP. Note that \fIcurl_easy_recv(3)\fP does not

work on connections that were created without this option.

calling \fIcurl_easy_perform(3)\fP or \cIcurl_multi_perform(3)\fP. Note that

\fIcurl_easy_recv(3)\fP does not work on connections that were created without

this option.



You must ensure that the socket has data to read before calling

\fIcurl_easy_recv(3)\fP, otherwise the call will return \fBCURLE_AGAIN\fP -

docs/libcurl/curl_easy_send.3

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

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

.\" *

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

.\" * Copyright (C) 1998 - 2015, 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
@@ -40,8 +40,9 @@ connection set-up. 
The variable \fBn\fP points to will receive the number of sent bytes.



To establish the connection, set \fBCURLOPT_CONNECT_ONLY(3)\fP option before

calling \fIcurl_easy_perform(3)\fP. Note that \fIcurl_easy_send(3)\fP will not

work on connections that were created without this option.

calling \fIcurl_easy_perform(3)\fP or \fIcurl_multi_perform()\fP. Note that

\fIcurl_easy_send(3)\fP will not work on connections that were created without

this option.



You must ensure that the socket is writable before calling

\fIcurl_easy_send(3)\fP, otherwise the call will return \fBCURLE_AGAIN\fP -

lib/connect.c

+9 −4
Original line number Diff line number Diff line
@@ -1202,15 +1202,20 @@ curl_socket_t Curl_getconnectinfo(struct SessionHandle *data, 


  DEBUGASSERT(data);



  /* this only works for an easy handle that has been used for

     curl_easy_perform()! */

  if(data->state.lastconnect && data->multi_easy) {

  /* this works for an easy handle:

   * - that has been used for curl_easy_perform()

   * - that is associated with a multi handle, and whose connection

   *   was detached with CURLOPT_CONNECT_ONLY

   */

  if(data->state.lastconnect && (data->multi_easy || data->multi)) {

    struct connectdata *c = data->state.lastconnect;

    struct connfind find;

    find.tofind = data->state.lastconnect;

    find.found = FALSE;



    Curl_conncache_foreach(data->multi_easy->conn_cache, &find, conn_is_conn);

    Curl_conncache_foreach(data->multi_easy?

                           data->multi_easy->conn_cache:

                           data->multi->conn_cache, &find, conn_is_conn);



    if(!find.found) {

      data->state.lastconnect = NULL;