diff options
| author | Vladimir Homutov <vl@nginx.com> | 2021-07-20 12:04:58 +0300 |
|---|---|---|
| committer | Vladimir Homutov <vl@nginx.com> | 2021-07-20 12:04:58 +0300 |
| commit | 31fe966e719c8fb0273119476b0c9a86d3f8e1b2 (patch) | |
| tree | 7e614b8e64d2a134e68cd0d8db3e138044684b92 | |
| parent | 161759443ccf0e800327af130a3c431789259fa4 (diff) | |
| download | nginx-31fe966e719c8fb0273119476b0c9a86d3f8e1b2.tar.gz nginx-31fe966e719c8fb0273119476b0c9a86d3f8e1b2.tar.bz2 | |
Core: fixed errno clobbering in ngx_sendmsg().
This was broken by 2dfd313f22f2.
| -rw-r--r-- | src/os/unix/ngx_udp_sendmsg_chain.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/os/unix/ngx_udp_sendmsg_chain.c b/src/os/unix/ngx_udp_sendmsg_chain.c index 78b497ea0..b29b8d318 100644 --- a/src/os/unix/ngx_udp_sendmsg_chain.c +++ b/src/os/unix/ngx_udp_sendmsg_chain.c @@ -398,15 +398,6 @@ eintr: n = sendmsg(c->fd, msg, flags); -#if (NGX_DEBUG) - for (i = 0, size = 0; i < (size_t) msg->msg_iovlen; i++) { - size += msg->msg_iov[i].iov_len; - } - - ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, - "sendmsg: %z of %uz", n, size); -#endif - if (n == -1) { err = ngx_errno; @@ -428,5 +419,14 @@ eintr: } } +#if (NGX_DEBUG) + for (i = 0, size = 0; i < (size_t) msg->msg_iovlen; i++) { + size += msg->msg_iov[i].iov_len; + } + + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "sendmsg: %z of %uz", n, size); +#endif + return n; } |