lp://staging/squid
- Get this branch:
- bzr branch lp://staging/squid
Branch merges
Import details
This branch is an import of the HEAD branch of the Git repository at https://github.com/squid-cache/squid.git.
Last successful import was .
Recent revisions
- 15821. By Amos Jeffries <email address hidden>
-
Remove recv-announce tool (#933)
This daemon for receiving send-announce traffic has not
built for many years. - 15820. By Amos Jeffries <email address hidden>
-
Remove CPU profiler mechanism (#931)
The old CPU profiler has not been updated in many years. As a result,
the statistics provided are deceptively incomplete and not sufficient
for their intended purpose of profiling Squids CPU usage. External tools
such as oprofile do a better job despite their differences and some
limitations. - 15819. By Alex Rousskov
-
Bug 5090: Must(!request-
>pinnedConnecti on()) violation (#930) The bug may be asymptomatic. Visible bug symptoms, if any, may include:
FATAL: check failed: !request-
>pinnedConnecti on()
exception location: FwdState.cc(1124) connectStartFATAL: check failed: transportWait
exception location: FwdState.cc(675) noteDestinationsEndFwdState:
:usingDestinati on() should cover 3 post-transportWait periods: 1. peerWait: opening a CONNECT tunnel through the cache_peer
2. encryptionWait: TLS negotiations to secure the connection
3. Comm::IsConnOpen(serverConn) : a Squid-peer transaction The condition for the last period did not account for the time between
FwdState::unregister( ) and FwdState: :complete( ) (or their equivalents),
when the transport connection is either closed or moved to the pconn
pool, but FwdState is still waiting for complete() and must not attempt
to connect to another destination. The bug is usually hidden because
complete() is usually called immediately after unregister(). However,
RESPMOD adaptation (at least) may delay complete(). If peer selection
news comes during that delay, usingDestination() lies, and various
Must()s may fail, depending on Squid version and HTTP request details.Now, FwdState does not rely on the to-peer connection state for the
third period condition. Instead, we explicitly track whether the last
dispatch()ed activity has ended. This tracking is tricky because
complete() may be called without dispatching an asynchronous activity,
and because there are at least three ways for an activity to end:
explicit complete(), explicit handleUnregisteredServerEnd( ), and
implicit serverClosed() connection closure callback. This tracking will
become easier and more reliable when FwdState no longer co-owns/stores
the to-peer connection. This change simplifies the future removal of
that connection ownership.Also reordered usingDestination() conditions to match the chronological
order of the corresponding three periods.Also reordered transportWait-
vs-usingDestina tion() checks to match the
chronological order of those two forwarding stages. - 15818. By Francesco Chemolli
-
Fix build on openbsd 7.0 (#929)
OpenBSD doesn't offer CPU_SET and CPU_ISSET. Implement their stubs as
inline functions to give the compiler proper hints about arguments (non)
use.We have a const-correctness bug in std::unordered_map when supplying an
allocator that OpenBSD is strict about. Fix it.Update buildtest.sh to try and use relative paths first. This prevents
autoconf complaining and failing if the directory path includes
characters from an unsafe set. - 15817. By Fabrice Fontaine
-
Bug 5060: Parallel builds are not reliable (#927)
Create tests directory before using it. Needed since commits 44e802f and
9ba9313.cp ../../src/
tests/stub_ debug.cc tests/stub_debug.cc
cp ../../src/tests/stub_ libmem. cc tests/stub_ libmem. cc
cp: cannot create regular file 'tests/stub_debug. cc':
No such file or directory - 15816. By Christos Tsantilas
-
BUG: Unexpected state while connecting to ... server, part 1 (#916)
These BUG messages (discussed and removed in a recent commit 2b6b1bc)
exposed several bugs. This change fixes a case where a BUG message was
correctly triggered by a Must() violation in Ssl::ServerBio::write( ): check failed: buf[0] == 22
exception location: bio.cc(478)The code expectations reflected in that Must() were wrong: Instead of
sending ClientHello, OpenSSL may also send a TLS Alert (Level: Fatal,
Description: Internal Error), at least. We believe that alert is sent
when SslBump configures OpenSSL to negotiate using unsupported ciphers
or something like that. This change relaxes ServerBio code expectations,
preventing the Must() violation.The Must() violation was causing OpenSSL-related memory leaks. A more
comprehensive solution is needed to avoid similar leaks, but this small
fix helps in a specific (and a fairly common) case.This is a Measurement Factory project.
- 15815. By Christos Tsantilas
-
Remove step2+ stare-and-splice and peek-and-bump support (#926)
Support for these features was successfully disabled (at build time) for
five years. See commit 88a300c for the list of reasons. We did not even
provide an ./configure --enable-... option for it. The corresponding
code does not compile with modern OpenSSL versions, but its mere
presence complicates related code logic and significantly increases
related development efforts. This code is not worth keeping.This is a Measurement Factory project.
- 15814. By Alex Rousskov
-
Fix HappyConnOpener
::checkForNewCo nnection Must(prime) violation (#923) This change addresses a known problem that triggered unwanted C++
exceptions every time Squid selected a to-server persistent connection
as the primary Happy Eyeballs destination/answer. The bug existed since
HappyConnOpener inception (commit 5562295). It did not seem to affect
the connection requestor directly because the HappyConnOpener job sends
the selected pconn to the requestor _before_ throwing.Also adjusted Happy Eyeballs state documentation to reflect a successful
termination state. Before and after this change, we may enter that state
in the middle of checkForNewConnection( ). The less we think about done()
as an _exceptional_ "only on error" or "only at the end of processing"
state, the fewer similar bugs we will create.The code also improved after we abandoned the idea of documenting all
primary state changes in checkForNewConnection( ). There are too many
nuances/changes to document everything anyway, and moving primary track
handling into a dedicated function significantly improves readability. - 15813. By Alex Rousskov
-
Docs: %adapt::sum_trs entries may well exceed %icap::tt (#914)
%icap::tt documentation incorrectly implied that the measurement
includes the entire ICAP transaction(s) lifetime. In reality, individual
ICAP transaction contribution stops with
Adaptation::Icap:: ModXactLauncher ::swanSong( ), which is normally
triggered by Adaptation::Icap:: Launcher: :noteAdaptation Answer( ). Here,
the "answer" does not include the entire ICAP response, but just enough
information to form adapted HTTP message headers (echoed or received).
Thus, a large or slow ICAP response body may result in %adapt::sum_trs
values that far exceed the corresponding %icap::tt "total".This change does not imply that %icap::tt should (not) work differently.
Also fixed a typo in %adapt::all_trs and polished %adapt::sum_trs docs.
- 15812. By Opendium <email address hidden>
-
Bug 5158: AnyP::Uri::host() mishandles [escaped] IPv6 addresses (#920)
When an address is expected to be a string in the form "Host:Port", the
Host MUST be wrapped in square brackets iff it is a numeric IPv6
address. The ":Port" part is usually optional. i.e. "[2001:db8::1]:443"
or "[2001:db8::1]".There are 2 bugs relating to the handling of numeric IPv6 addresses:
* Bug 1: AnyP::Uri:
:host(const char *) is supposed to accept the host
part of a URI, but just copied it into hostAddr_ instead of using the
fromHost() method to set hostAddr_. Since the argument is the host
part of a URI, numeric IPv6 addresses are wrapped in square brackets,
which would never be stripped and hostIsNumeric was therefore not set.
We now use the fromHost() method to process the host name correctly.* Bug 2: Conversely, AnyP::Uri:
:hostOrIp( ) is supposed to return the
host name, suitable for use in a URI or Host header, which means that
numeric IPv6 addresses need to be wrapped in square brackets.
However, that wrapping was never done. We now use the toHostStr()
method to correctly format the string.As far as I know, neither of these bugs actually break anything at the
moment, but they have the potential to break future developments, so
applying this fix should have no operational impact.Also removed wrong IP::Address:
:toStr( ) description from .cc file that
(poorly) duplicated correct description of that method in the header.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)