IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-20 14:13:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reduced difference between the send chain functions.

Browse Source 
No functional changes.  This follows the change from ad137a80919f.
This commit is contained in:
Valentin Bartenev 2014-08-13 15:11:45 +04:00
parent 0a02bdb249
commit 1cbeabfd4c
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/os/unix/ngx_writev_chain.c
View File

@ -138,7 +138,7 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
c->sent += sent;
cl = ngx_handle_sent_chain(in, sent);
in = ngx_handle_sent_chain(in, sent);
if (eintr) {
continue;
@ -146,13 +146,11 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
if (send - prev_send != sent) {
wev->ready = 0;
return cl;
return in;
}
if (send >= limit || cl == NULL) {
return cl;
}
in = cl;
if (send >= limit || in == NULL) {
return in;
}
}
}

16
src/os/win32/ngx_wsasend_chain.c
View File

@ -113,18 +113,16 @@ ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
c->sent += sent;
cl = ngx_handle_sent_chain(in, sent);
in = ngx_handle_sent_chain(in, sent);
if (send - prev_send != sent) {
wev->ready = 0;
return cl;
return in;
}
if (send >= limit || cl == NULL) {
return cl;
if (send >= limit || in == NULL) {
return in;
}
in = cl;
}
}
@ -280,14 +278,14 @@ ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
c->sent += sent;
cl = ngx_handle_sent_chain(in, sent);
in = ngx_handle_sent_chain(in, sent);
if (cl) {
if (in) {
wev->ready = 0;
} else {
wev->ready = 1;
}
return cl;
return in;
}