← Back to branch summary

~ubuntu-branches/ubuntu/saucy/curl/saucy-201307251546

« back to all changes in this revision

Viewing changes to lib/socks.c

  • Committer: Bazaar Package Importer
  • Author(s): Ramakrishnan Muthukrishnan
  • Date: 2011-02-28 19:35:36 UTC
  • mto: (3.6.1 experimental) (1.3.1)
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: james.westby@ubuntu.com-20110228193536-p3a9jawxxofcsz7o
Tags: upstream-7.21.4
Import upstream version 7.21.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/socks.c
5
5
 *                            | (__| |_| |  _ <| |___
6
6
 *                             \___|\___/|_| \_\_____|
7
7
 *
8
 
 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
 
8
 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
9
9
 *
10
10
 * This software is licensed as described in the file COPYING, which
11
11
 * you should have received as part of this distribution. The terms
137
137
  struct SessionHandle *data = conn->data;
138
138
 
139
139
  /* get timeout */
140
 
  timeout = Curl_timeleft(conn, NULL, TRUE);
 
140
  timeout = Curl_timeleft(data, NULL, TRUE);
141
141
 
142
142
  if(timeout < 0) {
143
143
    /* time-out, bail out, go home */
399
399
  }
400
400
 
401
401
  /* get timeout */
402
 
  timeout = Curl_timeleft(conn, NULL, TRUE);
 
402
  timeout = Curl_timeleft(data, NULL, TRUE);
403
403
 
404
404
  if(timeout < 0) {
405
405
    /* time-out, bail out, go home */