Skip to content

N
nghttp2
Commit add182b4 authored by Tatsuhiro Tsujikawa's avatar Tatsuhiro Tsujikawa
Browse files
Options

Merge branch 'meconlen-data_unset'

parents 68059ccd 3d948fd3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
lib/nghttp2_session.c
View file @ add182b4
...@@ -2885,7 +2885,6 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session, ...@@ -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, ...@@ -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, ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment