diff options
| author |   Thomas Deutschmann <whissi@whissi.de> | 2016-06-13 15:49:57 +0200 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2016-06-16 06:27:33 +0000 |
| commit | 6241ba18ca4a5e043a97ad11cf450c8d27b3079f (patch) | |
| tree | fbdefe267aef5806c8ae694b6193c13d0d0f4a5d /www-servers/nginx/files | |
| parent | dev-util/qbs: Fix dependencies (diff) | |
| download | gentoo-6241ba18ca4a5e043a97ad11cf450c8d27b3079f.tar.gz gentoo-6241ba18ca4a5e043a97ad11cf450c8d27b3079f.tar.bz2 gentoo-6241ba18ca4a5e043a97ad11cf450c8d27b3079f.zip | |
www-servers/nginx: Patch for rtmp module. Fixes bug 585804.
Proposed patch for upstream bug 820 added to fix building of
nginx's 3rd party module "rtmp" against nginx-1.11.0+.
Bug: https://github.com/arut/nginx-rtmp-module/issues/820
Gentoo-Bug: https://bugs.gentoo.org/585804
Package-Manager: portage-2.3.0_rc1
Closes: https://github.com/gentoo/gentoo/pull/1669
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'www-servers/nginx/files')
| -rw-r--r-- | www-servers/nginx/files/rtmp-nginx-1.11.0.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/www-servers/nginx/files/rtmp-nginx-1.11.0.patch b/www-servers/nginx/files/rtmp-nginx-1.11.0.patch new file mode 100644 index 000000000000..36c9c03ff2b4 --- /dev/null +++ b/www-servers/nginx/files/rtmp-nginx-1.11.0.patch @@ -0,0 +1,39 @@ +From 965523f3970e449e3abbaa6c9b0db1ce251f2b68 Mon Sep 17 00:00:00 2001 +From: RocFang <fangpeng1986@gmail.com> +Date: Mon, 30 May 2016 22:56:16 +0800 +Subject: [PATCH] compile with nginx-1.11.0 + +From https://github.com/arut/nginx-rtmp-module/issues/820 + +--- + ngx_rtmp_core_module.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/ngx_rtmp_core_module.c b/ngx_rtmp_core_module.c +index 643702f..567f011 100644 +--- a/ngx_rtmp_core_module.c ++++ b/ngx_rtmp_core_module.c +@@ -557,7 +557,11 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + break; + } + ++#if (nginx_version >= 1011000) ++ if (ngx_memcmp(ls[i].sockaddr + off, &u.sockaddr + off, len) != 0) { ++#else + if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) { ++#endif + continue; + } + +@@ -577,7 +581,11 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + + ngx_memzero(ls, sizeof(ngx_rtmp_listen_t)); + ++#if (nginx_version >= 1011000) ++ ngx_memcpy(ls->sockaddr, &u.sockaddr, u.socklen); ++#else + ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen); ++#endif + + ls->socklen = u.socklen; + ls->wildcard = u.wildcard; |