← Back to branch summary

~ubuntu-branches/ubuntu/vivid/curl/vivid

« back to all changes in this revision

Viewing changes to lib/transfer.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2013-05-07 12:16:37 UTC
  • mfrom: (3.4.37 sid)
  • Revision ID: package-import@ubuntu.com-20130507121637-9t3i98qgsyr9dw5d
Tags: 7.30.0-1ubuntu1
* Resynchronize on Debian. Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from binary package Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
* Add warning to debian/patches/series.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/transfer.c
473
473
        /* We've stopped dealing with input, get out of the do-while loop */
474
474
 
475
475
        if(nread > 0) {
476
 
          if(conn->data->multi && Curl_multi_canPipeline(conn->data->multi)) {
 
476
          if(Curl_multi_pipeline_enabled(conn->data->multi)) {
477
477
            infof(data,
478
478
                  "Rewinding stream by : %zd"
479
479
                  " bytes on url %s (zero-length body)\n",
602
602
          if(dataleft != 0) {
603
603
            infof(conn->data, "Leftovers after chunking: %zu bytes\n",
604
604
                  dataleft);
605
 
            if(conn->data->multi &&
606
 
               Curl_multi_canPipeline(conn->data->multi)) {
 
605
            if(Curl_multi_pipeline_enabled(conn->data->multi)) {
607
606
              /* only attempt the rewind if we truly are pipelining */
608
607
              infof(conn->data, "Rewinding %zu bytes\n",dataleft);
609
608
              read_rewind(conn, dataleft);
626
625
 
627
626
        excess = (size_t)(k->bytecount + nread - k->maxdownload);
628
627
        if(excess > 0 && !k->ignorebody) {
629
 
          if(conn->data->multi && Curl_multi_canPipeline(conn->data->multi)) {
 
628
          if(Curl_multi_pipeline_enabled(conn->data->multi)) {
630
629
            /* The 'excess' amount below can't be more than BUFSIZE which
631
630
               always will fit in a size_t */
632
631
            infof(data,