← Back to branch summary

~ubuntu-branches/ubuntu/natty/curl/natty-proposed

« back to all changes in this revision

Viewing changes to lib/transfer.c

  • Committer: Bazaar Package Importer
  • Author(s): Ramakrishnan Muthukrishnan
  • Date: 2010-08-12 08:20:48 UTC
  • mto: (3.4.8 sid)
  • mto: This revision was merged to the branch mainline in revision 43.
  • Revision ID: james.westby@ubuntu.com-20100812082048-7g7fewx1ai2ozgsf
Tags: upstream-7.21.1
Import upstream version 7.21.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/transfer.c
811
811
          k->keepon &= ~KEEP_SEND;         /* disable writing */
812
812
          k->start100 = Curl_tvnow();       /* timeout count starts now */
813
813
          *didwhat &= ~KEEP_SEND;  /* we didn't write anything actually */
 
814
 
 
815
          /* set a timeout for the multi interface */
 
816
          Curl_expire(data, CURL_TIMEOUT_EXPECT_100);
814
817
          break;
815
818
        }
816
819
 
2265
2268
        /* wait with write until we either got 100-continue or a timeout */
2266
2269
        k->exp100 = EXP100_AWAITING_CONTINUE;
2267
2270
        k->start100 = k->start;
 
2271
 
 
2272
        /* set a timeout for the multi interface */
 
2273
        Curl_expire(data, CURL_TIMEOUT_EXPECT_100);
2268
2274
      }
2269
2275
      else {
2270
2276
        if(data->state.expect100header)