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
71c511d4
Commit
71c511d4
authored
Dec 30, 2013
by
Wandenberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix send messages through websocket connection when the server is using kqueue
parent
800ef8ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
67 deletions
+32
-67
websocket_spec.rb
misc/spec/subscriber/websocket_spec.rb
+4
-6
ngx_http_push_stream_module_websocket.c
src/ngx_http_push_stream_module_websocket.c
+28
-61
No files found.
misc/spec/subscriber/websocket_spec.rb
View file @
71c511d4
# encoding: ascii
require
'spec_helper'
describe
"Subscriber WebSocket"
do
...
...
@@ -247,7 +248,7 @@ describe "Subscriber WebSocket" do
socket
=
open_socket
(
nginx_host
,
nginx_port
)
socket
.
print
(
"
#{
request
}
\r\n
"
)
headers
,
body
=
read_response_on_socket
(
socket
,
"aaa"
)
body
.
should
match_the_pattern
(
/^\201
~
\377\377aaa/
)
body
.
should
match_the_pattern
(
/^\201
\176
\377\377aaa/
)
end
end
...
...
@@ -319,11 +320,8 @@ describe "Subscriber WebSocket" do
headers
,
body
=
read_response_on_socket
(
socket
)
socket
.
print
(
frame
)
body
,
dummy
=
read_response_on_socket
(
socket
)
body
.
should
eql
(
"
\211\000
"
)
body
,
dummy
=
read_response_on_socket
(
socket
)
body
.
should
eql
(
"
\x81
.{
\"
channel
\"
:
\"
ch2
\"
,
\"
id
\"
:
\"
1
\"
,
\"
message
\"
:
\"
hello
\"
}
\x81
.{
\"
channel
\"
:
\"
ch1
\"
,
\"
id
\"
:
\"
1
\"
,
\"
message
\"
:
\"
hello
\"
}"
)
body
,
dummy
=
read_response_on_socket
(
socket
,
"ch1"
)
body
.
should
eql
(
"
\211\000\x81
.{
\"
channel
\"
:
\"
ch2
\"
,
\"
id
\"
:
\"
1
\"
,
\"
message
\"
:
\"
hello
\"
}
\x81
.{
\"
channel
\"
:
\"
ch1
\"
,
\"
id
\"
:
\"
1
\"
,
\"
message
\"
:
\"
hello
\"
}"
)
EventMachine
.
run
do
...
...
src/ngx_http_push_stream_module_websocket.c
View file @
71c511d4
...
...
@@ -25,7 +25,8 @@
#include <ngx_http_push_stream_module_websocket.h>
static
ngx_str_t
*
ngx_http_push_stream_generate_websocket_accept_value
(
ngx_http_request_t
*
r
,
ngx_str_t
*
sec_key
,
ngx_pool_t
*
temp_pool
);
ngx_str_t
*
ngx_http_push_stream_generate_websocket_accept_value
(
ngx_http_request_t
*
r
,
ngx_str_t
*
sec_key
,
ngx_pool_t
*
temp_pool
);
ngx_int_t
ngx_http_push_stream_recv
(
ngx_connection_t
*
c
,
ngx_event_t
*
rev
,
u_char
*
buf
,
ssize_t
len
);
static
ngx_int_t
ngx_http_push_stream_websocket_handler
(
ngx_http_request_t
*
r
)
...
...
@@ -144,7 +145,7 @@ ngx_http_push_stream_websocket_handler(ngx_http_request_t *r)
}
static
ngx_str_t
*
ngx_str_t
*
ngx_http_push_stream_generate_websocket_accept_value
(
ngx_http_request_t
*
r
,
ngx_str_t
*
sec_key
,
ngx_pool_t
*
temp_pool
)
{
#if (NGX_HAVE_SHA1)
...
...
@@ -171,37 +172,13 @@ ngx_http_push_stream_generate_websocket_accept_value(ngx_http_request_t *r, ngx_
#endif
}
ngx_int_t
ngx_http_push_stream_recv
(
ngx_connection_t
*
c
,
ngx_event_t
*
rev
,
ngx_err_t
*
err
,
u_char
*
buf
,
ssize_t
len
)
{
ssize_t
n
=
c
->
recv
(
c
,
buf
,
len
);
if
(
n
==
-
1
)
{
*
err
=
ngx_socket_errno
;
if
(
*
err
!=
NGX_EAGAIN
)
{
rev
->
eof
=
1
;
c
->
error
=
1
;
return
NGX_ERROR
;
}
}
else
if
((
n
==
0
)
||
(
n
!=
len
))
{
rev
->
eof
=
1
;
c
->
error
=
1
;
*
err
=
0
;
return
NGX_ERROR
;
}
return
NGX_OK
;
}
void
ngx_http_push_stream_websocket_reading
(
ngx_http_request_t
*
r
)
{
ngx_http_push_stream_loc_conf_t
*
cf
=
ngx_http_get_module_loc_conf
(
r
,
ngx_http_push_stream_module
);
u_char
buf
[
8
];
ngx_
err_t
err
;
ngx_
int_t
rc
;
ngx_event_t
*
rev
;
ngx_connection_t
*
c
;
ngx_http_push_stream_frame_t
frame
;
...
...
@@ -213,25 +190,8 @@ ngx_http_push_stream_websocket_reading(ngx_http_request_t *r)
c
=
r
->
connection
;
rev
=
c
->
read
;
#if (NGX_HAVE_KQUEUE)
if
(
ngx_event_flags
&
NGX_USE_KQUEUE_EVENT
)
{
if
(
!
rev
->
pending_eof
)
{
return
;
}
rev
->
eof
=
1
;
c
->
error
=
1
;
err
=
rev
->
kq_errno
;
goto
closed
;
}
#endif
//reading frame header
if
(
ngx_http_push_stream_recv
(
c
,
rev
,
&
err
,
buf
,
2
)
==
NGX_ERROR
)
{
if
(
(
rc
=
ngx_http_push_stream_recv
(
c
,
rev
,
buf
,
2
))
!=
NGX_OK
)
{
goto
closed
;
}
...
...
@@ -245,14 +205,14 @@ ngx_http_push_stream_websocket_reading(ngx_http_request_t *r)
frame
.
payload_len
=
buf
[
1
]
&
0x7f
;
if
(
frame
.
payload_len
==
126
)
{
if
(
ngx_http_push_stream_recv
(
c
,
rev
,
&
err
,
buf
,
2
)
==
NGX_ERROR
)
{
if
(
(
rc
=
ngx_http_push_stream_recv
(
c
,
rev
,
buf
,
2
))
!=
NGX_OK
)
{
goto
closed
;
}
uint16_t
len
;
ngx_memcpy
(
&
len
,
buf
,
2
);
frame
.
payload_len
=
ntohs
(
len
);
}
else
if
(
frame
.
payload_len
==
127
)
{
if
(
ngx_http_push_stream_recv
(
c
,
rev
,
&
err
,
buf
,
8
)
==
NGX_ERROR
)
{
if
(
(
rc
=
ngx_http_push_stream_recv
(
c
,
rev
,
buf
,
8
))
!=
NGX_OK
)
{
goto
closed
;
}
uint64_t
len
;
...
...
@@ -260,7 +220,7 @@ ngx_http_push_stream_websocket_reading(ngx_http_request_t *r)
frame
.
payload_len
=
ngx_http_push_stream_ntohll
(
len
);
}
if
(
frame
.
mask
&&
(
ngx_http_push_stream_recv
(
c
,
rev
,
&
err
,
frame
.
mask_key
,
4
)
==
NGX_ERROR
))
{
if
(
frame
.
mask
&&
(
(
rc
=
ngx_http_push_stream_recv
(
c
,
rev
,
frame
.
mask_key
,
4
))
!=
NGX_OK
))
{
goto
closed
;
}
...
...
@@ -273,7 +233,7 @@ ngx_http_push_stream_websocket_reading(ngx_http_request_t *r)
}
aux
=
ngx_http_push_stream_create_str
(
temp_pool
,
frame
.
payload_len
);
if
(
ngx_http_push_stream_recv
(
c
,
rev
,
&
err
,
aux
->
data
,
(
ssize_t
)
frame
.
payload_len
)
==
NGX_ERROR
)
{
if
(
(
rc
=
ngx_http_push_stream_recv
(
c
,
rev
,
aux
->
data
,
(
ssize_t
)
frame
.
payload_len
))
!=
NGX_OK
)
{
goto
closed
;
}
...
...
@@ -305,14 +265,6 @@ ngx_http_push_stream_websocket_reading(ngx_http_request_t *r)
ngx_http_push_stream_send_response_finalize
(
r
);
}
/* aio does not call this handler */
if
((
ngx_event_flags
&
NGX_USE_LEVEL_EVENT
)
&&
rev
->
active
)
{
if
(
ngx_del_event
(
rev
,
NGX_READ_EVENT
,
0
)
!=
NGX_OK
)
{
ngx_http_finalize_request
(
r
,
NGX_OK
);
}
}
return
;
closed:
...
...
@@ -320,11 +272,26 @@ closed:
ngx_destroy_pool
(
temp_pool
);
}
if
(
err
)
{
rev
->
error
=
1
;
if
(
rc
==
NGX_ERROR
)
{
ngx_log_error
(
NGX_LOG_INFO
,
c
->
log
,
ngx_socket_errno
,
"client closed prematurely connection"
);
ngx_http_finalize_request
(
r
,
NGX_OK
);
}
}
ngx_log_error
(
NGX_LOG_INFO
,
c
->
log
,
err
,
"client closed prematurely connection"
);
ngx_int_t
ngx_http_push_stream_recv
(
ngx_connection_t
*
c
,
ngx_event_t
*
rev
,
u_char
*
buf
,
ssize_t
len
)
{
ssize_t
n
=
c
->
recv
(
c
,
buf
,
len
);
if
(
n
==
len
)
{
return
NGX_OK
;
}
if
(
n
==
NGX_AGAIN
)
{
return
NGX_AGAIN
;
}
ngx_http_finalize_request
(
r
,
NGX_OK
)
;
return
NGX_ERROR
;
}
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