flyskype
/
openresty
mirror of https://github.com/openresty/openresty
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugfix: fixed socket_cloexec patch compilation error

Browse Source
pull/342/head
spacewander 8 years ago
parent cbe87cdd6f
commit 7874869f1b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
patches/nginx-1.13.6-socket_cloexec.patch
Unescape Escape View File

@ -1,5 +1,5 @@
diff --git a/auto/unix b/auto/unix diff --git a/auto/unix b/auto/unix
index 10835f6c..16ea377b 100644 index 10835f6c..78a8073a 100644
--- a/auto/unix --- a/auto/unix
+++ b/auto/unix +++ b/auto/unix
@@ -990,3 +990,14 @@ ngx_feature_test='struct addrinfo *res; @@ -990,3 +990,14 @@ ngx_feature_test='struct addrinfo *res;
@ -15,7 +15,7 @@ index 10835f6c..16ea377b 100644
+ngx_feature_path= +ngx_feature_path=
+ngx_feature_libs= +ngx_feature_libs=
+ngx_feature_test="int fd; +ngx_feature_test="int fd;
+ fd = socket(AF_INET, SOCK_STREAM, SOCK_CLOEXEC); + fd = socket(AF_INET, SOCK_STREAM, SOCK_CLOEXEC);"
+. auto/feature +. auto/feature
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 9a747589..56a8a955 100644 index 9a747589..56a8a955 100644
@ -92,7 +92,7 @@ index c5bb8068..b4920655 100644
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0, "%s socket %d", ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0, "%s socket %d",
(type == SOCK_STREAM) ? "stream" : "dgram", s); (type == SOCK_STREAM) ? "stream" : "dgram", s);
diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h
index fcc51533..7dda965c 100644 index fcc51533..74f90cc6 100644
--- a/src/os/unix/ngx_socket.h --- a/src/os/unix/ngx_socket.h
+++ b/src/os/unix/ngx_socket.h +++ b/src/os/unix/ngx_socket.h
@@ -38,6 +38,11 @@ int ngx_blocking(ngx_socket_t s); @@ -38,6 +38,11 @@ int ngx_blocking(ngx_socket_t s);
@ -100,7 +100,7 @@ index fcc51533..7dda965c 100644
#endif #endif
+#define ngx_cloexec(s) fcntl(s, F_SETFD, FD_CLOEXEC) +#define ngx_cloexec(s) fcntl(s, F_SETFD, FD_CLOEXEC)
+#define ngx_cloexec_n(s) "fcntl(FD_CLOEXEC)" +#define ngx_cloexec_n "fcntl(FD_CLOEXEC)"
+ +
+#define HAVE_SOCKET_CLOEXEC_PATCH 1 +#define HAVE_SOCKET_CLOEXEC_PATCH 1
+ +
@ -108,7 +108,7 @@ index fcc51533..7dda965c 100644
int ngx_tcp_push(ngx_socket_t s); int ngx_tcp_push(ngx_socket_t s);
diff --git a/src/os/win32/ngx_socket.h b/src/os/win32/ngx_socket.h diff --git a/src/os/win32/ngx_socket.h b/src/os/win32/ngx_socket.h
index a9e26c29..fb5b622a 100644 index a9e26c29..10e1d82d 100644
--- a/src/os/win32/ngx_socket.h --- a/src/os/win32/ngx_socket.h
+++ b/src/os/win32/ngx_socket.h +++ b/src/os/win32/ngx_socket.h
@@ -31,6 +31,11 @@ int ngx_blocking(ngx_socket_t s); @@ -31,6 +31,11 @@ int ngx_blocking(ngx_socket_t s);
@ -116,7 +116,7 @@ index a9e26c29..fb5b622a 100644
#define ngx_blocking_n "ioctlsocket(!FIONBIO)" #define ngx_blocking_n "ioctlsocket(!FIONBIO)"
+#define ngx_cloexec(s) 1 +#define ngx_cloexec(s) 1
+#define ngx_cloexec_n(s) "" +#define ngx_cloexec_n ""
+ +
+#define HAVE_SOCKET_CLOEXEC_PATCH 1 +#define HAVE_SOCKET_CLOEXEC_PATCH 1
+ +

Write Preview
Loading…
Cancel
Save