← Back to branch summary

~cjwatson/ubuntu/oneiric/curl/minimal-udeb

« back to all changes in this revision

Viewing changes to lib/gtls.c

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2011-07-13 12:08:54 UTC
  • Revision ID: james.westby@ubuntu.com-20110713120854-6funbnm5qhn3vs82
Tags: 7.21.6-3ubuntu2
https://launchpad.net/bugs/736216
debian/patches/timeout_bug_736216: cherry pick upstream
git revision d4e000906ac4ef243258a5c9a819a7cde247d16a to fix
handshake timeout bug (LP: #736216). Thanks to Sidnei da Silva
and Michael Vogt

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gtls.c
255
255
        connssl->connecting_state?sockfd:CURL_SOCKET_BAD;
256
256
 
257
257
      what = Curl_socket_ready(readfd, writefd,
258
 
                               nonblocking?0:(int)timeout_ms?1000:timeout_ms);
 
258
                               nonblocking?0:
 
259
                               ((int)timeout_ms?timeout_ms:1000));
259
260
      if(what < 0) {
260
261
        /* fatal error */
261
262
        failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);