MonetDB: default - Merge with Sep2022 branch.

[Sjoerd Mullender]

Changeset: 5f2b5308af94 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5f2b5308af94
Modified Files:
        monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:

Merge with Sep2022 branch.


diffs (42 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -791,3 +791,4 @@ 5c50a4071c86d1621e20a885a51cc36f2f23eec4
 41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_11
 41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_SP1_release
 e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_13
+e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_SP2_release
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -89,7 +89,7 @@
 #define accept4(sockfd, addr, addrlen, flags)  accept(sockfd, addr, addrlen)
 #endif
 
-#define SERVERMAXUSERS                 5
+#define SERVERMAXUSERS                 SOMAXCONN
 
 static const char seedChars[] = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 
'j',
        'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
diff --git a/tools/merovingian/daemon/connections.c 
b/tools/merovingian/daemon/connections.c
--- a/tools/merovingian/daemon/connections.c
+++ b/tools/merovingian/daemon/connections.c
@@ -135,7 +135,7 @@ openConnectionIP(int *socks, bool udp, c
                                closesocket(sock);
                                continue;
                        }
-                       if (!udp && listen(sock, 5) == -1) {
+                       if (!udp && listen(sock, SOMAXCONN) == -1) {
                                e = errno;
                                closesocket(sock);
                                continue;
@@ -221,8 +221,7 @@ openConnectionUNIX(int *ret, const char 
        }
        umask(omask);
 
-       /* keep queue of 5 */
-       if (listen(sock, 5) == -1) {
+       if (listen(sock, SOMAXCONN) == -1) {
                closesocket(sock);
                return(newErr("setting UNIX stream socket at %s to listen 
failed: %s",
                                          path, strerror(errno)));
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org