From dda7233c5d3879f2580543ead0ad7cd76196a160 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 18 Aug 2009 20:15:13 +0200 Subject: Allow empty Reason-Phase in the Status-Lines, which is allowed by rtf http://www.w3.org/Protocols/rfc2616/rfc2616.html . Fixed by removing a space which will now be visibly in the errormessages, but as this errors should never happen anyway and an extra space doesn't harm we don't removed it. * methods/http.cc: - allow empty Reason-Phase in Status-Line to please squid, thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435) --- methods/http.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'methods') diff --git a/methods/http.cc b/methods/http.cc index 006e89394..df62034e3 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -547,7 +547,7 @@ bool ServerState::HeaderLine(string Line) // Evil servers return no version if (Line[4] == '/') { - if (sscanf(Line.c_str(),"HTTP/%u.%u %u %[^\n]",&Major,&Minor, + if (sscanf(Line.c_str(),"HTTP/%u.%u %u%[^\n]",&Major,&Minor, &Result,Code) != 4) return _error->Error(_("The HTTP server sent an invalid reply header")); } @@ -555,7 +555,7 @@ bool ServerState::HeaderLine(string Line) { Major = 0; Minor = 9; - if (sscanf(Line.c_str(),"HTTP %u %[^\n]",&Result,Code) != 2) + if (sscanf(Line.c_str(),"HTTP %u%[^\n]",&Result,Code) != 2) return _error->Error(_("The HTTP server sent an invalid reply header")); } -- cgit v1.2.3-70-g09d2 From ebf2e25b204195892b6c4866b1517755efb590b4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 23:11:11 +0200 Subject: add text at the top without failing in rred (Closes: #545694) Patch from Bernhard R. Link, thanks! --- debian/changelog | 2 ++ methods/rred.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'methods') diff --git a/debian/changelog b/debian/changelog index eebef40ff..9aa1f6860 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ apt (0.7.24) UNRELEASED; urgency=low - move the description of files to globally usable entities * doc/apt_preferences.5.xml: - document the new preferences.d folder (Closes: #544017) + * methods/rred.cc: + - add at the top without failing (by Bernhard R. Link, Closes: #545694) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/methods/rred.cc b/methods/rred.cc index 6fa57f3a6..27d95bdde 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -174,7 +174,7 @@ int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, hash); /* read the rest from infile */ - if (result > 0) { + if (result >= 0) { while (fgets(buffer, BUF_SIZE, in_file) != NULL) { written = fwrite(buffer, 1, strlen(buffer), out_file); hash->Add((unsigned char*)buffer, written); -- cgit v1.2.3-70-g09d2 From cdd5a135d9232123dc3650ed1c1cb31d1e24de0b Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 26 Sep 2009 19:45:15 +0200 Subject: Fix some typos from #479997 --- cmdline/apt-cdrom.cc | 2 +- debian/changelog | 2 ++ dselect/install | 4 ++-- methods/connect.cc | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'methods') diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 342b6314a..d804c55e5 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -74,7 +74,7 @@ string pkgCdromTextStatus::PromptLine(const char *Text) bool pkgCdromTextStatus::AskCdromName(string &name) { - cout << _("Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'") << flush; + cout << _("Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'") << flush; name = PromptLine(""); return true; diff --git a/debian/changelog b/debian/changelog index 9d3a0a868..60986ffa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.25) UNRELEASED; urgency=low * po/LINGUAS. Re-disable Hebrew. Closes: #534992 * Fix typo in apt-cache.8.xml: nessasarily * Fix "with with" in apt-get.8.xml + * Fix some of the typos mentioned by the german team + Closes: #479997 -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 diff --git a/dselect/install b/dselect/install index 61d13208e..6779698e0 100755 --- a/dselect/install +++ b/dselect/install @@ -98,8 +98,8 @@ if [ $RES -eq 0 ]; then ;; esac else - echo $"Some errors occurred while unpacking. I'm going to configure the" - echo $"packages that were installed. This may result in duplicate errors" + echo $"Some errors occurred while unpacking. Packages that were installed" + echo $"will be configured. This may result in duplicate errors" echo $"or errors caused by missing dependencies. This is OK, only the errors" echo $"above this message are important. Please fix them and run [I]nstall again" echo $"Press enter to continue." diff --git a/methods/connect.cc b/methods/connect.cc index 355bd5c4d..b5f48907e 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -237,6 +237,6 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, if (_error->PendingError() == true) return false; - return _error->Error(_("Unable to connect to %s %s:"),Host.c_str(),ServStr); + return _error->Error(_("Unable to connect to %s:%s:"),Host.c_str(),ServStr); } /*}}}*/ -- cgit v1.2.3-70-g09d2 From f465a80f6e0e0cc3edae1870881135ced824c9e3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 12 Oct 2009 16:24:34 +0200 Subject: methods/https.cc: Add support for authentication using netrc (Closes: #518473), patch by Jussi Hakala . --- debian/changelog | 3 +++ methods/https.cc | 1 + 2 files changed, 4 insertions(+) (limited to 'methods') diff --git a/debian/changelog b/debian/changelog index 34a35b2f9..68ee83bac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.7.25) UNRELEASED; urgency=low - Restrict option names to alphanumerical characters and "/-:._+". - Deprecate #include, we have apt.conf.d nowadays which should be sufficient. + * methods/https.cc: + - Add support for authentication using netrc (Closes: #518473), patch + by Jussi Hakala . -- Michael Vogt Tue, 29 Sep 2009 15:51:34 +0200 diff --git a/methods/https.cc b/methods/https.cc index 37d93e308..79e6fea3f 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -135,6 +135,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); curl_easy_setopt(curl, CURLOPT_FILETIME, true); + curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); // SSL parameters are set by default to the common (non mirror-specific) value // if available (or a default one) and gets overload by mirror-specific ones. -- cgit v1.2.3-70-g09d2