Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
0c73679a
Commit
0c73679a
authored
Dec 18, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
https: send CANCEL error if closing before end-of-stream
parent
9a108233
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
modules/access/http/h2conn.c
modules/access/http/h2conn.c
+7
-2
No files found.
modules/access/http/h2conn.c
View file @
0c73679a
...
...
@@ -309,11 +309,12 @@ static block_t *vlc_h2_stream_read(struct vlc_http_stream *stream)
* Sends an HTTP/2 stream reset, removes the stream from the HTTP/2 connection
* and deletes any stream resource.
*/
static
void
vlc_h2_stream_close
(
struct
vlc_http_stream
*
stream
,
bool
abort
)
static
void
vlc_h2_stream_close
(
struct
vlc_http_stream
*
stream
,
bool
abort
ed
)
{
struct
vlc_h2_stream
*
s
=
(
struct
vlc_h2_stream
*
)
stream
;
struct
vlc_h2_conn
*
conn
=
s
->
conn
;
bool
destroy
=
false
;
uint_fast32_t
code
=
VLC_H2_NO_ERROR
;
vlc_mutex_lock
(
&
conn
->
lock
);
if
(
s
->
older
!=
NULL
)
...
...
@@ -328,7 +329,11 @@ static void vlc_h2_stream_close(struct vlc_http_stream *stream, bool abort)
}
vlc_mutex_unlock
(
&
conn
->
lock
);
vlc_h2_stream_error
(
conn
,
s
->
id
,
abort
?
VLC_H2_CANCEL
:
VLC_H2_NO_ERROR
);
if
(
s
->
recv_hdr
!=
NULL
||
s
->
recv_head
!=
NULL
||
!
s
->
recv_end
)
code
=
VLC_H2_CANCEL
;
(
void
)
aborted
;
vlc_h2_stream_error
(
conn
,
s
->
id
,
code
);
if
(
s
->
recv_hdr
!=
NULL
)
vlc_http_msg_destroy
(
s
->
recv_hdr
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment