zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-13 15:41:08 +02:00
Code Issues Projects Releases Wiki Activity

compile with nginx-1.11.0

Browse source
This commit is contained in:
RocFang 2016-05-30 22:56:16 +08:00
parent fe122c1597
commit 965523f397
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ngx_rtmp_core_module.c
View file

@ -557,7 +557,11 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
break; 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) { if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) {
#endif
continue; 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)); 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); ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen);
#endif
ls->socklen = u.socklen; ls->socklen = u.socklen;
ls->wildcard = u.wildcard; ls->wildcard = u.wildcard;