Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nginx-push-stream-module
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
nginx-push-stream-module
Commits
4d7bd27a
Commit
4d7bd27a
authored
Oct 10, 2016
by
Wandenberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix lock on channels_trash_mutex instead of messages_trash_mutex which fix #245
parent
cff904d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ngx_http_push_stream_module_utils.c
src/ngx_http_push_stream_module_utils.c
+2
-2
No files found.
src/ngx_http_push_stream_module_utils.c
View file @
4d7bd27a
...
...
@@ -1222,12 +1222,12 @@ ngx_http_push_stream_free_worker_message_memory(ngx_slab_pool_t *shpool, ngx_htt
static
void
ngx_http_push_stream_throw_the_message_away
(
ngx_http_push_stream_msg_t
*
msg
,
ngx_http_push_stream_shm_data_t
*
data
)
{
ngx_shmtx_lock
(
&
data
->
channel
s_trash_mutex
);
ngx_shmtx_lock
(
&
data
->
message
s_trash_mutex
);
msg
->
deleted
=
1
;
msg
->
expires
=
ngx_time
()
+
NGX_HTTP_PUSH_STREAM_DEFAULT_SHM_MEMORY_CLEANUP_OBJECTS_TTL
;
ngx_queue_insert_tail
(
&
data
->
messages_trash
,
&
msg
->
queue
);
data
->
messages_in_trash
++
;
ngx_shmtx_unlock
(
&
data
->
channel
s_trash_mutex
);
ngx_shmtx_unlock
(
&
data
->
message
s_trash_mutex
);
}
...
...
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