2ecf20024e
update version 1.8.0 OBS-URL: https://build.opensuse.org/request/show/313585 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=52
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
Index: nginx-1.9.1/auto/unix
|
|
===================================================================
|
|
--- nginx-1.9.1.orig/auto/unix
|
|
+++ nginx-1.9.1/auto/unix
|
|
@@ -438,7 +438,11 @@ if [ $NGX_FILE_AIO = YES ]; then
|
|
ngx_feature="Linux AIO support (SYS_eventfd)"
|
|
ngx_feature_incs="#include <linux/aio_abi.h>
|
|
#include <sys/syscall.h>"
|
|
- ngx_feature_test="int n = SYS_eventfd;
|
|
+ ngx_feature_test="#ifdef SYS_eventfd
|
|
+ int n = SYS_eventfd;
|
|
+ #else
|
|
+ int n = SYS_eventfd2;
|
|
+ #endif
|
|
struct iocb iocb;
|
|
iocb.aio_lio_opcode = IOCB_CMD_PREAD;
|
|
iocb.aio_flags = IOCB_FLAG_RESFD;
|
|
Index: nginx-1.9.1/src/event/modules/ngx_epoll_module.c
|
|
===================================================================
|
|
--- nginx-1.9.1.orig/src/event/modules/ngx_epoll_module.c
|
|
+++ nginx-1.9.1/src/event/modules/ngx_epoll_module.c
|
|
@@ -76,9 +76,7 @@ int epoll_wait(int epfd, struct epoll_ev
|
|
|
|
#if (NGX_HAVE_FILE_AIO)
|
|
|
|
-#define SYS_io_setup 245
|
|
-#define SYS_io_destroy 246
|
|
-#define SYS_io_getevents 247
|
|
+#include <sys/syscall.h>
|
|
|
|
typedef u_int aio_context_t;
|
|
|
|
@@ -246,7 +244,11 @@ ngx_epoll_aio_init(ngx_cycle_t *cycle, n
|
|
#if (NGX_HAVE_SYS_EVENTFD_H)
|
|
ngx_eventfd = eventfd(0, 0);
|
|
#else
|
|
+#ifdef SYS_eventfd
|
|
ngx_eventfd = syscall(SYS_eventfd, 0);
|
|
+#else
|
|
+ ngx_eventfd = syscall(SYS_eventfd2, 0, 0);
|
|
+#endif
|
|
#endif
|
|
|
|
if (ngx_eventfd == -1) {
|