Skip to content

N
nginx-push-stream-module
Commit 0013ac3b authored by Wandenberg's avatar Wandenberg
Browse files
Options

change default header template for EventSource connections

parent a03b3f5e
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
include/ngx_http_push_stream_module_utils.h
View file @ 0013ac3b
......@@ -203,7 +203,7 @@ static const ngx_str_t NGX_HTTP_PUSH_STREAM_TOKEN_MESSAGE_TEXT = ngx_string("~t
static const ngx_str_t NGX_HTTP_PUSH_STREAM_TOKEN_MESSAGE_TAG = ngx_string("~tag~");
static const ngx_str_t NGX_HTTP_PUSH_STREAM_TOKEN_MESSAGE_TIME = ngx_string("~time~");
static const ngx_str_t NGX_HTTP_PUSH_STREAM_EVENTSOURCE_DEFAULT_HEADER_TEMPLATE = ngx_string("");
static const ngx_str_t NGX_HTTP_PUSH_STREAM_EVENTSOURCE_DEFAULT_HEADER_TEMPLATE = ngx_string(": \r\n");
static const ngx_str_t NGX_HTTP_PUSH_STREAM_EVENTSOURCE_COMMENT_TEMPLATE = ngx_string(": ~text~\r\n");
static const ngx_str_t NGX_HTTP_PUSH_STREAM_EVENTSOURCE_MESSAGE_PREFIX = ngx_string("data: ");
static const ngx_str_t NGX_HTTP_PUSH_STREAM_EVENTSOURCE_ID_TEMPLATE = ngx_string("id: ~event-id~");
......
misc/spec/subscriber/event_source_spec.rb
View file @ 0013ac3b
......@@ -64,7 +64,7 @@ describe "Subscriber Event Source" do
response += chunk
end
sub.callback do
response.should eql(": footer line 1\r\n: footer line 2\r\n: footer line 3\r\n: footer line 4\r\n\r\n")
response.should eql(": \r\n\r\n: footer line 1\r\n: footer line 2\r\n: footer line 3\r\n: footer line 4\r\n\r\n")
EventMachine.stop
end
end
......@@ -82,7 +82,7 @@ describe "Subscriber Event Source" do
response += chunk
end
sub.callback do
response.should eql(": footer line 1\\nfooter line 2\r\n\r\n")
response.should eql(": \r\n\r\n: footer line 1\\nfooter line 2\r\n\r\n")
EventMachine.stop
end
end
......@@ -99,8 +99,8 @@ describe "Subscriber Event Source" do
sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
sub.stream do |chunk|
response += chunk
if response.include?("\r\n\r\n")
response.should eql("data: #{body}\r\n\r\n")
if response.include?("data: ")
response.should eql(": \r\n\r\ndata: #{body}\r\n\r\n")
EventMachine.stop
end
end
......@@ -120,8 +120,8 @@ describe "Subscriber Event Source" do
sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
sub.stream do |chunk|
response += chunk
if response.include?("\r\n\r\n")
response.should eql("data: #{body}\r\n\r\n")
if response.include?("data: ")
response.should eql(": \r\n\r\ndata: #{body}\r\n\r\n")
EventMachine.stop
end
end
......@@ -142,8 +142,8 @@ describe "Subscriber Event Source" do
sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
sub.stream do |chunk|
response += chunk
if response.include?("\r\n\r\n")
response.should eql("id: #{event_id}\r\ndata: #{body}\r\n\r\n")
if response.include?("data: ")
response.should eql(": \r\n\r\nid: #{event_id}\r\ndata: #{body}\r\n\r\n")
EventMachine.stop
end
end
......@@ -164,8 +164,8 @@ describe "Subscriber Event Source" do
sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
sub.stream do |chunk|
response += chunk
if response.include?("\r\n\r\n")
response.should eql("event: #{event_type}\r\ndata: #{body}\r\n\r\n")
if response.include?("data: ")
response.should eql(": \r\n\r\nevent: #{event_type}\r\ndata: #{body}\r\n\r\n")
EventMachine.stop
end
end
......@@ -185,8 +185,8 @@ describe "Subscriber Event Source" do
sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
sub.stream do |chunk|
response += chunk
if response.include?("\r\n\r\n")
response.should eql(%(data: {"id":"1", "message":"#{body}"}\r\n\r\n))
if response.include?("data: ")
response.should eql(%(: \r\n\r\ndata: {"id":"1", "message":"#{body}"}\r\n\r\n))
EventMachine.stop
end
end
......@@ -206,8 +206,8 @@ describe "Subscriber Event Source" do
sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
sub.stream do |chunk|
response += chunk
if response.include?("\r\n\r\n")
response.should eql(%(data: {"id":"1", "message":"#{body}"}\r\n\r\n))
if response.include?("data: ")
response.should eql(%(: \r\n\r\ndata: {"id":"1", "message":"#{body}"}\r\n\r\n))
EventMachine.stop
end
end
......@@ -228,8 +228,8 @@ describe "Subscriber Event Source" do
sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
sub.stream do |chunk|
response += chunk
if response.include?("\r\n\r\n")
response.should eql(%(id: #{event_id}\r\ndata: {"id":"1", "message":"#{body}"}\r\n\r\n))
if response.include?("data: ")
response.should eql(%(: \r\n\r\nid: #{event_id}\r\ndata: {"id":"1", "message":"#{body}"}\r\n\r\n))
EventMachine.stop
end
end
......@@ -250,8 +250,8 @@ describe "Subscriber Event Source" do
sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
sub.stream do |chunk|
response += chunk
if response.include?("\r\n\r\n")
response.should eql(%(event: #{event_type}\r\ndata: {"id":"1", "message":"#{body}"}\r\n\r\n))
if response.include?("data: ")
response.should eql(%(: \r\n\r\nevent: #{event_type}\r\ndata: {"id":"1", "message":"#{body}"}\r\n\r\n))
EventMachine.stop
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023