romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 02:37:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

rtsp: fix RTSP auth

Browse source 
Verified with test 3100

Fixes #4750
Closes #9870
This commit is contained in:
Daniel Stenberg 2022-11-08 15:34:12 +01:00
parent e46d388c87
commit 2bc04d4980
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
3 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/http.c
View file

@ -696,6 +696,15 @@ CURLcode Curl_http_auth_act(struct Curl_easy *data)
data->req.newurl = strdup(data->state.url); /* clone URL */
if(!data->req.newurl)
return CURLE_OUT_OF_MEMORY;
#ifndef CURL_DISABLE_RTSP
/*
* Authentication is treated as a redirect in Curl_follow(), so if this is
* done using RTSP we make it allow these "redirects" to RTSP (only). A
* safe assumption as no other redirects should happen from RTSP.
*/
if(conn->handler->protocol & CURLPROTO_RTSP)
data->set.redir_protocols = CURLPROTO_RTSP;
#endif
}
else if((data->req.httpcode < 300) &&
(!data->state.authhost.done) &&

13
lib/rtsp.c
View file

@ -267,6 +267,19 @@ static CURLcode rtsp_do(struct Curl_easy *data, bool *done)
rtsp->CSeq_sent = data->state.rtsp_next_client_CSeq;
rtsp->CSeq_recv = 0;
/* Setup the first_* fields to allow auth details get sent
to this origin */
/* Free to avoid leaking memory on multiple requests */
free(data->state.first_host);
data->state.first_host = strdup(conn->host.name);
if(!data->state.first_host)
return CURLE_OUT_OF_MEMORY;
data->state.first_remote_port = conn->remote_port;
data->state.first_remote_protocol = conn->handler->protocol;
/* Setup the 'p_request' pointer to the proper p_request string
* Since all RTSP requests are included here, there is no need to
* support custom requests like HTTP.