annotate files/patch-proto_base.c @ 174:72804fc47f7c origin

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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
174
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1 Fix SOCK_NONBLOCK handling for FreeBSD, copied from NetBSD.
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
2 --- proto/base.c.orig 2024-06-05 02:00:36 UTC
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
3 +++ proto/base.c
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
4 @@ -97,7 +97,7 @@ int uwsgi_proto_base_accept(struct wsgi_request *wsgi_
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
5 int uwsgi_proto_base_accept(struct wsgi_request *wsgi_req, int fd) {
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
6
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
7 wsgi_req->c_len = sizeof(struct sockaddr_un);
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
8 -#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
9 +#if (defined(__linux__) ||defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
10 return accept4(fd, (struct sockaddr *) &wsgi_req->client_addr, (socklen_t *) & wsgi_req->c_len, SOCK_NONBLOCK);
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
11 #elif defined(__linux__)
72804fc47f7c Update to latest snapshot of 2.0.28.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
12 int client_fd = accept(fd, (struct sockaddr *) &wsgi_req->client_addr, (socklen_t *) & wsgi_req->c_len);