cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #435 from chenjianjian/dev 

fix a bug for nginx 1.16.0
This commit is contained in:
johnjiang 2019-09-11 16:15:47 +08:00 committed by GitHub
parent 5433d0d7a2 f4d8f17300
commit 7d8917714d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/nginx-1.16.0/src/os/unix/ngx_udp_sendmsg_chain.c
View File

@ -207,11 +207,11 @@ ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec)
#if (NGX_HAVE_IP_SENDSRCADDR)
u_char msg_control[CMSG_SPACE(sizeof(struct in_addr))];
#elif (NGX_HAVE_IP_PKTINFO)
#elif (NGX_HAVE_IP_PKTINFO) && (!NGX_HAVE_FSTACK)
u_char msg_control[CMSG_SPACE(sizeof(struct in_pktinfo))];
#endif
#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO && !NGX_HAVE_FSTACK)
u_char msg_control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
#endif
@ -252,7 +252,7 @@ ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec)
*addr = sin->sin_addr;
}
#elif (NGX_HAVE_IP_PKTINFO)
#elif (NGX_HAVE_IP_PKTINFO) && (!NGX_HAVE_FSTACK)
if (c->local_sockaddr->sa_family == AF_INET) {
struct cmsghdr *cmsg;
@ -276,7 +276,7 @@ ngx_sendmsg(ngx_connection_t *c, ngx_iovec_t *vec)
#endif
#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO)
#if (NGX_HAVE_INET6 && NGX_HAVE_IPV6_RECVPKTINFO && !NGX_HAVE_FSTACK)
if (c->local_sockaddr->sa_family == AF_INET6) {
struct cmsghdr *cmsg;