]> git.ipfire.org Git - thirdparty/squid.git/log
thirdparty/squid.git
15 years agoMerge from trunk
Amos Jeffries [Sun, 23 May 2010 12:00:47 +0000 (00:00 +1200)] 
Merge from trunk

15 years agobuild errors after trunk update to IpAddress
Amos Jeffries [Sun, 23 May 2010 11:59:28 +0000 (23:59 +1200)] 
build errors after trunk update to IpAddress

15 years agoAuthor: Various Translators
Amos Jeffries [Sun, 23 May 2010 00:01:59 +0000 (12:01 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoWrap extra IPv6 comm failover cases properly.
Amos Jeffries [Sat, 22 May 2010 05:59:58 +0000 (17:59 +1200)] 
Wrap extra IPv6 comm failover cases properly.

15 years agoAuthor: Alex Rousskov <rousskov@measurement-factory.com>
Amos Jeffries [Sat, 22 May 2010 03:55:41 +0000 (15:55 +1200)] 
Author: Alex Rousskov <rousskov@measurement-factory.com>
Bug 2879: pt2: 3.0 regression in headers end finding

Consider the case when we received an empty (zero bytes) response.

The committed hack (bzr r9935) makes the "Invalid Response" warning misleading
because it adds CRLF to the empty response. The same hack makes the correct
error determination even more broken than it was (because the rest of the code
now sees content when none exited). It also mentions the wrong bug number.

The attached patch fixes the above and attempts to route empty response
processing to the right error (ERR_ZERO_SIZE_OBJECT).

TODO: Reconsider polluting cache.log with unlimited Invalid Response warnings,
at least in a forward proxy environment where the admin has no control over
responses.

15 years agoSourceFormat Enforcement
Automatic source maintenance [Sat, 22 May 2010 00:13:00 +0000 (18:13 -0600)] 
SourceFormat Enforcement

15 years agoBug 2896 fix: assertion failed: comm.cc:2063: "!fd_table[fd].closing()"
Alex Rousskov [Sat, 22 May 2010 00:07:57 +0000 (18:07 -0600)] 
Bug 2896 fix: assertion failed: comm.cc:2063: "!fd_table[fd].closing()"

When comm_close() has been called for the server fd but the close handler has
not yet been activated, the Server may receive an async call not associated
with the fd (e.g., more request body data coming from the HTTP or ICAP client)
that prompts the server to write to the fd.  We now check whether it is still
safe to write before writing. If it is not safe, we do not write but wait for
our close handler to be called.

TODO: when all comm_write callers check for fd closing, comm API can be
redefined to drop unsafe calls instead of asserting.

15 years agoAuthor: Various Translators
Amos Jeffries [Sat, 15 May 2010 18:00:41 +0000 (06:00 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoReset all addresses as OK after trying them all. This to avoid a "deadlock"
Henrik Nordstrom [Fri, 14 May 2010 12:34:31 +0000 (14:34 +0200)] 
Reset all addresses as OK after trying them all. This to avoid a "deadlock"
when all addresses of the currnet procotol have been marked bad but
there remains addresses in another protocol which means there is no addresses
we can connect to but unfortunately we don't know that in the current
upside-down layering.

15 years agoBug #2876: FD_SETSIZE override not working on all linux distributions
Henrik Nordstrom [Fri, 14 May 2010 12:05:27 +0000 (14:05 +0200)] 
Bug #2876: FD_SETSIZE override not working on all linux distributions

The glibc hack for overriding FD_SETSIZE seems to have broken down on some families
of Linux distribution, requiring one more header to be included before redefine.

Hopefully this does not break the FD_SETSIZE override on more systems than
it fixes.. if it does then some additional autoconffuu will be needed.

15 years agoFall back on IPv4 if IPv6 is not present
Henrik Nordstrom [Fri, 14 May 2010 05:37:19 +0000 (07:37 +0200)] 
Fall back on IPv4 if IPv6 is not present

automatically fall back on IPv4 operation if it fails creating an
IPv6 socket. This may happen if Squid is built with IPv6 support
enabled but no IPv6 stack is available when it runs.

15 years agoFix non-IPv6 build failure introduced by the commResetFD cleanup
Henrik Nordstrom [Fri, 14 May 2010 05:29:55 +0000 (07:29 +0200)] 
Fix non-IPv6 build failure introduced by the commResetFD cleanup

15 years agoClean up use of commResetFD when socket incompatible with requested address
Henrik Nordstrom [Fri, 14 May 2010 04:04:53 +0000 (06:04 +0200)] 
Clean up use of commResetFD when socket incompatible with requested address

This patch backs out part of the patch for Bug #2222 and replaces it by
crudely cycling over the available addresses, trying to skip over
addresses not compatible with the current socket.

This solves issues seen when using tproxy or tcp_outgoing_address and
DNS of the requested host returns AAAA records in addition to A records.

This change is interim, waiting for the larger connection setup
overhaul, but seems to do the trick for now.

One effect of this change is that there will be no fallback to the other
IP generation if the socket is configured to a specific outgoing
address. Priory the code threw away the outgoing address and tried
again when encountering an incompatibility.

15 years agoMerging fix from autoconf-refactor branch.
Francesco Chemolli [Thu, 13 May 2010 15:27:12 +0000 (17:27 +0200)] 
Merging fix from autoconf-refactor branch.

15 years agoFixed bug in configure which would prevent properly detecting epoll availability.
Francesco Chemolli [Thu, 13 May 2010 15:25:16 +0000 (17:25 +0200)] 
Fixed bug in configure which would prevent properly detecting epoll availability.

15 years agoRenamed config define FORW_VIA_DB to standard USE_FORW_VIA_DB
Francesco Chemolli [Thu, 13 May 2010 15:08:27 +0000 (17:08 +0200)] 
Renamed config define FORW_VIA_DB to standard USE_FORW_VIA_DB

15 years agoReworded unbalanced apostrophes to help syntax parsers in editors.
Francesco Chemolli [Thu, 13 May 2010 14:54:19 +0000 (16:54 +0200)] 
Reworded unbalanced apostrophes to help syntax parsers in editors.

15 years agoMerged from trunk
Francesco Chemolli [Thu, 13 May 2010 14:36:54 +0000 (16:36 +0200)] 
Merged from trunk

15 years agoMerge from trunk
Amos Jeffries [Thu, 13 May 2010 06:20:23 +0000 (18:20 +1200)] 
Merge from trunk

15 years agoAuthor: Alex Rousskov <rousskov@squid-cache.org>
Amos Jeffries [Thu, 13 May 2010 06:16:33 +0000 (18:16 +1200)] 
Author: Alex Rousskov <rousskov@squid-cache.org>
Bug 2896: assertion failed: comm.cc:2063: !fd_table[fd].closing()

15 years agoAuthor: Various Translators
Amos Jeffries [Wed, 12 May 2010 12:01:09 +0000 (00:01 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoAuthor: Various Translators
Amos Jeffries [Tue, 11 May 2010 12:00:54 +0000 (00:00 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoSourceFormat Enforcement
Automatic source maintenance [Tue, 11 May 2010 00:13:13 +0000 (18:13 -0600)] 
SourceFormat Enforcement

15 years agoKill unused DNS_CNAME code
Henrik Nordstrom [Mon, 10 May 2010 20:41:56 +0000 (22:41 +0200)] 
Kill unused DNS_CNAME code

15 years agoRestore LINUX_NETFILTER define which got lost as part of the autoconf refactoring
Henrik Nordstrom [Mon, 10 May 2010 20:40:18 +0000 (22:40 +0200)] 
Restore LINUX_NETFILTER define which got lost as part of the autoconf refactoring

15 years agoRevert unintended "res == 0" change which sneaked in as part of killing rfc1035_errno...
Henrik Nordstrom [Mon, 10 May 2010 20:39:35 +0000 (22:39 +0200)] 
Revert unintended "res == 0" change which sneaked in as part of killing rfc1035_errno & error_messages

15 years agoAuthor: Various Translators
Amos Jeffries [Mon, 10 May 2010 18:01:13 +0000 (06:01 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoRevert revision 10471 due to mixed commit. Proper commit in a few seconds
Henrik Nordstrom [Mon, 10 May 2010 14:53:23 +0000 (16:53 +0200)] 
Revert revision 10471 due to mixed commit. Proper commit in a few seconds

15 years agoRevert unintended "res == 0" change which sneaked in as part of killing rfc1035_errno...
Henrik Nordstrom [Mon, 10 May 2010 13:16:13 +0000 (15:16 +0200)] 
Revert unintended "res == 0" change which sneaked in as part of killing rfc1035_errno & error_messages

15 years agoRemove debugging assert on shutdown.
Amos Jeffries [Mon, 10 May 2010 12:48:30 +0000 (00:48 +1200)] 
Remove debugging assert on shutdown.

15 years agoSourceFormat Enforcement
Automatic source maintenance [Mon, 10 May 2010 00:13:03 +0000 (18:13 -0600)] 
SourceFormat Enforcement

15 years agoKill rfc1035_errno & error_message globals. We always have the error code available...
Henrik Nordstrom [Sun, 9 May 2010 14:25:58 +0000 (16:25 +0200)] 
Kill rfc1035_errno & error_message globals. We always have the error code available anyway

15 years agoKill rfc1035_errno & error_message globals. We always have the error code available...
Henrik Nordstrom [Sun, 9 May 2010 14:21:38 +0000 (16:21 +0200)] 
Kill rfc1035_errno & error_message globals. We always have the error code available anyway

15 years agoAuthor: Various Translators
Amos Jeffries [Fri, 7 May 2010 12:00:38 +0000 (00:00 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoAdd manuals translations: Italian, Romanian, Occitan
Amos Jeffries [Fri, 7 May 2010 03:29:37 +0000 (15:29 +1200)] 
Add manuals translations: Italian, Romanian, Occitan

15 years agoAuthor: Various Translators
Amos Jeffries [Thu, 6 May 2010 12:00:55 +0000 (00:00 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoUnify auth schemes credential states.
Amos Jeffries [Thu, 6 May 2010 11:07:19 +0000 (23:07 +1200)] 
Unify auth schemes credential states.

Each scheme was maintaining it's own fields about what the state of the
credentials was.
This allows code to determine the state of the credentials easily.
Username cache can also display the credential state of any auth type now.

Tested on Basic, not yet tested for Digest, NTLM, Negotiate.

Also: fixed error where Negotiate always reported no program configured.

15 years agoMerged from trunk
Francesco Chemolli [Thu, 6 May 2010 08:08:15 +0000 (10:08 +0200)] 
Merged from trunk

15 years agoCombine Basic auth credentials_checkedtime with auth expiretime fields.
Amos Jeffries [Wed, 5 May 2010 13:47:23 +0000 (01:47 +1200)] 
Combine Basic auth credentials_checkedtime with auth expiretime fields.

15 years agoMake proxy_auth ACL fail on invalid auth credentials.
Amos Jeffries [Wed, 5 May 2010 12:25:14 +0000 (00:25 +1200)] 
Make proxy_auth ACL fail on invalid auth credentials.

15 years agoAuthor: Various Translators
Amos Jeffries [Wed, 5 May 2010 12:01:09 +0000 (00:01 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoDrop obsolete auth_type from ConnState.
Amos Jeffries [Tue, 4 May 2010 12:33:30 +0000 (00:33 +1200)] 
Drop obsolete auth_type from ConnState.

15 years agoAuthor: Various Translators
Amos Jeffries [Tue, 4 May 2010 12:01:44 +0000 (00:01 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoSourceFormat Enforcement
Automatic source maintenance [Tue, 4 May 2010 00:13:03 +0000 (18:13 -0600)] 
SourceFormat Enforcement

15 years agoMerged from trunk
Francesco Chemolli [Mon, 3 May 2010 11:57:50 +0000 (13:57 +0200)] 
Merged from trunk

15 years agoAuthor: Wojciech Zatorski <zator@bg.szczecin.pl>
Amos Jeffries [Mon, 3 May 2010 09:24:14 +0000 (21:24 +1200)] 
Author: Wojciech Zatorski <zator@bg.szczecin.pl>
Bug 2919: tcp_outgoing_address ACLs not obeying acl_uses_indirect_client

15 years agoMerged from trunk
Francesco Chemolli [Mon, 3 May 2010 08:50:41 +0000 (10:50 +0200)] 
Merged from trunk

15 years agoSourceFormat Enforcement
Automatic source maintenance [Mon, 3 May 2010 00:13:05 +0000 (18:13 -0600)] 
SourceFormat Enforcement

15 years agoCleanup IpAddress -> Ip::Address transition
Henrik Nordstrom [Sun, 2 May 2010 20:30:07 +0000 (22:30 +0200)] 
Cleanup IpAddress -> Ip::Address transition

  - ip/forward.h header for forward declaration in an portable manner
  - Rename ip/IpAddress to ip/Address to reflect the new class name

15 years agoMerged from trunk
Henrik Nordstrom [Sun, 2 May 2010 20:26:09 +0000 (22:26 +0200)] 
Merged from trunk

15 years agodist ip/forward.h
Henrik Nordstrom [Sun, 2 May 2010 20:25:41 +0000 (22:25 +0200)] 
dist ip/forward.h

15 years agoRename SQUID_DEFINED_UNQUOTED to SQUID_DEFINE_BOOL to reflect it's function, and...
Henrik Nordstrom [Sun, 2 May 2010 20:24:31 +0000 (22:24 +0200)] 
Rename SQUID_DEFINED_UNQUOTED to SQUID_DEFINE_BOOL to reflect it's function, and fix it to behave as specified

15 years agoCorrect --with-openssl processing when not given
Henrik Nordstrom [Sun, 2 May 2010 20:21:27 +0000 (22:21 +0200)] 
Correct --with-openssl processing when not given

15 years agorename ip/IpAddress to ip/Address to better reflect the class name after namespace...
Henrik Nordstrom [Sun, 2 May 2010 19:32:42 +0000 (21:32 +0200)] 
rename ip/IpAddress to ip/Address to better reflect the class name after namespace change

15 years agoMerged from trunk
Henrik Nordstrom [Sun, 2 May 2010 18:53:34 +0000 (20:53 +0200)] 
Merged from trunk

15 years agoAdd ip/forward.h for forward declaration of Ip:: classes (Ip::Address)
Henrik Nordstrom [Sun, 2 May 2010 18:52:45 +0000 (20:52 +0200)] 
Add ip/forward.h for forward declaration of Ip:: classes (Ip::Address)

15 years agorename generated fragments to .cci to avoid misunderstandings (was .h). Applies to...
Henrik Nordstrom [Sun, 2 May 2010 18:51:26 +0000 (20:51 +0200)] 
rename generated fragments to .cci to avoid misunderstandings (was .h). Applies to cf_parser.cci and cf_gen_defines.cci

15 years agoResurrect --with(out)-openssl. Controls if openssl should be used, not the same as...
Henrik Nordstrom [Sun, 2 May 2010 18:47:44 +0000 (20:47 +0200)] 
Resurrect --with(out)-openssl. Controls if openssl should be used, not the same as --enable-ssl

15 years agoPrep for 3.1.3
Amos Jeffries [Sun, 2 May 2010 10:23:29 +0000 (22:23 +1200)] 
Prep for 3.1.3

15 years agoACL Tag requires request not conn
Amos Jeffries [Sun, 2 May 2010 09:30:17 +0000 (21:30 +1200)] 
ACL Tag requires request not conn

15 years agoMerge validate wrapper into AuthuerRequest
Amos Jeffries [Sun, 2 May 2010 09:10:08 +0000 (21:10 +1200)] 
Merge validate wrapper into AuthuerRequest

15 years agoCorrect OS wrapper in EUI code
Amos Jeffries [Sun, 2 May 2010 08:26:28 +0000 (20:26 +1200)] 
Correct OS wrapper in EUI code

15 years agoRemove old authenticateValidateUser wrapper
Amos Jeffries [Sun, 2 May 2010 06:58:12 +0000 (18:58 +1200)] 
Remove old authenticateValidateUser wrapper

15 years agoRemove obsolete auth code from FilleDchecklist
Amos Jeffries [Sun, 2 May 2010 06:21:21 +0000 (18:21 +1200)] 
Remove obsolete auth code from FilleDchecklist

15 years agoPrevent automake building empty AuthTypes.cc
Amos Jeffries [Sun, 2 May 2010 06:18:21 +0000 (18:18 +1200)] 
Prevent automake building empty AuthTypes.cc

15 years agoMerge from trunk
Amos Jeffries [Sun, 2 May 2010 04:41:55 +0000 (16:41 +1200)] 
Merge from trunk

15 years agoSourceFormat Enforcement
Automatic source maintenance [Sun, 2 May 2010 00:13:07 +0000 (18:13 -0600)] 
SourceFormat Enforcement

15 years agoFixed smb_lm ntlm helper debugging
Francesco Chemolli [Sat, 1 May 2010 19:18:36 +0000 (21:18 +0200)] 
Fixed smb_lm ntlm helper debugging

15 years agoPrep for 3.1.2
Amos Jeffries [Sat, 1 May 2010 08:51:52 +0000 (20:51 +1200)] 
Prep for 3.1.2

15 years agoMake Ip::Address < operator work with NOADDR
Amos Jeffries [Sat, 1 May 2010 07:42:29 +0000 (01:42 -0600)] 
Make Ip::Address < operator work with NOADDR

15 years agoSourceFormat Enforcement
Automatic source maintenance [Sat, 1 May 2010 00:13:01 +0000 (18:13 -0600)] 
SourceFormat Enforcement

15 years agoFixed more symbol overlapping in ntlm_auth/smb_lm helper
Francesco Chemolli [Fri, 30 Apr 2010 12:57:34 +0000 (14:57 +0200)] 
Fixed more symbol overlapping in ntlm_auth/smb_lm helper

15 years agoTranslation .POT updates
Amos Jeffries [Fri, 30 Apr 2010 12:22:53 +0000 (00:22 +1200)] 
Translation .POT updates

15 years agoNaming upgrade of digest_pw_auth (now digest_file_auth)
Amos Jeffries [Fri, 30 Apr 2010 12:08:54 +0000 (00:08 +1200)] 
Naming upgrade of digest_pw_auth (now digest_file_auth)

15 years agoPortability fixes.
Francesco Chemolli [Fri, 30 Apr 2010 09:49:24 +0000 (11:49 +0200)] 
Portability fixes.

15 years agoFixed symbol clash in group ldap authorization helper.
Francesco Chemolli [Fri, 30 Apr 2010 05:48:30 +0000 (07:48 +0200)] 
Fixed symbol clash in group ldap authorization helper.

15 years agoFixed symbol clash in digest ldap auth helper.
Francesco Chemolli [Thu, 29 Apr 2010 21:53:41 +0000 (23:53 +0200)] 
Fixed symbol clash in digest ldap auth helper.

15 years agoFixed symbol clash in eDirectory auth helper.
Francesco Chemolli [Thu, 29 Apr 2010 15:41:11 +0000 (17:41 +0200)] 
Fixed symbol clash in eDirectory auth helper.

15 years agoDrop obsolete RADIUS auth makefiles
Amos Jeffries [Thu, 29 Apr 2010 13:53:04 +0000 (01:53 +1200)] 
Drop obsolete RADIUS auth makefiles

15 years agoAuthor: Various Translators
Amos Jeffries [Wed, 28 Apr 2010 18:02:07 +0000 (06:02 +1200)] 
Author: Various Translators
Translations Update auto-save

15 years agoAuthor: Clytie Siddall <clytie@riverland.net.au>
Amos Jeffries [Wed, 28 Apr 2010 15:57:00 +0000 (03:57 +1200)] 
Author: Clytie Siddall <clytie@riverland.net.au>
Typo in URN error template

15 years agoFurther fix to the Profile build-bug on unsupported platforms.
Francesco Chemolli [Wed, 28 Apr 2010 14:53:19 +0000 (16:53 +0200)] 
Further fix to the Profile build-bug on unsupported platforms.

15 years agoPortability fix for profiler on CPU/OS combos where it's not supported.
Francesco Chemolli [Wed, 28 Apr 2010 10:21:46 +0000 (12:21 +0200)] 
Portability fix for profiler on CPU/OS combos where it's not supported.

15 years agoMerge from trunk
Amos Jeffries [Wed, 28 Apr 2010 05:21:24 +0000 (17:21 +1200)] 
Merge from trunk

15 years agoAuthor: gkeeling <grm___k@hotmail.com>
Amos Jeffries [Tue, 27 Apr 2010 13:24:55 +0000 (01:24 +1200)] 
Author: gkeeling <grm___k@hotmail.com>
Bug 2860: pt2; correct IP match logics

Earlier patch incorrectly altered the IP matching tests. Preventing a
match from being possible.

15 years agoEnsure the PID file directory exists on install.
Amos Jeffries [Tue, 27 Apr 2010 12:23:15 +0000 (00:23 +1200)] 
Ensure the PID file directory exists on install.

/var/run may not be the location installed to now and squid -k signals will
not work if the PID file cannot be opened due to missing diretories.

15 years agoMerged from trunk
Francesco Chemolli [Tue, 27 Apr 2010 11:23:35 +0000 (13:23 +0200)] 
Merged from trunk

15 years agoRevert AC_INCLUDES_DEFAULT change.
Francesco Chemolli [Tue, 27 Apr 2010 11:23:10 +0000 (13:23 +0200)] 
Revert AC_INCLUDES_DEFAULT change.

15 years agoMerged from trunk
Francesco Chemolli [Tue, 27 Apr 2010 10:31:39 +0000 (12:31 +0200)] 
Merged from trunk

15 years agoPortability fix: improve detecition of libdb-related headers.
Francesco Chemolli [Tue, 27 Apr 2010 10:17:20 +0000 (12:17 +0200)] 
Portability fix: improve detecition of libdb-related headers.

15 years agoEnsure BasicAuthQueueNode is NULL on allocation
Amos Jeffries [Tue, 27 Apr 2010 08:12:14 +0000 (20:12 +1200)] 
Ensure BasicAuthQueueNode is NULL on allocation

15 years agoBackout invalid --enable-mem-gen-trace refactoring
Henrik Nordstrom [Mon, 26 Apr 2010 22:32:58 +0000 (00:32 +0200)] 
Backout invalid --enable-mem-gen-trace refactoring

15 years agoCompatibility fix: improve detection of SASL libraries.
Francesco Chemolli [Mon, 26 Apr 2010 22:18:43 +0000 (00:18 +0200)] 
Compatibility fix: improve detection of SASL libraries.

15 years agoBug #2913: fix db_auth warning in new perl version
Henrik Nordstrom [Mon, 26 Apr 2010 21:59:49 +0000 (23:59 +0200)] 
Bug #2913: fix db_auth warning in new perl version

15 years agoPortability fix: handle different formal argument lists to PAM conversation structs.
Francesco Chemolli [Mon, 26 Apr 2010 16:31:46 +0000 (18:31 +0200)] 
Portability fix: handle different formal argument lists to PAM conversation structs.

15 years agoForcing some configure options now fails the build if they can't be supported.
Francesco Chemolli [Mon, 26 Apr 2010 07:10:18 +0000 (09:10 +0200)] 
Forcing some configure options now fails the build if they can't be supported.

15 years agoStraighten the reconfigure and rotate sequences auth handling.
Amos Jeffries [Mon, 26 Apr 2010 07:07:44 +0000 (19:07 +1200)] 
Straighten the reconfigure and rotate sequences auth handling.

* Add a hook into auth API to only restart the helpers instead of
  dropping auth state.

* Make reconfigure drop idle state and reset the config for new requests
  to use the new config details.
  This makes auth settings alterable with just a reconfigure now.

15 years agoInterim merge from autoconf-refactor feature-branch.
Francesco Chemolli [Sun, 25 Apr 2010 21:40:51 +0000 (23:40 +0200)] 
Interim merge from autoconf-refactor feature-branch.

15 years agoMerged from trunk
Francesco Chemolli [Sun, 25 Apr 2010 20:56:21 +0000 (22:56 +0200)] 
Merged from trunk

15 years agoAdd details to username_cache display page
Amos Jeffries [Sun, 25 Apr 2010 12:44:10 +0000 (00:44 +1200)] 
Add details to username_cache display page

* Check TTL - time until cached credentials will be re-validated

* Cache TTL - time until cached credentials will be eligable for removal.

* Add: "Next garbage collection in N seconds" - time until next removal.