walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'meconlen-data_unset'

This commit is contained in:
Tatsuhiro Tsujikawa 2016-04-23 00:35:55 +09:00
parent 68059ccda9 3d948fd3d7
commit add182b495
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/nghttp2_session.c
View File

@ -2885,7 +2885,6 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session,
return rv; return rv;
} }
*data_ptr = NULL;
for (;;) { for (;;) {
switch (aob->state) { switch (aob->state) {
case NGHTTP2_OB_POP_ITEM: { case NGHTTP2_OB_POP_ITEM: {
@ -3142,6 +3141,8 @@ ssize_t nghttp2_session_mem_send(nghttp2_session *session,
int rv; int rv;
ssize_t len; ssize_t len;
*data_ptr = NULL;
len = nghttp2_session_mem_send_internal(session, data_ptr, 1); len = nghttp2_session_mem_send_internal(session, data_ptr, 1);
if (len <= 0) { if (len <= 0) {
return len; return len;
@ -3163,7 +3164,7 @@ ssize_t nghttp2_session_mem_send(nghttp2_session *session,
} }
int nghttp2_session_send(nghttp2_session *session) { int nghttp2_session_send(nghttp2_session *session) {
const uint8_t *data; const uint8_t *data = NULL;
ssize_t datalen; ssize_t datalen;
ssize_t sentlen; ssize_t sentlen;
nghttp2_bufs *framebufs; nghttp2_bufs *framebufs;