Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Curl_ssl_getsessionid: survive a missing session id cache #7153

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/http2.c
Expand Up @@ -638,6 +638,8 @@ static int push_promise(struct Curl_easy *data,
rv = CURL_PUSH_DENY;
goto fail;
}
Curl_dyn_init(&newstream->header_recvbuf, DYN_H2_HEADERS);
Curl_dyn_init(&newstream->trailer_recvbuf, DYN_H2_TRAILERS);
}
else {
H2BUGF(infof(data, "Got PUSH_PROMISE, ignore it!\n"));
Expand Down
5 changes: 3 additions & 2 deletions lib/vtls/vtls.c
Expand Up @@ -407,8 +407,9 @@ bool Curl_ssl_getsessionid(struct Curl_easy *data,

DEBUGASSERT(SSL_SET_OPTION(primary.sessionid));

if(!SSL_SET_OPTION(primary.sessionid))
/* session ID re-use is disabled */
if(!SSL_SET_OPTION(primary.sessionid) || !data->state.session)
/* session ID re-use is disabled or the session cache has not been
setup */
return TRUE;

/* Lock if shared */
Expand Down