Browse Source
Also fix compilation error with ndk r18. Also remove use of aio due to seccomp filter.android-5
Fredrik Fornwall
6 years ago
4 changed files with 46 additions and 4 deletions
@ -0,0 +1,12 @@ |
|||
diff -u -r ../nginx-1.15.3/src/core/ngx_cycle.c ./src/core/ngx_cycle.c
|
|||
--- ../nginx-1.15.3/src/core/ngx_cycle.c 2018-08-28 15:36:00.000000000 +0000
|
|||
+++ ./src/core/ngx_cycle.c 2018-09-19 22:13:38.876609223 +0000
|
|||
@@ -1130,7 +1130,7 @@
|
|||
continue; |
|||
} |
|||
|
|||
-#if !(NGX_WIN32)
|
|||
+#if !(NGX_WIN32) && !defined(__ANDROID__)
|
|||
if (user != (ngx_uid_t) NGX_CONF_UNSET_UINT) { |
|||
ngx_file_info_t fi; |
|||
|
@ -0,0 +1,12 @@ |
|||
diff -u -r ../nginx-1.15.3/src/core/ngx_file.c ./src/core/ngx_file.c
|
|||
--- ../nginx-1.15.3/src/core/ngx_file.c 2018-08-28 15:36:00.000000000 +0000
|
|||
+++ ./src/core/ngx_file.c 2018-09-19 22:12:25.665430137 +0000
|
|||
@@ -618,7 +618,7 @@
|
|||
continue; |
|||
} |
|||
|
|||
-#if !(NGX_WIN32)
|
|||
+#if !(NGX_WIN32) && !defined(__ANDROID__)
|
|||
{ |
|||
ngx_file_info_t fi; |
|||
|
@ -0,0 +1,20 @@ |
|||
diff -u -r ../nginx-1.15.3/src/event/modules/ngx_epoll_module.c ./src/event/modules/ngx_epoll_module.c
|
|||
--- ../nginx-1.15.3/src/event/modules/ngx_epoll_module.c 2018-08-28 15:36:00.000000000 +0000
|
|||
+++ ./src/event/modules/ngx_epoll_module.c 2018-09-19 21:55:21.381079239 +0000
|
|||
@@ -591,16 +591,12 @@
|
|||
if (event == NGX_READ_EVENT) { |
|||
e = c->write; |
|||
prev = EPOLLOUT; |
|||
-#if (NGX_READ_EVENT != EPOLLIN|EPOLLRDHUP)
|
|||
events = EPOLLIN|EPOLLRDHUP; |
|||
-#endif
|
|||
|
|||
} else { |
|||
e = c->read; |
|||
prev = EPOLLIN|EPOLLRDHUP; |
|||
-#if (NGX_WRITE_EVENT != EPOLLOUT)
|
|||
events = EPOLLOUT; |
|||
-#endif
|
|||
} |
|||
|
|||
if (e->active) { |
Loading…
Reference in new issue