Merge remote-tracking branch 'upstream/master'

RekGRpth · RekGRpth · commit 215d5afcd78a · 2019-02-11T09:28:56.000+05:00
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/include/ngx_http_push_stream_module.h b/include/ngx_http_push_stream_module.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/include/ngx_http_push_stream_module_publisher.h b/include/ngx_http_push_stream_module_publisher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/include/ngx_http_push_stream_module_setup.h b/include/ngx_http_push_stream_module_setup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/include/ngx_http_push_stream_module_subscriber.h b/include/ngx_http_push_stream_module_subscriber.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/include/ngx_http_push_stream_module_utils.h b/include/ngx_http_push_stream_module_utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/include/ngx_http_push_stream_module_version.h b/include/ngx_http_push_stream_module_version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/include/ngx_http_push_stream_module_websocket.h b/include/ngx_http_push_stream_module_websocket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/misc/Gemfile b/misc/Gemfile
@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
-ruby '2.3.0'
+ruby '2.5.3'
 
-gem 'rake'
+gem 'rake', '< 11.0'
 
 group :test do
   gem 'rspec'
diff --git a/misc/Gemfile.lock b/misc/Gemfile.lock
@@ -1,104 +1,106 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    Platform (0.4.0)
-    RedCloth (4.2.9)
-    addressable (2.3.8)
-    byebug (4.0.5)
-      columnize (= 0.9.0)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    columnize (0.9.0)
-    cookiejar (0.3.2)
-    daemons (1.2.2)
-    diff-lcs (1.2.5)
-    em-eventsource (0.2.0)
-      em-http-request (>= 1.0.0)
-      eventmachine (>= 1.0.0.beta3)
-    em-http-request (1.1.2)
+    Platform (0.4.2)
+    RedCloth (4.3.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    byebug (10.0.2)
+    connection_pool (2.2.2)
+    cookiejar (0.3.3)
+    daemons (1.3.1)
+    diff-lcs (1.3)
+    em-eventsource (0.3.1)
+      em-http-request (~> 1.0)
+      eventmachine (~> 1.0)
+    em-http-request (1.1.5)
       addressable (>= 2.3.4)
-      cookiejar
+      cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
       eventmachine (>= 1.0.3)
       http_parser.rb (>= 0.6.0)
-    em-socksify (0.3.0)
+    em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
-    eventmachine (1.0.7)
-    execjs (2.5.0)
-    ffi (1.9.8)
-    filewatcher (0.4.0)
-      trollop (~> 2.0)
-    github-markup (1.3.3)
-    hitimes (1.2.2)
+    eventmachine (1.2.7)
+    execjs (2.7.0)
+    ffi (1.10.0)
+    filewatcher (1.1.1)
+      optimist (~> 3.0)
+    github-markup (3.0.2)
     http_parser.rb (0.6.0)
-    jasmine (2.2.0)
-      jasmine-core (~> 2.2)
+    jasmine (3.3.0)
+      jasmine-core (~> 3.3.0)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.2.0)
+    jasmine-core (3.3.0)
     jshintrb (0.3.0)
       execjs
       multi_json (>= 1.3)
       rake
-    json (1.8.2)
-    libv8 (3.16.14.7)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    mini_portile (0.6.2)
-    multi_json (1.11.0)
-    net-http-persistent (2.9.4)
+    json (2.1.0)
+    libv8 (3.16.14.19)
+    libv8 (3.16.14.19-x86_64-darwin-17)
+    libv8 (3.16.14.19-x86_64-darwin-18)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    mini_portile2 (2.4.0)
+    multi_json (1.13.1)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
     nginx_test_helper (0.4.1)
       popen4
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     open4 (1.3.4)
-    phantomjs (1.9.8.0)
+    optimist (3.0.0)
+    phantomjs (2.1.1.0)
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
-    rack (1.6.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    ref (1.0.5)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rake (10.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    ref (2.0.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    ruby_dep (1.5.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
-    thin (1.6.3)
+    thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
-    timers (4.0.1)
-      hitimes
-    trollop (2.1.2)
-    websocket (1.2.1)
-    websocket-eventmachine-base (1.1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    websocket (1.2.8)
+    websocket-eventmachine-base (1.2.0)
       eventmachine (~> 1.0)
       websocket (~> 1.0)
       websocket-native (~> 1.0)
-    websocket-eventmachine-client (1.1.0)
+    websocket-eventmachine-client (1.2.0)
       websocket-eventmachine-base (~> 1.0)
     websocket-native (1.0.0)
 
 PLATFORMS
   ruby
+  x86_64-darwin-17
+  x86_64-darwin-18
 
 DEPENDENCIES
   RedCloth
@@ -113,10 +115,16 @@ DEPENDENCIES
   net-http-persistent
   nginx_test_helper (~> 0.4.0)
   nokogiri
-  rake
+  rake (< 11.0)
   rb-fsevent
   rb-inotify
   rspec
   therubyracer
   thin
   websocket-eventmachine-client
+
+RUBY VERSION
+   ruby 2.5.3p105
+
+BUNDLED WITH
+   1.17.1
diff --git a/misc/Rakefile b/misc/Rakefile
@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'erb'
+require 'open-uri'
+require 'fileutils'
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('./Gemfile', File.dirname(__FILE__))
@@ -95,8 +97,8 @@ begin
   task :get_static_files do
     FileUtils.mkdir_p("#{base_path}/css")
 
-    download_file("https://github.global.ssl.fastly.net/assets/github-f226abc7983f8566b17d24236adae64ba647ffea.css", "#{base_path}/css/github.css") unless File.exists?("#{base_path}/css/github.css")
-    download_file("https://github.global.ssl.fastly.net/assets/github2-6edea06c20f02c9c2ae32842c7455d50c08c3f69.css", "#{base_path}/css/github2.css") unless File.exists?("#{base_path}/css/github2.css")
+    download_file("https://github.githubassets.com/assets/frameworks-a3b8a10d4a9e37a78f033ef4a4f525f5.css", "#{base_path}/css/github.css") unless File.exists?("#{base_path}/css/github.css")
+    download_file("https://github.githubassets.com/assets/github-6aa34635057b47b21a5f5ae68b399802.css", "#{base_path}/css/github2.css") unless File.exists?("#{base_path}/css/github2.css")
   end
 
   def generate_preview_for(file, project_dir, base_path)
@@ -159,13 +161,9 @@ rescue LoadError
 end
 
   def download_file(url, output_file)
-    EventMachine.run do
-      http = EventMachine::HttpRequest.new(url).get
-      http.errback { EM.stop }
-      http.callback do
-        File.open(output_file, "w") { |f| f.write(http.response) } if (http.response_header.status == 200)
-        EM.stop
-      end
+    case io = open(url)
+    when StringIO then File.open(output_file, 'w') { |f| f.write(io) }
+    when Tempfile then io.close; FileUtils.mv(io.path, output_file)
     end
   end
 
diff --git a/src/ngx_http_push_stream_module.c b/src/ngx_http_push_stream_module.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/src/ngx_http_push_stream_module_publisher.c b/src/ngx_http_push_stream_module_publisher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/src/ngx_http_push_stream_module_setup.c b/src/ngx_http_push_stream_module_setup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/src/ngx_http_push_stream_module_subscriber.c b/src/ngx_http_push_stream_module_subscriber.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/src/ngx_http_push_stream_module_utils.c b/src/ngx_http_push_stream_module_utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *
diff --git a/src/ngx_http_push_stream_module_websocket.c b/src/ngx_http_push_stream_module_websocket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
+ * Copyright (C) 2010-2019 Wandenberg Peixoto <wandenberg@gmail.com>, Rogério Carvalho Schneider <stockrt@gmail.com>
  *
  * This file is part of Nginx Push Stream Module.
  *

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (C) 2010-2015 Wandenberg Peixoto <[email protected]>, Rogério Carvalho Schneider <[email protected]>`
	`1`	`+Copyright (C) 2010-2019 Wandenberg Peixoto <[email protected]>, Rogério Carvalho Schneider <[email protected]>`
`2`	`2`
`3`	`3`	`This program is free software: you can redistribute it and/or modify`
`4`	`4`	`it under the terms of the GNU General Public License as published by`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2010-2015 Wandenberg Peixoto <[email protected]>, Rogério Carvalho Schneider <[email protected]>`
	`2`	`+ * Copyright (C) 2010-2019 Wandenberg Peixoto <[email protected]>, Rogério Carvalho Schneider <[email protected]>`
`3`	`3`	`*`
`4`	`4`	`* This file is part of Nginx Push Stream Module.`
`5`	`5`	`*`