diff options
author | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
commit | e110d7bf5675f484c06b82f621ac98bedc464865 (patch) | |
tree | 70ce5da7ad75ccbaf4b30cf4809209993ba98b23 /doc/apt.conf.5.xml | |
parent | 0b58b3f8917a49d83154fd3173bca36c1d617ef0 (diff) | |
parent | 4f6d26b4d41474aa390329b7e9cb167eb70b2821 (diff) |
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
Diffstat (limited to 'doc/apt.conf.5.xml')
-rw-r--r-- | doc/apt.conf.5.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index fcbf20dac..21878e262 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -390,9 +390,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e.g. on high-latency connections. It specifies how many requests are sent in a pipeline. - Previous APT versions had a default of 10 for this setting, but the default value - is now 0 (= disabled) to avoid problems with the ever-growing amount of webservers - and proxies which choose to not conform to the HTTP/1.1 specification.</para> + APT tries to detect and workaround misbehaving webservers and proxies at runtime, but + if you know that yours does not conform to the HTTP/1.1 specification pipelining can + be disabled by setting the value to 0. It is enabled by default with the value 10.</para> <para><literal>Acquire::http::AllowRedirect</literal> controls whether APT will follow redirects, which is enabled by default.</para> |