... identified by Debian lintian tool.
No logic changes in this patch. Just code comment,
documentation and display strings texts.
Changes to squid-3.2.0.6 (04 Apr 2011):
- Regression fix: upgrade existing icons
- - Regression fix: dont crash when accessing an SSL certificate with errors
+ - Regression fix: do not crash when accessing an SSL certificate with errors
- Regression fix: prevent stdio log module segfaults on rotate
- Regression fix: shutdown properly even if a worker process crashes on exit
- Regression Bug 3159: (partial fix) ICAP and --disable-auth compile problems
])
dnl remove duplicates out of a list.
-dnl dnl argument is the name of a variable to be checked and cleaned up
+dnl argument is the name of a variable to be checked and cleaned up
AC_DEFUN([SQUID_CLEANUP_MODULES_LIST],[
squid_cleanup_tmp_outlist=""
for squid_cleanup_tmp in $$1
#if defined(__SUNPRO_CC)
// Solaris 11 needs this before <sys/socket.h> to get the definition for msg_control
-// and possibly other type definitions we dont know about specifically
+// and possibly other type definitions we do not know about specifically
#define _XPG4_2 1
#include <sys/socket.h>
#endif
#endif
)
-dnl *BSD dont include the dependencies for all their net/ and netinet/ files
+dnl *BSD do not include the dependencies for all their net/ and netinet/ files
dnl We must include a few basic type headers for them to work.
AC_CHECK_HEADERS( \
net/if.h \
* of outstanding requests on this session, then send the pdu.
* Returns the request id of the generated packet if applicable, otherwise 1.
* On any error, 0 is returned.
- * The pdu is freed by snmp_send() unless a failure occured.
+ * The pdu is freed by snmp_send() unless a failure occurred.
*/
int snmp_send(struct snmp_session *, struct snmp_pdu *);
#include "util.h"
/**
- \retval NULL An error occured.
- \retval * The fully qualified name (FQDN) of the current host.
- * Pointer is only valid until the next call to the gethost*() functions.
- *
- \todo Make this a squid String result so the duration limit is flexible.
+ * \retval nullptr An error occurred.
+ * \retval * The fully qualified name (FQDN) of the current host.
+ * Pointer is only valid until the next call to the
+ * gethost*() functions.
*/
const char *
getfullhostname(void)
{
const struct hostent *hp = NULL;
+ // TODO: make this dynamic so the duration limit is flexible
static char buf[RFC2181_MAXHOSTNAMELEN + 1];
if (gethostname(buf, RFC2181_MAXHOSTNAMELEN) < 0)
return NULL;
- /** \todo convert this to a getaddrinfo() call */
+ // TODO: convert this to a getaddrinfo() call
if ((hp = gethostbyname(buf)) != NULL)
xstrncpy(buf, hp->h_name, RFC2181_MAXHOSTNAMELEN);
return buf;
* uint32_t le32toh(uint32_t);
*
* XXX: What about unusual byte orders like 3412 or 2143 ?
- * Never had any problems reported, so we dont worry about them.
+ * Never had any problems reported, so we do not worry about them.
*/
#if !HAVE_HTOLE16 && !defined(htole16)
/* We define these as offsets into a char SMB[] array for the */
/* sake of portability */
-/* NOTE!. Some of the leng
ht defines, SMB_<protreq>_len do not include */
+/* NOTE!. Some of the leng
th defines, SMB_<protreq>_len do not include */
/* the data that follows in the SMB packet, so the code will have to */
/* take that into account. */
"There is no such variable name in this MIB.",
"The value given has the wrong type, length, or value",
"This variable is read only",
- "A general failure occured",
+ "A general failure occurred",
/* 0x06 - 0x09 */
/* SNMPv2 Errors */
* registered with it that can create events
*/
EVENT_IDLE = -1,
- /* some error has occured in this engine */
+ /* some error has occurred in this engine */
EVENT_ERROR = -2
};
CacheDigest::CalcMaskSize(uint64_t cap, uint8_t bpe)
{
uint64_t bitCount = (cap * bpe) + 7;
- assert(bitCount < INT_MAX); // dont 31-bit overflow later
+ assert(bitCount < INT_MAX); // do not 31-bit overflow later
return static_cast<uint32_t>(bitCount / 8);
}
/* CommCalls implement AsyncCall interface for comm_* callbacks.
* The classes cover two call dialer kinds:
- * - A C-style call using a function pointer (depricated);
+ * - A C-style call using a function pointer (deprecated);
* - A C++-style call to an AsyncJob child.
* and several comm_* callback kinds:
* - accept (IOACB)
TimeEngine * timeService;
AsyncEngine * primaryEngine;
int loop_delay; /**< the delay to be given to the primary engine */
- bool error; /**< has an error occured in this loop */
+ bool error; /**< has an error occurred in this loop */
bool runOnceResult; /**< the result from runOnce */
};
if (NULL == host)
ipa->setAnyAddr();
- else if ( ipa->GetHostByName(host) ) /* dont use ipcache. Accept either FQDN or IPA. */
+ else if (ipa->GetHostByName(host)) /* do not use ipcache. Accept either FQDN or IPA. */
(void) 0;
else
return false;
bool noDirect = false;
/** Reply with chunked transfer encoding */
bool chunkedReply = false;
- /** set if stream error has occured */
+ /** set if stream error has occurred */
bool streamError = false;
/** internal ssl-bump request to get server cert */
bool sslPeek = false;
case LDAP_ERR_NOTFOUND:
return "Item or object has not been found";
case LDAP_ERR_OTHER:
- return "An unknown error has occured";
+ return "An unknown error has occurred";
case LDAP_ERR_FAILED:
return "Operation has failed";
case LDAP_ERR_SUCCESS:
return "Operation is successful";
default:
- return "An unknown error has occured";
+ return "An unknown error has occurred";
}
}
{
return
!act.active() || // did all (assuming it was originally planned)
- !virgin.body_pipe->expectMoreAfter(act.offset()); // wont have more
+ !virgin.body_pipe->expectMoreAfter(act.offset()); // will not have more
}
// the size of buffered virgin body data available for the specified activity
VirginBodyAct();
void plan(); // the activity may happen; do not consume at or above offset
- void disable(); // the activity wont continue; no consumption restrictions
+ void disable(); // the activity will not continue; no consumption restrictions
bool active() const { return theState == stActive; }
bool disabled() const { return theState == stDisabled; }
void Adaptation::Icap::Xaction::setOutcome(const Adaptation::Icap::XactOutcome &xo)
{
if (al.icap.outcome != xoUnknown) {
- debugs(93, 3, HERE << "Warning: reseting outcome: from " <<
- al.icap.outcome << " to " << xo);
+ debugs(93, 3, "WARNING: resetting outcome: from " << al.icap.outcome << " to " << xo);
} else {
debugs(93, 4, HERE << xo);
}
void cleanup();
/**
- * Cleanup cache data after a reconfiguration has occured.
+ * Cleanup cache data after a reconfiguration has occurred.
* Similar to cleanup() but also flushes stale config dependent
* state from retained entries.
*/
r->auth_user_request->user()->notes.appendNewOnly(&reply.notes);
/* this is okay since we only play with the Auth::Basic::User child fields below
- * and dont pass the pointer itself anywhere */
+ * and do not pass the pointer itself anywhere */
Auth::Basic::User *basic_auth = dynamic_cast<Auth::Basic::User *>(r->auth_user_request->user().getRaw());
assert(basic_auth != NULL);
p = (unsigned char *)ad_data->data;
- debug((char *) "%s| %s: INFO: Got PAC data of lengh %d\n",
+ debug((char *) "%s| %s: INFO: Got PAC data of length %d\n",
LogTime(), PROGRAM, (int)ad_data->length);
/* Skip 16 bytes icommon RPC header
addr->setNoAddr();
else if ( (*addr = token) ) // try parse numeric/IPA
(void) 0;
- else if (addr->GetHostByName(token)) // dont use ipcache
+ else if (addr->GetHostByName(token)) // do not use ipcache
(void) 0;
else { // not an IP and not a hostname
debugs(3, DBG_CRITICAL, "FATAL: invalid IP address or domain name '" << token << "'");
s->s.setIPv4();
debugs(3, 3, portType << "_port: Listen on Host/IP: " << host << " --> " << s->s);
} else if ( s->s.GetHostByName(host) ) { /* check/parse for FQDN */
- /* dont use ipcache */
+ /* do not use ipcache */
s->defaultsite = xstrdup(host);
s->s.port(port);
if (!Ip::EnableIpv6)
static void
parse_icap_class_type()
{
- debugs(93, DBG_CRITICAL, "WARNING: 'icap_class' is depricated. " <<
+ debugs(93, DBG_CRITICAL, "WARNING: 'icap_class' is deprecated. " <<
"Use 'adaptation_service_set' instead");
Adaptation::Config::ParseServiceSet();
}
static void
parse_icap_access_type()
{
- debugs(93, DBG_CRITICAL, "WARNING: 'icap_access' is depricated. " <<
+ debugs(93, DBG_CRITICAL, "WARNING: 'icap_access' is deprecated. " <<
"Use 'adaptation_access' instead");
Adaptation::Config::ParseAccess(LegacyParser);
}
else if (strcasecmp(value, "use_configured_response") == 0) {
config->action = toutActUseConfiguredResponse;
} else {
- debugs(3, DBG_CRITICAL, "FATAL: unsuported \"on_timeout\" action:" << value);
+ debugs(3, DBG_CRITICAL, "FATAL: unsupported \"on_timeout\" action: " << value);
self_destruct();
return;
}
} else if (strcasecmp(key, "response") == 0) {
config->response = xstrdup(value);
} else {
- debugs(3, DBG_CRITICAL, "FATAL: unsuported option " << key);
+ debugs(3, DBG_CRITICAL, "FATAL: unsupported option " << key);
self_destruct();
return;
}
}
if (config->action != toutActUseConfiguredResponse && config->response) {
- debugs(3, DBG_CRITICAL, "FATAL: 'response=' option is valid only when used with the 'on_timeout=use_configured_response' option");
+ debugs(3, DBG_CRITICAL, "FATAL: 'response=' option is valid only when used with the 'on_timeout=use_configured_response' option");
self_destruct();
}
}
The default is to use HTTP request URL as the store ID.
BH
- An internal error occured in the helper, preventing
+ An internal error occurred in the helper, preventing
a result being identified.
In addition to the above kv-pairs Squid also understands the following
delete thisObject;
- /* and tell the prev that the detach has occured */
+ /* and tell the prev that the detach has occurred */
/*
* We do it in thisObject order so that the detaching node is always
* at the end of the list
clientSocketRecipient(clientStreamNode * node, ClientHttpRequest * http,
HttpReply * rep, StoreIOBuffer receivedData)
{
- // dont tryt to deliver if client already ABORTED
+ // do not try to deliver if client already ABORTED
if (!http->getConn() || !cbdataReferenceValid(http->getConn()) || !Comm::IsConnOpen(http->getConn()->clientConnection))
return;
* We call into the stream, because we don't know that there is a
* client socket!
*/
- debugs(88, 5, "clientReplyContext::sendStreamError: A stream error has occured, marking as complete and sending no data.");
+ debugs(88, 5, "A stream error has occurred, marking as complete and sending no data.");
StoreIOBuffer localTempBuffer;
flags.complete = 1;
http->request->flags.streamError = true;
{
acl_checklist = NULL;
if (answer.denied()) {
- http->request->flags.noCache = true; // dont read reply from cache
- http->request->flags.cachable = false; // dont store reply into cache
+ http->request->flags.noCache = true; // do not read reply from cache
+ http->request->flags.cachable = false; // do not store reply into cache
}
http->doCallouts();
}
{
if (!checkAuth(&request->header)) {
/* create appropriate reply */
- SBuf realm(ftpRealm()); // local copy so SBuf wont disappear too early
+ SBuf realm(ftpRealm()); // local copy so SBuf will not disappear too early
HttpReply *reply = ftpAuthRequired(request.getRaw(), realm);
entry->replaceHttpReply(reply);
serverComplete();
#if HAVE_AUTH_MODULE_BASIC
/* add Authenticate header */
// XXX: performance regression. c_str() may reallocate
- SBuf realm(ftpRealm()); // local copy so SBuf wont disappear too early
+ SBuf realm(ftpRealm()); // local copy so SBuf will not disappear too early
newrep->header.putAuth("Basic", realm.c_str());
#endif
debugs(9, 3, HERE << "starting data transfer");
switchTimeoutToDataChannel();
sendMoreRequestBody();
- fwd->dontRetry(true); // dont permit re-trying if the body was sent.
+ fwd->dontRetry(true); // do not permit re-trying if the body was sent.
state = WRITING_DATA;
debugs(9, 3, HERE << "writing data channel");
} else if (code == 150) {
* The returned flag is also placed in params.flag.
*
* \retval Comm::OK data has been read and placed in buf, amount in params.size
- * \retval Comm::COMM_ERROR an error occured, the code is placed in params.xerrno
- * \retval Comm::INPROGRESS unable to read at this time, or a minor error occured
- * \retval Comm::ENDFILE 0-byte read has occured.
+ * \retval Comm::COMM_ERROR an error occurred, the code is placed in params.xerrno
+ * \retval Comm::INPROGRESS unable to read at this time, or a minor error occurred
+ * \retval Comm::ENDFILE 0-byte read has occurred.
* Usually indicates the remote end has disconnected.
*/
Comm::Flag ReadNow(CommIoCbParams ¶ms, SBuf &buf);
* accept() and process
* Wait for an incoming connection on our listener socket.
*
- * \retval Comm::OK success. details parameter filled.
- * \retval Comm::NOMESSAGE attempted accept() but nothing useful came in.
- * \retval Comm::COMM_ERROR an outright failure occured.
- * Or if this client has too many connections already.
+ * \retval Comm::OK success. details parameter filled.
+ * \retval Comm::NOMESSAGE attempted accept() but nothing useful came in.
+ * \retval Comm::COMM_ERROR an outright failure occurred.
+ * Or this client has too many connections already.
*/
Comm::Flag
Comm::TcpAcceptor::oldAccept(Comm::ConnectionPointer &details)
static int init = 0;
if (DnsSocketA < 0 && DnsSocketB < 0) {
- Ip::Address addrV6; // since we don't want to alter Config.Addrs.udp_* and dont have one of our own.
+ Ip::Address addrV6; // since we do not want to alter Config.Addrs.udp_* and do not have one of our own.
if (!Config.Addrs.udp_outgoing.isNoAddr())
addrV6 = Config.Addrs.udp_outgoing;
typedef enum {
STREAM_NONE, /* No particular status */
STREAM_COMPLETE, /* All data has been flushed, no more reads allowed */
- /* an unpredicted end has occured, no more
- * reads occured, but no need to tell
- * downstream that an error occured
+ /* an unpredicted end has occurred, no more
+ * reads occurred, but no need to tell
+ * downstream that an error occurred
*/
STREAM_UNPLANNED_COMPLETE,
- /* An error has occured in this node or an above one,
+ /* An error has occurred in this node or an above one,
* and the node is not generating an error body / it's
* midstream
*/
int oktosend:1;
int finished:1;
- /* an error has occured, send full body replies
+ /* an error has occurred, send full body replies
* regardless. Note that we don't fail midstream
* because we buffer until we can not fail
*/
/* we've been detached from - we can't do anything more */
return ESI_KICK_FAILED;
- /* Something has occured. Process any remaining nodes */
+ /* Something has occurred. Process any remaining nodes */
if (!flags.finished)
/* Process some of our data */
switch (process ()) {
if (dynamic_cast<esiAttempt*>(element.getRaw())) {
if (attempt.getRaw()) {
- debugs(86, DBG_IMPORTANT, "esiTryAdd: Failed for " << this << " - try allready has an attempt node (section 3.4)");
+ debugs(86, DBG_IMPORTANT, "esiTryAdd: Failed for " << this << " - try already has an attempt node (section 3.4)");
return false;
}
#include <cerrno>
/* START Legacy includes pattern */
-/* TODO: clean this up so we dont have per-OS requirements.
+/* TODO: clean this up so we do not have per-OS requirements.
The files are checked for existence individually
and can be wrapped
*/
(*fmt)->quote = a->quote;
// compatibility for old tokens incompatible with Format::Token syntax
-#if USE_OPENSSL // dont bother if we dont have to.
+#if USE_OPENSSL // do not bother unless we have to.
if (strncmp(token, "%USER_CERT_", 11) == 0) {
(*fmt)->type = Format::LFT_EXT_ACL_USER_CERT;
(*fmt)->data.string = xstrdup(token + 11);
if (!key)
return ACCESS_DUNNO; // insufficent data to continue
if (strcmp(key, (char*)entry->key) != 0) {
- debugs(82, 9, "entry key='" << (char *)entry->key << "', our key='" << key << "' dont match. Discarded.");
+ debugs(82, 9, "entry key='" << (char *)entry->key << "', our key='" << key << "' do not match. Discarded.");
// too bad. need a new lookup.
entry = ch->extacl_entry = NULL;
}
std::setfill('0') << std::hex << std::setw(8) << swap_filen <<
" status "<< std::setfill(' ') << std::dec << theFile->error());
- /* Ok, notification past open means an error has occured */
+ /* Ok, notification past open means an error has occurred */
assert (theFile->error());
tryClosing();
}
/* keep a minimum of n_idle helpers free... */
if ( (n_active + n_idle) < n_max) return n_idle;
- /* dont ever start more than n_max processes. */
+ /* do not ever start more than n_max processes. */
return (n_max - n_active);
}
} else if (strncmp(token, "idle=", 5) == 0) {
n_idle = xatoui(token + 5);
if (n_idle < 1) {
- debugs(0, DBG_CRITICAL, "WARNING OVERIDE: Using idle=0 for helpers causes request failures. Overiding to use idle=1 instead.");
+ debugs(0, DBG_CRITICAL, "WARNING OVERRIDE: Using idle=0 for helpers causes request failures. Overriding to use idle=1 instead.");
n_idle = 1;
}
} else if (strncmp(token, "concurrency=", 12) == 0) {
/* simple sanity. */
if (n_startup > n_max) {
- debugs(0, DBG_CRITICAL, "WARNING OVERIDE: Capping startup=" << n_startup << " to the defined maximum (" << n_max <<")");
+ debugs(0, DBG_CRITICAL, "WARNING OVERRIDE: Capping startup=" << n_startup << " to the defined maximum (" << n_max <<")");
n_startup = n_max;
}
if (n_idle > n_max) {
- debugs(0, DBG_CRITICAL, "WARNING OVERIDE: Capping idle=" << n_idle << " to the defined maximum (" << n_max <<")");
+ debugs(0, DBG_CRITICAL, "WARNING OVERRIDE: Capping idle=" << n_idle << " to the defined maximum (" << n_max <<")");
n_idle = n_max;
}
if (limitBuffer < 0 || inBuf.length() >= (SBuf::size_type)limitBuffer) {
// when buffer is at or over limit already
- debugs(11, 7, "wont read up to " << limitBuffer << ". buffer has (" << inBuf.length() << "/" << inBuf.spaceSize() << ") from " << serverConnection);
+ debugs(11, 7, "will not read up to " << limitBuffer << ". buffer has (" << inBuf.length() << "/" << inBuf.spaceSize() << ") from " << serverConnection);
debugs(11, DBG_DATA, "buffer has {" << inBuf << "}");
// Process next response from buffer
processReply();
const size_t read_size = calcBufferSpaceToReserve(inBuf.spaceSize(), (limitBuffer - inBuf.length()));
if (!read_size) {
- debugs(11, 7, "wont read up to " << read_size << " into buffer (" << inBuf.length() << "/" << inBuf.spaceSize() << ") from " << serverConnection);
+ debugs(11, 7, "will not read up to " << read_size << " into buffer (" << inBuf.length() << "/" << inBuf.spaceSize() << ") from " << serverConnection);
return false;
}
- // just report whether we could grow or not, dont actually do it
+ // just report whether we could grow or not, do not actually do it
if (doGrow)
return (read_size >= 2);
// we may need to grow the buffer
inBuf.reserveSpace(read_size);
- debugs(11, 8, (!flags.do_next_read ? "wont" : "may") <<
+ debugs(11, 8, (!flags.do_next_read ? "will not" : "may") <<
" read up to " << read_size << " bytes info buf(" << inBuf.length() << "/" << inBuf.spaceSize() <<
") from " << serverConnection);
// casesensitive comparison (which is required by HTTP errata?)
if (protoPrefix.cmp("ICY", 3) == 0) {
- debugs(57, 3, "Invalid HTTP identifier. Detected ICY protocol istead.");
+ debugs(57, 3, "Invalid HTTP identifier. Detected ICY protocol instead.");
protocol = AnyP::PROTO_ICY;
start += protoPrefix.size();
} else if (protoPrefix.caseCmp(start, protoPrefix.size()) == 0) {
assert(rep);
MemBuf *mb = rep->pack();
- // dump now, so we dont output any body.
+ // dump now, so we do not output any body.
debugs(11, 2, "HTTP Client " << clientConnection);
debugs(11, 2, "HTTP Client REPLY:\n---------\n" << mb->buf << "\n----------");
* identified accurately within limit characters.
* mimeHeaderBlock_ has been updated and buf_ consumed.
*
- * \retval false An error occured, or no mime terminator found within limit.
+ * \retval false An error occurred, or no mime terminator found within limit.
*/
bool grabMimeBlock(const char *which, const size_t limit);
{
public:
TeChunkedParser();
- virtual ~TeChunkedParser() {theOut=NULL;/* we dont own this object */}
+ virtual ~TeChunkedParser() { theOut=nullptr; /* we do not own this object */ }
/// set the buffer to be used to store decoded chunk data
void setPayloadBuffer(MemBuf *parsedContent) {theOut = parsedContent;}
state = new IdentStateData;
state->hash.key = xstrdup(key);
- // copy the conn details. We dont want the original FD to be re-used by IDENT.
+ // copy the conn details. We do not want the original FD to be re-used by IDENT.
state->conn = conn->copyDetails();
// NP: use random port for secure outbound to IDENT_PORT
state->conn->local.port(0);
/*@}*/
/** Retrieve the Port if stored.
- \retval 0 Port is unset or an error occured.
+ \retval 0 Port is unset or an error occurred.
\retval n Port associated with this address in host native -endian.
*/
unsigned short port() const;
/** Set the Port value for an address.
* Replaces any previously existing Port value.
\param port Port being assigned in host native -endian.
- \retval 0 Port is unset or an error occured.
+ \retval 0 Port is unset or an error occurred.
\retval n Port associated with this address in host native -endian.
*/
unsigned short port(unsigned short port);
\param flags Default is NULL, set to IP_LOOKUP_IF_MISS
* to explicitly perform DNS lookups.
*
- \retval NULL An error occured during lookup
+ \retval NULL An error occurred during lookup
\retval NULL No results available in cache and no lookup specified
\retval * Pointer to the ipcahce_addrs structure containing the lookup results
*/
peerConnectSucceded(CachePeer * p)
{
if (!p->tcp_up) {
- debugs(15, 2, "TCP connection to " << p->host << "/" << p->http_port << " succeded");
+ debugs(15, 2, "TCP connection to " << p->host << "/" << p->http_port << " succeeded");
p->tcp_up = p->connect_fail_limit; // NP: so peerAlive(p) works properly.
peerAlive(p);
if (!p->n_addresses)
if (!isAvailable(i))
continue;
- // local end port is required, but dont match.
+ // local end port is required, but do not match.
if (keyCheckPort && aKey->local.port() != theList_[i]->local.port())
continue;
#include "ssl/support.h"
#endif
-/// url maximum lengh + extra informations passed to redirector
+/// url maximum length + extra informations passed to redirector
#define MAX_REDIRECTOR_REQUEST_STRLEN (MAX_URL + 1024)
class RedirectStateData
break;
}
if (add) {
-#if USE_GNUTLS // dont bother otherwise
+#if USE_GNUTLS // do not bother otherwise
if (sslOptions.isEmpty())
sslOptions.append(add+1, strlen(add+1));
else
// because we want to signal the FTP user that we are not fully
// done processing its data stream, even though all data bytes
// have been sent or received already.
- debugs(33, 5, "Transfering from FTP server is not complete");
+ debugs(33, 5, "Transferring from FTP server is not complete");
return;
}
// Adjust our reply if the server aborted with an error before we are done.
if (master->userDataDone == 226 && originDataDownloadAbortedOnError) {
- debugs(33, 5, "Transfering from FTP server terminated with an error, adjust status code");
+ debugs(33, 5, "Transferring from FTP server terminated with an error, adjust status code");
master->userDataDone = 451;
}
completeDataDownload();
PROF_start(HttpServer_parseOneRequest);
// parser is incremental. Generate new parser state if we,
- // a) dont have one already
+ // a) do not have one already
// b) have completed the previous request parsing already
if (!parser_ || !parser_->needsMoreData())
parser_ = new Http1::RequestParser(mayTunnelUnsupportedProto());
i /= (int) dt;
if (Config.warnings.high_pf < i)
- debugs(18, DBG_CRITICAL, "WARNING: Page faults occuring at " << i << "/sec");
+ debugs(18, DBG_CRITICAL, "WARNING: Page faults occurring at " << i << "/sec");
}
}
// readers appeared to care around 2009/12/14 as they skipped reading
// for other reasons. Closing may already be true at the delyaAwareRead
// call time or may happen while we wait after delayRead() above.
- debugs(20, 3, HERE << "wont read from closing " << conn << " for " <<
- callback);
+ debugs(20, 3, "will not read from closing " << conn << " for " << callback);
return; // the read callback will never be called
}
if (!deferredProducer)
deferredProducer = producer;
else
- debugs(20, 5, HERE << "Deferred producer call is allready set to: " <<
+ debugs(20, 5, "Deferred producer call is already set to: " <<
*deferredProducer << ", requested call: " << *producer);
}
/* keep a minimum of n_idle helpers free... */
if ( (n_active + n_idle) < n_max) return n_idle;
- /* dont ever start more than n_max processes. */
+ /* do not ever start more than n_max processes. */
return (n_max - n_active);
}
* This test works by having a customer dispatcher which shuts the loop down
* once its been invoked twice.
*
- * It also tests that loop.run() and loop.stop() work, because if they dont
+ * It also tests that loop.run() and loop.stop() work, because if they do not
* work, this test will either hang, or fail.
*/
/* each AsyncEngine needs to be given a timeout. We want one engine in each
* loop to be given the timeout value - and the rest to have a timeout of 0.
* The last registered engine should be given this timeout, which will mean
- * that we dont block in the loop until the last engine. This will allow for
+ * that we do not block in the loop until the last engine. This will allow for
* dynamic introduction and removal of engines, as long as the last engine
* is one which can do a os call rather than busy waiting.
*
testSBuf::testReserve()
{
SBufReservationRequirements requirements;
- // use unusual numbers to ensure we dont hit a lucky boundary situation
+ // use unusual numbers to ensure we do not hit a lucky boundary situation
requirements.minSpace = 10;
requirements.idealSpace = 82;
requirements.maxCapacity = 259;
uid_t uid;
leave_suid();
uid = geteuid();
- debugs(21, 3, "no_suid: PID " << getpid() << " giving up root priveleges forever");
+ debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever");
if (setuid(0) < 0) {
int xerrno = errno;
*
\param argc Ignored.
\param argv Ignored.
- \retval ERR An error occured removing the file.
+ \retval ERR An error occurred removing the file.
\retval OK The file has been removed.
*/
int
{
Debug::Levels[1] = 8;
debugs (1,1,"test" << "string");
- debugs (1,9,"dont show this" << "string");
+ debugs (1,9,"do not show this" << "string");
debugs (1,1,"test" << "string");
debugs (1,1,"test" << "string");
if (true)
projects / thirdparty / squid.git / commitdiff
