http2: Fix missing nghttp2_session_send call in Curl_http2_switched

Previously in Curl_http2_switched, we called nghttp2_session_mem_recv to
parse incoming data which were already received while curl was handling
upgrade.  But we didn't call nghttp2_session_send, and it led to make
curl not send any response to the received frames.  Most likely, we
received SETTINGS from server at this point, so we missed opportunity to
send SETTINGS + ACK.  This commit adds missing nghttp2_session_send call
in Curl_http2_switched to fix this issue.

Bug: https://github.com/bagder/curl/issues/192
Reported-by: Stefan Eissing
This commit is contained in:
Tatsuhiro Tsujikawa 2015-04-02 00:28:58 +09:00 коммит произвёл Daniel Stenberg
Родитель 2685041a5c
Коммит 21e82bd635
2 изменённых файлов: 11 добавлений и 3 удалений

Просмотреть файл

@ -1062,6 +1062,15 @@ CURLcode Curl_http2_switched(struct connectdata *conn,
return CURLE_HTTP2; return CURLE_HTTP2;
} }
/* Try to send some frames since we may read SETTINGS already. */
rv = nghttp2_session_send(httpc->h2);
if(rv != 0) {
failf(data, "nghttp2_session_send() failed: %s(%d)",
nghttp2_strerror(rv), rv);
return CURLE_HTTP2;
}
return CURLE_OK; return CURLE_OK;
} }

Просмотреть файл

@ -23,7 +23,6 @@ lies!
<datacheck> <datacheck>
HTTP/1.1 101 Switching! HTTP/1.1 101 Switching!
</datacheck> </datacheck>
# listen to the upgrade request! # listen to the upgrade request!
@ -62,9 +61,9 @@ Upgrade: %H2CVER
HTTP2-Settings: AAMAAABkAAQAAP__ HTTP2-Settings: AAMAAABkAAQAAP__
</protocol> </protocol>
# nothing is returned, because no HTTP/2 data nor headers was handled # CURLE_HTTP2: Send failure: Broken pipe
<errorcode> <errorcode>
56 16
</errorcode> </errorcode>
</verify> </verify>
</testcase> </testcase>