Mercurial > hgrepos > FreeBSD > ports > www > uwsginl

comparison files/patch-core_socket.c @ 174:72804fc47f7c origin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to latest snapshot of 2.0.28. Has been tagged at 2024-10-26.
author Franz Glasner <fzglas.hg@dom66.de>
date Sat, 08 Mar 2025 19:34:51 +0100
parents
children
comparison
equal deleted inserted replaced
168:df2620ce614c 174:72804fc47f7c
1 Fix SOCK_NONBLOCK handling for FreeBSD, copied from NetBSD.
2 --- core/socket.c.orig 2024-06-05 01:53:18 UTC
3 +++ core/socket.c
4 @@ -413,7 +413,7 @@ static int connect_to_unix(char *socket_name, int time
5 memcpy(uws_addr.sun_path, socket_name, UMIN(strlen(socket_name), 102));
6 }
7
8 -#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
9 +#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
10 uwsgi_poll.fd = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0);
11 #else
12 uwsgi_poll.fd = socket(AF_UNIX, SOCK_STREAM, 0);
13 @@ -453,7 +453,7 @@ static int connect_to_tcp(char *socket_name, int port,
14 uws_addr.sin_addr.s_addr = inet_addr(socket_name);
15 }
16
17 -#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
18 +#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
19 uwsgi_poll.fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
20 #else
21 uwsgi_poll.fd = socket(AF_INET, SOCK_STREAM, 0);
22 @@ -827,7 +827,7 @@ int timed_connect(struct pollfd *fdpoll, const struct
23 int cnt;
24 /* set non-blocking socket */
25
26 -#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
27 +#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
28 // hmm, nothing to do, as we are already non-blocking
29 #else
30 int arg = fcntl(fdpoll->fd, F_GETFL, NULL);
31 @@ -861,7 +861,7 @@ int timed_connect(struct pollfd *fdpoll, const struct
32 }
33
34
35 -#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
36 +#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
37 uwsgi_socket_b(fdpoll->fd);
38 #else
39 /* re-set blocking socket */
40 @@ -1907,7 +1907,7 @@ int uwsgi_accept(int server_fd) {
41 struct sockaddr_un client_src;
42 memset(&client_src, 0, sizeof(struct sockaddr_un));
43 socklen_t client_src_len = 0;
44 -#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
45 +#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
46 return accept4(server_fd, (struct sockaddr *) &client_src, &client_src_len, SOCK_NONBLOCK);
47 #elif defined(__linux__)
48 int client_fd = accept(server_fd, (struct sockaddr *) &client_src, &client_src_len);