Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/sh2lib_send_bug' into 'master'

Browse source 
sh2lib: Fix a bug in send

See merge request idf/esp-idf!2656
This commit is contained in:
Angus Gratton 2018-07-16 16:29:03 +08:00
parent e90a920ea8 fe1889b923
commit f2f925de78
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
examples/protocols/http2_request/components/sh2lib/sh2lib.c
View file

@ -58,22 +58,19 @@ static ssize_t callback_send(nghttp2_session *session, const uint8_t *data,
int pending_data = length;
/* Send data in 1000 byte chunks */
while (copy_offset != (length - 1)) {
while (copy_offset != length) {
int chunk_len = pending_data > 1000 ? 1000 : pending_data;
int subrv = callback_send_inner(hd, data + copy_offset, chunk_len);
if (subrv <= 0) {
if (copy_offset) {
/* If some data was xferred, send the number of bytes
* xferred */
rv = copy_offset;
} else {
/* If not, send the error code */
if (copy_offset == 0) {
/* If no data is transferred, send the error code */
rv = subrv;
}
break;
}
copy_offset += chunk_len;
pending_data -= chunk_len;
copy_offset += subrv;
pending_data -= subrv;
rv += subrv;
}
return rv;
}