~ubuntu-branches/ubuntu/precise/wget/precise-proposed

« back to all changes in this revision

Viewing changes to src/retr.c

  • Committer: Bazaar Package Importer
  • Author(s): Noèl Köthe
  • Date: 2005-10-13 16:59:03 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051013165903-3e12j4gn6znkhmdb
Tags: 1.10.2-1
new upstream release which fixes a NTLM Buffer Overflow Vulnerability

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
#endif
62
62
 
63
63
/* Total size of downloaded files.  Used to enforce quota.  */
64
 
LARGE_INT total_downloaded_bytes;
 
64
SUM_SIZE_INT total_downloaded_bytes;
65
65
 
66
66
/* If non-NULL, the stream to which output should be written.  This
67
67
   stream is initialized when `-O' is used.  */
668
668
    }
669
669
  else if (u->scheme == SCHEME_FTP)
670
670
    {
671
 
      /* If this is a redirection, we must not allow recursive FTP
672
 
         retrieval, so we save recursion to oldrec, and restore it
673
 
         later.  */
674
 
      int oldrec = opt.recursive;
 
671
      /* If this is a redirection, temporarily turn off opt.ftp_glob
 
672
         and opt.recursive, both being undesirable when following
 
673
         redirects.  */
 
674
      int oldrec = opt.recursive, oldglob = opt.ftp_glob;
675
675
      if (redirection_count)
676
 
        opt.recursive = 0;
 
676
        opt.recursive = opt.ftp_glob = 0;
 
677
 
677
678
      result = ftp_loop (u, dt, proxy_url);
678
679
      opt.recursive = oldrec;
 
680
      opt.ftp_glob = oldglob;
679
681
 
680
682
      /* There is a possibility of having HTTP being redirected to
681
683
         FTP.  In these cases we must decide whether the text is HTML