nginx/nginx-aio.patch

46 lines
1.6 KiB
Diff
Raw Normal View History

Index: nginx-1.19.1/auto/unix
===================================================================
--- nginx-1.19.1.orig/auto/unix
+++ nginx-1.19.1/auto/unix
@@ -559,7 +559,12 @@ 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>"
- update to 11.4 - Feature: the $upstream_bytes_received variable. - Feature: the $bytes_received, $session_time, $protocol, $status, $upstream_addr, $upstream_bytes_sent, $upstream_bytes_received, $upstream_connect_time, $upstream_first_byte_time, and $upstream_session_time variables in the stream module. - Feature: the ngx_stream_log_module. - Feature: the "proxy_protocol" parameter of the "listen" directive, the $proxy_protocol_addr and $proxy_protocol_port variables in the stream module. - Feature: the ngx_stream_realip_module. - Bugfix: nginx could not be built with the stream module and the ngx_http_ssl_module, but without ngx_stream_ssl_module; the bug had appeared in 1.11.3. - Feature: the IP_BIND_ADDRESS_NO_PORT socket option was not used; the bug had appeared in 1.11.2. - Bugfix: in the "ranges" parameter of the "geo" directive. - Bugfix: an incorrect response might be returned when using the "aio threads" and "sendfile" directives; the bug had appeared in 1.9.13. - drop nginx-1.11.3_ssl_stream.patch again - refreshed the following patches to apply cleanly again check_1.9.2+.patch nginx-1.11.2-html.patch nginx-1.11.2-no_Werror.patch nginx-aio.patch - update to 1.11.3 - Change: now the "accept_mutex" directive is turned off by default. - Feature: now nginx uses EPOLLEXCLUSIVE on Linux. - Feature: the ngx_stream_geo_module. - Feature: the ngx_stream_geoip_module. - Feature: the ngx_stream_split_clients_module. - Feature: variables support in the "proxy_pass" and "proxy_ssl_name" directives in the stream module. - Bugfix: socket leak when using HTTP/2. - Bugfix: in configure tests. Thanks to Piotr Sikora. - backport nginx-1.11.3_ssl_stream.patch from hg - refresh patches to apply cleanly again: - check_1.9.2+.patch - nginx-1.11.2-html.patch - nginx-1.11.2-no_Werror.patch - nginx-aio.patch - enable a few new upstream modules and move some from 1.11.x to dynamic: - stream_geoip_module - mail_ssl_module - stream_ssl_module - build fancyindex unconditionally and update it to 0.4.1 - New `fancyindex_directories_first` configuration directive (enabled by default), which allows setting whether directories are sorted before other files. (Patch by Luke Zapart <<luke@zapart.org>>.) - Fix index files not working when the fancyindex module is in use (#46). - The module can now be built as a [dynamic module](https://www.nginx.com/resources/wiki/extending/converting/). (Patch by Róbert Nagy <<vrnagy@gmail.com>>.) - New configuration directive `fancyindex_show_path`, which allows hiding the `<h1>` header which contains the current path. (Patch by Thomas P. <<tpxp@live.fr>>.) - Directory and file links in listings now have a title="..." attribute. (Patch by `@janglapuk` <<trusdi.agus@gmail.com>>.) - Fix for hung requests when the module is used along with `ngx_pagespeed`. (Patch by Otto van der Schaaf <<oschaaf@we-amp.com>>.) - New feature: Allow filtering out symbolic links using the `fancyindex_hide_symlinks` configuration directive. (Idea and prototype patch by Thomas Wemm.) - New feature: Allow specifying the format of timestamps using the `fancyindex_time_format` configuration directive. (Idea suggested by Xiao Meng <<novoreorx@gmail.com>>). - Listings in top-level directories will not generate a "Parent Directory" link as first element of the listing. (Patch by Thomas P.) - Fix propagation and overriding of the `fancyindex_css_href` setting inside nested locations. - Minor changes in the code to allow building cleanly under Windows with Visual Studio 2013. (Patch by Y. Yuan <<yzwduck@gmail.com>>). - added nginx-rtmp-module - make all modules dynamic that support it: - ngx-fancyindex - headers_more_nginx-module - nginx-rtmp-module - manually install the docs instead of using %doc - unify how we install documentation for the modules - restructure contrib file handling - moved vim files into the normal vim paths so we can use them directly - new BR/R: vim - split out vim files into a subpackage vim-plugin-nginx so we dont have the vim requires on the main package - perl scripts are moved to /usr/share/nginx/ OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=70
2016-09-29 13:13:50 +02:00
- ngx_feature_test="struct iocb iocb;
+ ngx_feature_test="#ifdef SYS_eventfd
+ int n = SYS_eventfd;
+ #else
+ int n = SYS_eventfd2;
+ #endif
- update to 11.4 - Feature: the $upstream_bytes_received variable. - Feature: the $bytes_received, $session_time, $protocol, $status, $upstream_addr, $upstream_bytes_sent, $upstream_bytes_received, $upstream_connect_time, $upstream_first_byte_time, and $upstream_session_time variables in the stream module. - Feature: the ngx_stream_log_module. - Feature: the "proxy_protocol" parameter of the "listen" directive, the $proxy_protocol_addr and $proxy_protocol_port variables in the stream module. - Feature: the ngx_stream_realip_module. - Bugfix: nginx could not be built with the stream module and the ngx_http_ssl_module, but without ngx_stream_ssl_module; the bug had appeared in 1.11.3. - Feature: the IP_BIND_ADDRESS_NO_PORT socket option was not used; the bug had appeared in 1.11.2. - Bugfix: in the "ranges" parameter of the "geo" directive. - Bugfix: an incorrect response might be returned when using the "aio threads" and "sendfile" directives; the bug had appeared in 1.9.13. - drop nginx-1.11.3_ssl_stream.patch again - refreshed the following patches to apply cleanly again check_1.9.2+.patch nginx-1.11.2-html.patch nginx-1.11.2-no_Werror.patch nginx-aio.patch - update to 1.11.3 - Change: now the "accept_mutex" directive is turned off by default. - Feature: now nginx uses EPOLLEXCLUSIVE on Linux. - Feature: the ngx_stream_geo_module. - Feature: the ngx_stream_geoip_module. - Feature: the ngx_stream_split_clients_module. - Feature: variables support in the "proxy_pass" and "proxy_ssl_name" directives in the stream module. - Bugfix: socket leak when using HTTP/2. - Bugfix: in configure tests. Thanks to Piotr Sikora. - backport nginx-1.11.3_ssl_stream.patch from hg - refresh patches to apply cleanly again: - check_1.9.2+.patch - nginx-1.11.2-html.patch - nginx-1.11.2-no_Werror.patch - nginx-aio.patch - enable a few new upstream modules and move some from 1.11.x to dynamic: - stream_geoip_module - mail_ssl_module - stream_ssl_module - build fancyindex unconditionally and update it to 0.4.1 - New `fancyindex_directories_first` configuration directive (enabled by default), which allows setting whether directories are sorted before other files. (Patch by Luke Zapart <<luke@zapart.org>>.) - Fix index files not working when the fancyindex module is in use (#46). - The module can now be built as a [dynamic module](https://www.nginx.com/resources/wiki/extending/converting/). (Patch by Róbert Nagy <<vrnagy@gmail.com>>.) - New configuration directive `fancyindex_show_path`, which allows hiding the `<h1>` header which contains the current path. (Patch by Thomas P. <<tpxp@live.fr>>.) - Directory and file links in listings now have a title="..." attribute. (Patch by `@janglapuk` <<trusdi.agus@gmail.com>>.) - Fix for hung requests when the module is used along with `ngx_pagespeed`. (Patch by Otto van der Schaaf <<oschaaf@we-amp.com>>.) - New feature: Allow filtering out symbolic links using the `fancyindex_hide_symlinks` configuration directive. (Idea and prototype patch by Thomas Wemm.) - New feature: Allow specifying the format of timestamps using the `fancyindex_time_format` configuration directive. (Idea suggested by Xiao Meng <<novoreorx@gmail.com>>). - Listings in top-level directories will not generate a "Parent Directory" link as first element of the listing. (Patch by Thomas P.) - Fix propagation and overriding of the `fancyindex_css_href` setting inside nested locations. - Minor changes in the code to allow building cleanly under Windows with Visual Studio 2013. (Patch by Y. Yuan <<yzwduck@gmail.com>>). - added nginx-rtmp-module - make all modules dynamic that support it: - ngx-fancyindex - headers_more_nginx-module - nginx-rtmp-module - manually install the docs instead of using %doc - unify how we install documentation for the modules - restructure contrib file handling - moved vim files into the normal vim paths so we can use them directly - new BR/R: vim - split out vim files into a subpackage vim-plugin-nginx so we dont have the vim requires on the main package - perl scripts are moved to /usr/share/nginx/ OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=70
2016-09-29 13:13:50 +02:00
+ struct iocb iocb;
iocb.aio_lio_opcode = IOCB_CMD_PREAD;
iocb.aio_flags = IOCB_FLAG_RESFD;
- update to 11.4 - Feature: the $upstream_bytes_received variable. - Feature: the $bytes_received, $session_time, $protocol, $status, $upstream_addr, $upstream_bytes_sent, $upstream_bytes_received, $upstream_connect_time, $upstream_first_byte_time, and $upstream_session_time variables in the stream module. - Feature: the ngx_stream_log_module. - Feature: the "proxy_protocol" parameter of the "listen" directive, the $proxy_protocol_addr and $proxy_protocol_port variables in the stream module. - Feature: the ngx_stream_realip_module. - Bugfix: nginx could not be built with the stream module and the ngx_http_ssl_module, but without ngx_stream_ssl_module; the bug had appeared in 1.11.3. - Feature: the IP_BIND_ADDRESS_NO_PORT socket option was not used; the bug had appeared in 1.11.2. - Bugfix: in the "ranges" parameter of the "geo" directive. - Bugfix: an incorrect response might be returned when using the "aio threads" and "sendfile" directives; the bug had appeared in 1.9.13. - drop nginx-1.11.3_ssl_stream.patch again - refreshed the following patches to apply cleanly again check_1.9.2+.patch nginx-1.11.2-html.patch nginx-1.11.2-no_Werror.patch nginx-aio.patch - update to 1.11.3 - Change: now the "accept_mutex" directive is turned off by default. - Feature: now nginx uses EPOLLEXCLUSIVE on Linux. - Feature: the ngx_stream_geo_module. - Feature: the ngx_stream_geoip_module. - Feature: the ngx_stream_split_clients_module. - Feature: variables support in the "proxy_pass" and "proxy_ssl_name" directives in the stream module. - Bugfix: socket leak when using HTTP/2. - Bugfix: in configure tests. Thanks to Piotr Sikora. - backport nginx-1.11.3_ssl_stream.patch from hg - refresh patches to apply cleanly again: - check_1.9.2+.patch - nginx-1.11.2-html.patch - nginx-1.11.2-no_Werror.patch - nginx-aio.patch - enable a few new upstream modules and move some from 1.11.x to dynamic: - stream_geoip_module - mail_ssl_module - stream_ssl_module - build fancyindex unconditionally and update it to 0.4.1 - New `fancyindex_directories_first` configuration directive (enabled by default), which allows setting whether directories are sorted before other files. (Patch by Luke Zapart <<luke@zapart.org>>.) - Fix index files not working when the fancyindex module is in use (#46). - The module can now be built as a [dynamic module](https://www.nginx.com/resources/wiki/extending/converting/). (Patch by Róbert Nagy <<vrnagy@gmail.com>>.) - New configuration directive `fancyindex_show_path`, which allows hiding the `<h1>` header which contains the current path. (Patch by Thomas P. <<tpxp@live.fr>>.) - Directory and file links in listings now have a title="..." attribute. (Patch by `@janglapuk` <<trusdi.agus@gmail.com>>.) - Fix for hung requests when the module is used along with `ngx_pagespeed`. (Patch by Otto van der Schaaf <<oschaaf@we-amp.com>>.) - New feature: Allow filtering out symbolic links using the `fancyindex_hide_symlinks` configuration directive. (Idea and prototype patch by Thomas Wemm.) - New feature: Allow specifying the format of timestamps using the `fancyindex_time_format` configuration directive. (Idea suggested by Xiao Meng <<novoreorx@gmail.com>>). - Listings in top-level directories will not generate a "Parent Directory" link as first element of the listing. (Patch by Thomas P.) - Fix propagation and overriding of the `fancyindex_css_href` setting inside nested locations. - Minor changes in the code to allow building cleanly under Windows with Visual Studio 2013. (Patch by Y. Yuan <<yzwduck@gmail.com>>). - added nginx-rtmp-module - make all modules dynamic that support it: - ngx-fancyindex - headers_more_nginx-module - nginx-rtmp-module - manually install the docs instead of using %doc - unify how we install documentation for the modules - restructure contrib file handling - moved vim files into the normal vim paths so we can use them directly - new BR/R: vim - split out vim files into a subpackage vim-plugin-nginx so we dont have the vim requires on the main package - perl scripts are moved to /usr/share/nginx/ OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=70
2016-09-29 13:13:50 +02:00
iocb.aio_resfd = -1;
Index: nginx-1.19.1/src/event/modules/ngx_epoll_module.c
===================================================================
--- nginx-1.19.1.orig/src/event/modules/ngx_epoll_module.c
+++ nginx-1.19.1/src/event/modules/ngx_epoll_module.c
- update to 11.4 - Feature: the $upstream_bytes_received variable. - Feature: the $bytes_received, $session_time, $protocol, $status, $upstream_addr, $upstream_bytes_sent, $upstream_bytes_received, $upstream_connect_time, $upstream_first_byte_time, and $upstream_session_time variables in the stream module. - Feature: the ngx_stream_log_module. - Feature: the "proxy_protocol" parameter of the "listen" directive, the $proxy_protocol_addr and $proxy_protocol_port variables in the stream module. - Feature: the ngx_stream_realip_module. - Bugfix: nginx could not be built with the stream module and the ngx_http_ssl_module, but without ngx_stream_ssl_module; the bug had appeared in 1.11.3. - Feature: the IP_BIND_ADDRESS_NO_PORT socket option was not used; the bug had appeared in 1.11.2. - Bugfix: in the "ranges" parameter of the "geo" directive. - Bugfix: an incorrect response might be returned when using the "aio threads" and "sendfile" directives; the bug had appeared in 1.9.13. - drop nginx-1.11.3_ssl_stream.patch again - refreshed the following patches to apply cleanly again check_1.9.2+.patch nginx-1.11.2-html.patch nginx-1.11.2-no_Werror.patch nginx-aio.patch - update to 1.11.3 - Change: now the "accept_mutex" directive is turned off by default. - Feature: now nginx uses EPOLLEXCLUSIVE on Linux. - Feature: the ngx_stream_geo_module. - Feature: the ngx_stream_geoip_module. - Feature: the ngx_stream_split_clients_module. - Feature: variables support in the "proxy_pass" and "proxy_ssl_name" directives in the stream module. - Bugfix: socket leak when using HTTP/2. - Bugfix: in configure tests. Thanks to Piotr Sikora. - backport nginx-1.11.3_ssl_stream.patch from hg - refresh patches to apply cleanly again: - check_1.9.2+.patch - nginx-1.11.2-html.patch - nginx-1.11.2-no_Werror.patch - nginx-aio.patch - enable a few new upstream modules and move some from 1.11.x to dynamic: - stream_geoip_module - mail_ssl_module - stream_ssl_module - build fancyindex unconditionally and update it to 0.4.1 - New `fancyindex_directories_first` configuration directive (enabled by default), which allows setting whether directories are sorted before other files. (Patch by Luke Zapart <<luke@zapart.org>>.) - Fix index files not working when the fancyindex module is in use (#46). - The module can now be built as a [dynamic module](https://www.nginx.com/resources/wiki/extending/converting/). (Patch by Róbert Nagy <<vrnagy@gmail.com>>.) - New configuration directive `fancyindex_show_path`, which allows hiding the `<h1>` header which contains the current path. (Patch by Thomas P. <<tpxp@live.fr>>.) - Directory and file links in listings now have a title="..." attribute. (Patch by `@janglapuk` <<trusdi.agus@gmail.com>>.) - Fix for hung requests when the module is used along with `ngx_pagespeed`. (Patch by Otto van der Schaaf <<oschaaf@we-amp.com>>.) - New feature: Allow filtering out symbolic links using the `fancyindex_hide_symlinks` configuration directive. (Idea and prototype patch by Thomas Wemm.) - New feature: Allow specifying the format of timestamps using the `fancyindex_time_format` configuration directive. (Idea suggested by Xiao Meng <<novoreorx@gmail.com>>). - Listings in top-level directories will not generate a "Parent Directory" link as first element of the listing. (Patch by Thomas P.) - Fix propagation and overriding of the `fancyindex_css_href` setting inside nested locations. - Minor changes in the code to allow building cleanly under Windows with Visual Studio 2013. (Patch by Y. Yuan <<yzwduck@gmail.com>>). - added nginx-rtmp-module - make all modules dynamic that support it: - ngx-fancyindex - headers_more_nginx-module - nginx-rtmp-module - manually install the docs instead of using %doc - unify how we install documentation for the modules - restructure contrib file handling - moved vim files into the normal vim paths so we can use them directly - new BR/R: vim - split out vim files into a subpackage vim-plugin-nginx so we dont have the vim requires on the main package - perl scripts are moved to /usr/share/nginx/ OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=70
2016-09-29 13:13:50 +02:00
@@ -77,9 +77,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;
- update to 11.4 - Feature: the $upstream_bytes_received variable. - Feature: the $bytes_received, $session_time, $protocol, $status, $upstream_addr, $upstream_bytes_sent, $upstream_bytes_received, $upstream_connect_time, $upstream_first_byte_time, and $upstream_session_time variables in the stream module. - Feature: the ngx_stream_log_module. - Feature: the "proxy_protocol" parameter of the "listen" directive, the $proxy_protocol_addr and $proxy_protocol_port variables in the stream module. - Feature: the ngx_stream_realip_module. - Bugfix: nginx could not be built with the stream module and the ngx_http_ssl_module, but without ngx_stream_ssl_module; the bug had appeared in 1.11.3. - Feature: the IP_BIND_ADDRESS_NO_PORT socket option was not used; the bug had appeared in 1.11.2. - Bugfix: in the "ranges" parameter of the "geo" directive. - Bugfix: an incorrect response might be returned when using the "aio threads" and "sendfile" directives; the bug had appeared in 1.9.13. - drop nginx-1.11.3_ssl_stream.patch again - refreshed the following patches to apply cleanly again check_1.9.2+.patch nginx-1.11.2-html.patch nginx-1.11.2-no_Werror.patch nginx-aio.patch - update to 1.11.3 - Change: now the "accept_mutex" directive is turned off by default. - Feature: now nginx uses EPOLLEXCLUSIVE on Linux. - Feature: the ngx_stream_geo_module. - Feature: the ngx_stream_geoip_module. - Feature: the ngx_stream_split_clients_module. - Feature: variables support in the "proxy_pass" and "proxy_ssl_name" directives in the stream module. - Bugfix: socket leak when using HTTP/2. - Bugfix: in configure tests. Thanks to Piotr Sikora. - backport nginx-1.11.3_ssl_stream.patch from hg - refresh patches to apply cleanly again: - check_1.9.2+.patch - nginx-1.11.2-html.patch - nginx-1.11.2-no_Werror.patch - nginx-aio.patch - enable a few new upstream modules and move some from 1.11.x to dynamic: - stream_geoip_module - mail_ssl_module - stream_ssl_module - build fancyindex unconditionally and update it to 0.4.1 - New `fancyindex_directories_first` configuration directive (enabled by default), which allows setting whether directories are sorted before other files. (Patch by Luke Zapart <<luke@zapart.org>>.) - Fix index files not working when the fancyindex module is in use (#46). - The module can now be built as a [dynamic module](https://www.nginx.com/resources/wiki/extending/converting/). (Patch by Róbert Nagy <<vrnagy@gmail.com>>.) - New configuration directive `fancyindex_show_path`, which allows hiding the `<h1>` header which contains the current path. (Patch by Thomas P. <<tpxp@live.fr>>.) - Directory and file links in listings now have a title="..." attribute. (Patch by `@janglapuk` <<trusdi.agus@gmail.com>>.) - Fix for hung requests when the module is used along with `ngx_pagespeed`. (Patch by Otto van der Schaaf <<oschaaf@we-amp.com>>.) - New feature: Allow filtering out symbolic links using the `fancyindex_hide_symlinks` configuration directive. (Idea and prototype patch by Thomas Wemm.) - New feature: Allow specifying the format of timestamps using the `fancyindex_time_format` configuration directive. (Idea suggested by Xiao Meng <<novoreorx@gmail.com>>). - Listings in top-level directories will not generate a "Parent Directory" link as first element of the listing. (Patch by Thomas P.) - Fix propagation and overriding of the `fancyindex_css_href` setting inside nested locations. - Minor changes in the code to allow building cleanly under Windows with Visual Studio 2013. (Patch by Y. Yuan <<yzwduck@gmail.com>>). - added nginx-rtmp-module - make all modules dynamic that support it: - ngx-fancyindex - headers_more_nginx-module - nginx-rtmp-module - manually install the docs instead of using %doc - unify how we install documentation for the modules - restructure contrib file handling - moved vim files into the normal vim paths so we can use them directly - new BR/R: vim - split out vim files into a subpackage vim-plugin-nginx so we dont have the vim requires on the main package - perl scripts are moved to /usr/share/nginx/ OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=70
2016-09-29 13:13:50 +02:00
@@ -254,7 +252,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) {