Commit 852d35b6 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

proxy: re-use proxy connections (regression) 

When checking for a connection to re-use, a proxy-using request must
check for and use a proxy connection and not one based on the host
name!

Added test 1421 to verify

Bug: http://curl.haxx.se/bug/view.cgi?id=1492
parent f39b1c08

lib/conncache.c

+9 −7
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2012, Linus Nielsen Feltzing, <linus@haxx.se>

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

 * Copyright (C) 2012 - 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
@@ -73,11 +73,13 @@ void Curl_conncache_destroy(struct conncache *connc) 
  }

}



struct connectbundle *Curl_conncache_find_bundle(struct conncache *connc,

                                                 char *hostname)

struct connectbundle *Curl_conncache_find_bundle(struct connectdata *conn,

                                                 struct conncache *connc)

{

  struct connectbundle *bundle = NULL;



  char *hostname = conn->bits.proxy?conn->proxy.name:conn->host.name;



  if(connc)

    bundle = Curl_hash_pick(connc->hash, hostname, strlen(hostname)+1);
@@ -127,15 +129,15 @@ CURLcode Curl_conncache_add_conn(struct conncache *connc, 
  struct connectbundle *new_bundle = NULL;

  struct SessionHandle *data = conn->data;



  bundle = Curl_conncache_find_bundle(data->state.conn_cache,

                                      conn->host.name);

  bundle = Curl_conncache_find_bundle(conn, data->state.conn_cache);

  if(!bundle) {

    char *hostname = conn->bits.proxy?conn->proxy.name:conn->host.name;



    result = Curl_bundle_create(data, &new_bundle);

    if(result)

      return result;



    if(!conncache_add_bundle(data->state.conn_cache,

                             conn->host.name, new_bundle)) {

    if(!conncache_add_bundle(data->state.conn_cache, hostname, new_bundle)) {

      Curl_bundle_destroy(new_bundle);

      return CURLE_OUT_OF_MEMORY;

    }

lib/conncache.h

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

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

 *

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

 * Copyright (C) 2012 - 2014, Linus Nielsen Feltzing, <linus@haxx.se>

 *

 * This software is licensed as described in the file COPYING, which
@@ -33,8 +34,9 @@ struct conncache *Curl_conncache_init(int size); 


void Curl_conncache_destroy(struct conncache *connc);



struct connectbundle *Curl_conncache_find_bundle(struct conncache *connc,

                                                 char *hostname);

/* return the correct bundle, to a host or a proxy */

struct connectbundle *Curl_conncache_find_bundle(struct connectdata *conn,

                                                 struct conncache *connc);



CURLcode Curl_conncache_add_conn(struct conncache *connc,

                                 struct connectdata *conn);

lib/url.c

+4 −5
Original line number Diff line number Diff line
@@ -3070,8 +3070,7 @@ ConnectionExists(struct SessionHandle *data, 


  /* Look up the bundle with all the connections to this

     particular host */

  bundle = Curl_conncache_find_bundle(data->state.conn_cache,

                                      needle->host.name);

  bundle = Curl_conncache_find_bundle(needle, data->state.conn_cache);

  if(bundle) {

    size_t max_pipe_len = Curl_multi_max_pipeline_length(data->multi);

    size_t best_pipe_len = max_pipe_len;
@@ -5658,8 +5657,9 @@ static CURLcode create_conn(struct SessionHandle *data, 
    /* set a pointer to the hostname we display */

    fix_hostname(data, conn, &conn->host);



    infof(data, "Re-using existing connection! (#%ld) with host %s\n",

    infof(data, "Re-using existing connection! (#%ld) with %s %s\n",

          conn->connection_id,

          conn->bits.proxy?"proxy":"host",

          conn->proxy.name?conn->proxy.dispname:conn->host.dispname);

  }

  else {
@@ -5668,8 +5668,7 @@ static CURLcode create_conn(struct SessionHandle *data, 
       connections we are allowed to open. */

    struct connectbundle *bundle;



    bundle = Curl_conncache_find_bundle(data->state.conn_cache,

                                        conn->host.name);

    bundle = Curl_conncache_find_bundle(conn, data->state.conn_cache);

    if(max_host_connections > 0 && bundle &&

       (bundle->num_connections >= max_host_connections)) {

      struct connectdata *conn_candidate;

tests/data/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ test1396 test1397 test1398 \ 
\

test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \

test1408 test1409 test1410 test1411 test1412 test1413 test1414 test1415 \

test1416 test1417 test1418 test1419 test1420 \

test1416 test1417 test1418 test1419 test1420 test1421 \

\

test1428 test1429 test1430 test1431 test1432 test1433 test1434 test1435 \

test1436 \

tests/data/test1421

0 → 100644
+72 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

HTTP

HTTP GET

HTTP proxy

</keywords>

</info>



#

# Server-side

<reply>

<data nocheck="yes">

HTTP/1.1 200 OK

Uknown-header: blrub

Content-Length: 6



-foo-

</data>



<servercmd>

connection-monitor

</servercmd>

</reply>



#

# Client-side

<client>

<server>

http

</server>

 <name>

Re-using HTTP proxy connection for two different host names

 </name>

 <command>

--proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1421:8990/ http://different.remote.haxx.se.1421:8990

</command>

</client>



#

# Verify data after the test has been "shot"

<verify>

<stdout>

HTTP/1.1 200 OK

Uknown-header: blrub

Content-Length: 6



-foo-

HTTP/1.1 200 OK

Uknown-header: blrub

Content-Length: 6



-foo-

</stdout>

<strip>

^User-Agent:.*

</strip>

<protocol>

GET http://test.remote.haxx.se.1421:8990/ HTTP/1.1

Host: test.remote.haxx.se.1421:8990

Accept: */*

Proxy-Connection: Keep-Alive



GET http://different.remote.haxx.se.1421:8990/ HTTP/1.1

Host: different.remote.haxx.se.1421:8990

Accept: */*

Proxy-Connection: Keep-Alive



[DISCONNECT]

</protocol>

</verify>

</testcase>