git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b97c551
)
tidying
author
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 14 May 2024 16:04:58 +0000
(17:04 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 20 May 2024 15:40:05 +0000
(16:40 +0100)
src/src/daemon.c
patch
|
blob
|
history
diff --git
a/src/src/daemon.c
b/src/src/daemon.c
index 88114d648122193bcf11e465813a56737515a89c..9ed8a1c45923db08a14689ecb7673a9c2b62b437 100644
(file)
--- a/
src/src/daemon.c
+++ b/
src/src/daemon.c
@@
-311,7
+311,7
@@
if (smtp_accept_max_per_host)
/* For speed, interpret a decimal number inline here */
else
{
/* For speed, interpret a decimal number inline here */
else
{
- uschar *s = expanded;
+ uschar *
s = expanded;
while (isdigit(*s))
max_for_this_host = max_for_this_host * 10 + *s++ - '0';
if (*s)
while (isdigit(*s))
max_for_this_host = max_for_this_host * 10 + *s++ - '0';
if (*s)
@@
-320,9
+320,9
@@
if (smtp_accept_max_per_host)
}
}
}
}
-/* If we have fewer
connections than max_for_this_host, we can skip the tedious
-per host_address checks. Note that at this stage smtp_accept_count contains the
-count of *other* connections, not including this one. */
+/* If we have fewer
total connections than max_for_this_host, we can skip the
+tedious per host_address checks. Note that at this stage smtp_accept_count
+co
ntains the co
unt of *other* connections, not including this one. */
if (max_for_this_host > 0 && smtp_accept_count >= max_for_this_host)
{
if (max_for_this_host > 0 && smtp_accept_count >= max_for_this_host)
{
@@
-920,7
+920,7
@@
while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
smtp_slots[i] = empty_smtp_slot;
if (--smtp_accept_count < 0) smtp_accept_count = 0;
DEBUG(D_any) debug_printf("%d SMTP accept process%s now running\n",
smtp_slots[i] = empty_smtp_slot;
if (--smtp_accept_count < 0) smtp_accept_count = 0;
DEBUG(D_any) debug_printf("%d SMTP accept process%s now running\n",
- smtp_accept_count,
(smtp_accept_count == 1)
? "" : "es");
+ smtp_accept_count,
smtp_accept_count == 1
? "" : "es");
break;
}
if (i < smtp_accept_max) continue; /* Found an accepting process */
break;
}
if (i < smtp_accept_max) continue; /* Found an accepting process */