Hello! On Thu, Dec 15, 2022 at 09:24:08PM +0400, Sergey Kandaurov wrote:
> > > On 15 Dec 2022, at 15:53, 杜叶飞(淮叶) via nginx-devel <nginx-devel@nginx.org> > > wrote: > > > > Hello! > > > > > > # HG changeset patch > > # User BullerDu <yefei....@alibaba-inc.com> > > # Date 1671104973 -28800 > > # Thu Dec 15 19:49:33 2022 +0800 > > # Branch bugfix_style > > # Node ID 43aa2b889da22758b567964667e95071ad453e59 > > # Parent c38588d8376b77fc2f56f90ca16533031b235491 > > Style. > > diff -r c38588d8376b -r 43aa2b889da2 src/core/ngx_conf_file.c > > --- a/src/core/ngx_conf_file.c Tue Dec 13 18:53:53 2022 +0300 > > +++ b/src/core/ngx_conf_file.c Thu Dec 15 19:49:33 2022 +0800 > > @@ -544,8 +544,8 @@ > > } > > ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, > > - "unexpected end of file, " > > - "expecting \";\" or \"}\""); > > + "unexpected end of file, " > > + "expecting \";\" or \"}\""); > > return NGX_ERROR; > > } > > diff -r c38588d8376b -r 43aa2b889da2 src/event/ngx_event_udp.c > > --- a/src/event/ngx_event_udp.c Tue Dec 13 18:53:53 2022 +0300 > > +++ b/src/event/ngx_event_udp.c Thu Dec 15 19:49:33 2022 +0800 > > @@ -88,7 +88,7 @@ > > msg.msg_controllen = sizeof(msg_control); > > ngx_memzero(&msg_control, sizeof(msg_control)); > > - } > > + } > > #endif > > n = recvmsg(lc->fd, &msg, 0); > > diff -r c38588d8376b -r 43aa2b889da2 src/os/unix/ngx_udp_sendmsg_chain.c > > --- a/src/os/unix/ngx_udp_sendmsg_chain.c Tue Dec 13 18:53:53 2022 > > +0300 > > +++ b/src/os/unix/ngx_udp_sendmsg_chain.c Thu Dec 15 19:49:33 2022 > > +0800 > > @@ -335,7 +335,7 @@ > > #endif > > - #if (NGX_HAVE_IP_RECVDSTADDR) > > +#if (NGX_HAVE_IP_RECVDSTADDR) > > if (cmsg->cmsg_level == IPPROTO_IP > > && cmsg->cmsg_type == IP_RECVDSTADDR > > Please note that patch formatting appears corrupted, > I had to apply it manually. It looks good otherwise. > If no objections arise, I'll push it shortly. Looks good to me. -- Maxim Dounin http://mdounin.ru/ _______________________________________________ nginx-devel mailing list nginx-devel@nginx.org https://mailman.nginx.org/mailman/listinfo/nginx-devel
