1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From: Antonio Terceiro <terceiro@debian.org>
Date: Thu, 3 Oct 2024 20:22:54 -0300
Subject: test/rackups: fallback to using Rack if Rackup is not available
This could probably be dropped when ruby-rackup is easily installable.
Forwarded: not-needed
---
tests/rackups/ssl.ru | 2 +-
tests/rackups/ssl_mismatched_cn.ru | 2 +-
tests/rackups/ssl_sni_verify_host.ru | 2 +-
tests/rackups/ssl_verify_peer.ru | 2 +-
tests/rackups/ssl_verify_peer_with_chain.ru | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
--- a/tests/rackups/ssl.ru
+++ b/tests/rackups/ssl.ru
@@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__)
key_file = File.join(File.dirname(__FILE__), '..', 'data', '127.0.0.1.cert.key')
cert_file = File.join(File.dirname(__FILE__), '..', 'data', '127.0.0.1.cert.crt')
-Rackup::Handler::WEBrick.run(Basic,
+(defined?(Rackup) && Rackup || Rack)::Handler::WEBrick.run(Basic,
:Port => 9443,
:SSLEnable => true,
:SSLPrivateKey => OpenSSL::PKey::RSA.new(File.open(key_file).read),
--- a/tests/rackups/ssl_mismatched_cn.ru
+++ b/tests/rackups/ssl_mismatched_cn.ru
@@ -6,7 +6,7 @@ require 'webrick/https'
require File.join(File.dirname(__FILE__), 'basic')
key_file = File.join(File.dirname(__FILE__), '..', 'data', 'excon.cert.key')
cert_file = File.join(File.dirname(__FILE__), '..', 'data', 'excon.cert.crt')
-Rackup::Handler::WEBrick.run(Basic,
+(defined?(Rackup) && Rackup || Rack)::Handler::WEBrick.run(Basic,
:Port => 9443,
:SSLEnable => true,
:SSLPrivateKey => OpenSSL::PKey::RSA.new(File.open(key_file).read),
--- a/tests/rackups/ssl_sni_verify_host.ru
+++ b/tests/rackups/ssl_sni_verify_host.ru
@@ -9,7 +9,7 @@ cert_file = File.join(File.dirname(__FIL
# Responds with generated certificate by default
# Responds with `excon.cert` for when SNI is `excon`
-Rackup::Handler::WEBrick.run(Basic,
+(defined?(Rackup) && Rackup || Rack)::Handler::WEBrick.run(Basic,
:Port => 9443,
:SSLEnable => true,
:SSLCertName => [%w{CN example.com}],
--- a/tests/rackups/ssl_verify_peer.ru
+++ b/tests/rackups/ssl_verify_peer.ru
@@ -6,7 +6,7 @@ require 'webrick/https'
require File.join(File.dirname(__FILE__), 'basic')
key_file = File.join(File.dirname(__FILE__), '..', 'data', 'excon.cert.key')
cert_file = File.join(File.dirname(__FILE__), '..', 'data', 'excon.cert.crt')
-Rackup::Handler::WEBrick.run(Basic,
+(defined?(Rackup) && Rackup || Rack)::Handler::WEBrick.run(Basic,
:Port => 8443,
:SSLCertName => [["CN", WEBrick::Utils::getservername]],
:SSLEnable => true,
--- a/tests/rackups/ssl_verify_peer_with_chain.ru
+++ b/tests/rackups/ssl_verify_peer_with_chain.ru
@@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__)
key_file = File.join(File.dirname(__FILE__), '..', 'data', 'excon_client.cert.key')
cert_file = File.join(File.dirname(__FILE__), '..', 'data', 'excon_client.cert.crt')
cacert_file = File.join(File.dirname(__FILE__), '..', 'data', 'excon.cert.crt')
-Rackup::Handler::WEBrick.run(Basic,
+(defined?(Rackup) && Rackup || Rack)::Handler::WEBrick.run(Basic,
:Port => 8443,
:SSLCertName => [["CN", WEBrick::Utils::getservername]],
:SSLEnable => true,
|
