Skip to content

Commit

Permalink
localhost does not need to be a special case
Browse files Browse the repository at this point in the history
  • Loading branch information
kraih committed Dec 12, 2014
1 parent bf3dec3 commit e468e77
Show file tree
Hide file tree
Showing 26 changed files with 180 additions and 186 deletions.
2 changes: 1 addition & 1 deletion lib/Mojo/IOLoop.pm
Expand Up @@ -439,7 +439,7 @@ Get L<Mojo::IOLoop::Server> object for id or turn object into an acceptor.
Open TCP connection with L<Mojo::IOLoop::Client>, takes the same arguments as
L<Mojo::IOLoop::Client/"connect">.
# Connect to localhost on port 3000
# Connect to 127.0.0.1 on port 3000
Mojo::IOLoop->client({port => 3000} => sub {
my ($loop, $err, $stream) = @_;
...
Expand Down
11 changes: 4 additions & 7 deletions lib/Mojo/IOLoop/Client.pm
Expand Up @@ -50,13 +50,10 @@ sub _connect {
my ($self, $args) = @_;

my $handle;
my $address = $args->{socks_address} || ($args->{address} ||= 'localhost');
my $address = $args->{socks_address} || ($args->{address} ||= '127.0.0.1');
unless ($handle = $self->{handle} = $args->{handle}) {
my %options = (
Blocking => 0,
PeerAddr => $address eq 'localhost' ? '127.0.0.1' : $address,
PeerPort => _port($args)
);
my %options
= (Blocking => 0, PeerAddr => $address, PeerPort => _port($args));
$options{LocalAddr} = $args->{local_address} if $args->{local_address};
return $self->emit(error => "Can't connect: $@")
unless $self->{handle} = $handle = IO::Socket::IP->new(%options);
Expand Down Expand Up @@ -251,7 +248,7 @@ These options are currently available:
address => 'mojolicio.us'
Address or host name of the peer to connect to, defaults to C<localhost>.
Address or host name of the peer to connect to, defaults to C<127.0.0.1>.
=item handle
Expand Down
2 changes: 1 addition & 1 deletion lib/Mojo/Server/Daemon.pm
Expand Up @@ -316,7 +316,7 @@ L<Mojo::IOLoop> singleton.
=head2 listen
my $listen = $daemon->listen;
$daemon = $daemon->listen(['https://localhost:3000']);
$daemon = $daemon->listen(['https://127.0.0.1:3000']);
List of one or more locations to listen on, defaults to the value of the
C<MOJO_LISTEN> environment variable or C<http://*:3000>.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mojo/UserAgent/Server.pm
Expand Up @@ -52,7 +52,7 @@ sub _url {
my ($self, $nb) = (shift, shift);
$self->_restart(0, @_) if !$self->{server} || @_;
my $port = $nb ? $self->{nb_port} : $self->{port};
return Mojo::URL->new("$self->{proto}://localhost:$port/");
return Mojo::URL->new("$self->{proto}://127.0.0.1:$port/");
}

1;
Expand Down
14 changes: 14 additions & 0 deletions t/mojo/certs/bad.crt
@@ -0,0 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICMDCCAZmgAwIBAgIJAL3i8FjIa505MA0GCSqGSIb3DQEBBQUAMBsxCzAJBgNV
BAYTAlVTMQwwCgYDVQQDEwNiYWQwHhcNMTQxMjEyMDUwNDA3WhcNMzQxMjA3MDUw
NDA3WjAbMQswCQYDVQQGEwJVUzEMMAoGA1UEAxMDYmFkMIGfMA0GCSqGSIb3DQEB
AQUAA4GNADCBiQKBgQDa3Y/PG8MEfLboJQ2pPKOTgXLCBDPPPii8L3AYMaqo6b9M
S4ofj0qE6uiAne4ZMOoXl18U/9isZ5V8DKYTiNBDwTYyl9r6n+z+4uyINfxPhwhm
q3eYK2/WRRNgGkaBX1Jn+woSQNj/Xq9hxu0oy5oUez+vDtg5vfgvQHZX48igbQID
AQABo3wwejAdBgNVHQ4EFgQUG+9Mb16GLXdUYxAkv5T0VNIXAMgwSwYDVR0jBEQw
QoAUG+9Mb16GLXdUYxAkv5T0VNIXAMihH6QdMBsxCzAJBgNVBAYTAlVTMQwwCgYD
VQQDEwNiYWSCCQC94vBYyGudOTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
A4GBALxX+nkjDBh+Ir6QqBcdhiZ8i4rBhLUHaNDUFKq18WoxpTOtgwh7LUf+gT3D
XeelteXWgd4Ta7+emaAMS0+lSceJGHJJGYqcgHecIrKWtBAXL3z5K1YTZJb6jpCb
nAdXvj3b84/6AkrguWUeh/S0VMUtI11L984xCPbNizvnepAV
-----END CERTIFICATE-----
15 changes: 15 additions & 0 deletions t/mojo/certs/bad.key
@@ -0,0 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
MIICXQIBAAKBgQDa3Y/PG8MEfLboJQ2pPKOTgXLCBDPPPii8L3AYMaqo6b9MS4of
j0qE6uiAne4ZMOoXl18U/9isZ5V8DKYTiNBDwTYyl9r6n+z+4uyINfxPhwhmq3eY
K2/WRRNgGkaBX1Jn+woSQNj/Xq9hxu0oy5oUez+vDtg5vfgvQHZX48igbQIDAQAB
AoGAJuHz2YyKEfMCH63thmJygRMfSx6qAah+XihjVrkEI6wbQzesWzz+tSxyj97+
3NTW0cgfqUBmwwJICVjJ7HCC5yJQMvgAVv8MdPjuabZOEVthhHJJKe9CtVlkQC+F
5gybqf7m5EIWosd9ROjhBes4FaPLDG3ujOO27KEzY9CJmpUCQQD9aAn8qe7TVXnj
on9q6lu5aNB1lQ1G2h1yOkZDauY1TDec8/Vk6MjLmWIKu0GAATQAnGohNPGxVwZP
WdchXbAHAkEA3RsFRJkigPHudmimE2RH5Tf8UxfE89R7lhsBs7hTXSxeLUx2U5iv
G2g5KcKKnOJ+di5hB1dzW9q8zgTYGGEm6wJBAJqNcMHkVuAYGt5GRpZL16OulK2S
OeXDs//uINqPgVZyZNzaQgnInGbo5s4KxXkvwqq4u1YDd4GkxRlyfu4/uNMCQEST
KtEZxY/EeTcUQd3lzj6TXJjQ2G7fSe1GNwLsej59kj/uZQyMYFLZwlDnW2JJBPvW
apWCU+77Km+jJPp6tz0CQQDleMOZi70ikb04E0kagpJiRtNOLThDKjY6r6ZZWPro
saqxw29J/bAReUYXAcW5EzwRG97R/2u1HY77Y43YA3v0
-----END RSA PRIVATE KEY-----
15 changes: 0 additions & 15 deletions t/mojo/certs/badclient.crt

This file was deleted.

15 changes: 0 additions & 15 deletions t/mojo/certs/badclient.key

This file was deleted.

22 changes: 11 additions & 11 deletions t/mojo/certs/ca.crt
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICLTCCAZagAwIBAgIJAIXFBqtx/DgwMA0GCSqGSIb3DQEBBQUAMBoxCzAJBgNV
BAYTAlVTMQswCQYDVQQDEwJjYTAeFw0xMjA0MTgxNzM3MDFaFw0zMjA0MTMxNzM3
MIICLTCCAZagAwIBAgIJALx7JaBkhvU1MA0GCSqGSIb3DQEBBQUAMBoxCzAJBgNV
BAYTAlVTMQswCQYDVQQDEwJjYTAeFw0xNDEyMTIwNTAzMDFaFw0zNDEyMDcwNTAz
MDFaMBoxCzAJBgNVBAYTAlVTMQswCQYDVQQDEwJjYTCBnzANBgkqhkiG9w0BAQEF
AAOBjQAwgYkCgYEAsN5A5sqKSknGZkPFp0Y4+DHXIxbyc8nyjgQg7RVrO2x1x0PJ
5l6Kxa4JV012zzZ5G75ARpsZnZ9iUpS23NkcTf+ZDKmGp6iARsGnOHg3VQVvh8ay
Qr8Qe48AmWoYmRuaDasvrPCGPwxtWtwCO7qCN9QhiovXLGSGzLpzHGhXgQECAwEA
AaN7MHkwHQYDVR0OBBYEFCHumkco9aRJCbx2U7HC/SI089upMEoGA1UdIwRDMEGA
FCHumkco9aRJCbx2U7HC/SI089upoR6kHDAaMQswCQYDVQQGEwJVUzELMAkGA1UE
AxMCY2GCCQCFxQarcfw4MDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GB
AGB4qLzmfgjKfmA4vNlyXxYLgGJt0DmnzSXmsAE9h3eVj7ofidf6PnTiehMHJdVo
wCtMKCv4wT5GFd3TBPu9ZJw9QpyMMuDcOPVgAHg1PieZt4rYQYO5q2Zex6SCcbNx
DKKlg/x/eDFsMDERI+qsHIhzSkkTMuzrK8A09gaXlLIO
AAOBjQAwgYkCgYEAozbnJr3IvXwQeQV7n63p8XgXSpLgGmOsldyyIOBNy9zhoN7e
ZFvzNysr80+4a2+o3vRzXptGYuFjocBRruWm7Z42HLOKiiI/X317whfvm4dqsa9s
Bo4WN+2Ptsz31X+v/XnD6oZS5nLCeQ/WNuzd6Am9V0Y6Z//NReGOA3lotPkCAwEA
AaN7MHkwHQYDVR0OBBYEFPW1qzZDKPG4QYd7GN8rHWpVCdaLMEoGA1UdIwRDMEGA
FPW1qzZDKPG4QYd7GN8rHWpVCdaLoR6kHDAaMQswCQYDVQQGEwJVUzELMAkGA1UE
AxMCY2GCCQC8eyWgZIb1NTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GB
ABHz4htmRT6rG6tcSZ4dfpFZpd0Njj2pikkeymDK6s7vmfKVdY7NK0kisoHG88ms
y2mzRwbUSshuYfjghqZdizwf5bdprNSHRPfeey44pNTV8aVeKK13IxHGZk49hWHX
cq59GdoKy+AX9n0NI58u2GUrdwmM7Q8Qo8gVvfY19NFW
-----END CERTIFICATE-----
26 changes: 13 additions & 13 deletions t/mojo/certs/ca.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
MIICXAIBAAKBgQCw3kDmyopKScZmQ8WnRjj4MdcjFvJzyfKOBCDtFWs7bHXHQ8nm
XorFrglXTXbPNnkbvkBGmxmdn2JSlLbc2RxN/5kMqYanqIBGwac4eDdVBW+HxrJC
vxB7jwCZahiZG5oNqy+s8IY/DG1a3AI7uoI31CGKi9csZIbMunMcaFeBAQIDAQAB
AoGAIkYvlYnSWqsJQ3AGsW+uQoqGAkrEGSQdWN/78XWhHhbajA7a5UWU5tHfBYgB
ag5IUdQAaK5NvHnSd+ZRuWJpVXFxrXlPcRdhnFHXSxqpjjL7ia62kKdv0goSxBul
dHwBV2NINZU0VfBGiF/d2uUQa8FCu73Ku0qDwad+h22NuQECQQDkVCEtmzyI0bIH
6wutgVT6EQ4WRFRJwQniFQ2qAXfHLrtORnunV0DIi/fUu4HXb/VHPDjjgEsi/gJd
lsJjH6ppAkEAxk2RrsdUFlrkpA2sOnNh6xUCEdNLyY8cp0KAad2Oy7b2/yV8fC8C
r/7iYBXjrNI5KdUC88JWd361VVvExdHe2QJAIW27ycyPiUyCLyyXchicU1xJ3rK0
UHQFuWbxsDE00yGhZK1nDzH0Fyh+6VNmiB8pHvvPLGetGHtt5zvaS97n+QJBAL5X
knCLT8Etea2mmhx4yBJX1ea6RFKyFbTOdmgnjHspoigCGV0x2oiIRU4pdKJcHxZy
KiVD8q88Zl4KefPPoPECQGjoVv3O8QPN+hPdiBwgNK/QU7os7itDQRguzlK7iPQK
e0k4mA+XCo3VX2lFgpKrYwcBV16n0K3jvN6ELORGMaM=
MIICXQIBAAKBgQCjNucmvci9fBB5BXufrenxeBdKkuAaY6yV3LIg4E3L3OGg3t5k
W/M3KyvzT7hrb6je9HNem0Zi4WOhwFGu5abtnjYcs4qKIj9ffXvCF++bh2qxr2wG
jhY37Y+2zPfVf6/9ecPqhlLmcsJ5D9Y27N3oCb1XRjpn/81F4Y4DeWi0+QIDAQAB
AoGAD3Sdgv+pyLe835jzUfWoF6OloPwzmIwjxbU2cQKMm2d5PkCckqhaabj+2nWM
IzBZr3M6kZTmn2p0gtaxZXx9yA/iSc/H5agWtmP2L5+XLVFY2U+GlLtlF8BPCzf8
GoUHfq4phHyJ0tqzduVxO6p9UgdLhud0E07KuiF/lw0a5uECQQDOSIoMezNkOKkt
Ilza9RZR4R2S1NB23RfASddKyQK91sXC7uBiKvQO+GWzlJnbpTOEjpxTi0zMaYBS
9OpODiCVAkEAyo0POddC8VOVSSXZfbVuATmbr7Gu9JR9Qy9zzXObrrUtQDAX/8Kp
MKAujFlT+6XqM/AFfP9ZH4FvFj2qLVX11QJAX/hLkYb339akjoUAIjYIDkvnUFqG
KeaumB1Cdl6SUfPLyecMqV9GcHiMCEJIWnG/SBp5DD0wm6ExvGaJY4sbCQJBAJNE
Bfr24GwXaiX5x+yXGbj4SpJuLJcU0xIjER4iXOGkRpcxoHFK9bot7EoMtHv1gJds
foEIIqM+dycDhJRbuFUCQQCRnWBGk+Ess3FIilnfS0wfHzuY0DvMgyiF+qu+EWuD
254B3GxDGf2PMDa59DSY+zIzj/vfIhQqYdjiJbJpoXGK
-----END RSA PRIVATE KEY-----
20 changes: 10 additions & 10 deletions t/mojo/certs/client.crt
@@ -1,12 +1,12 @@
-----BEGIN CERTIFICATE-----
MIIBsjCCARsCCQCiVUE8+nXmezANBgkqhkiG9w0BAQUFADAaMQswCQYDVQQGEwJV
UzELMAkGA1UEAxMCY2EwHhcNMTIwNDE4MTczNzQ4WhcNMzIwNDEzMTczNzQ4WjAh
MQswCQYDVQQGEwJVUzESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEB
AQUAA4GNADCBiQKBgQCwIlSufhfNTPhuyO+ZMM6aR090jl9pvAhZen1RL+2heDQg
XXu1MXVMmMNKGkjeVnJdOPgM/TyC11FBUmc7LWApdGduHz18v5b1jM2HxIgzYWnJ
WEDUEwVbgTHQgyikcJ1hJNSs1oXSqJpamrWKZaBMApyzbfNIgvOBJyhvqTMt5QID
AQABMA0GCSqGSIb3DQEBBQUAA4GBAAaQZ7GyKPC4OcRMguTGgrv3xOQyz+TB4KVa
Q/yQfa4kMAXHfULm+DOYQy+qmyEJA+N/ddBJSlnO0q3O6gSMZeyJzO60gQr4Kals
dLaqwpw56zD4/DtJy5QQ4tu0YOFPqGJUvPK9Rxeo/9HYbuBAFK8eRS1UB3mpVt/Z
vzuekxuG
MIIBsjCCARsCCQCptEBZlSnk3zANBgkqhkiG9w0BAQUFADAaMQswCQYDVQQGEwJV
UzELMAkGA1UEAxMCY2EwHhcNMTQxMjEyMDUwMzQ5WhcNMzQxMjA3MDUwMzQ5WjAh
MQswCQYDVQQGEwJVUzESMBAGA1UEAxMJMTI3LjAuMC4xMIGfMA0GCSqGSIb3DQEB
AQUAA4GNADCBiQKBgQC74ZFnrU3GHG/XdPih2bdMLXKlKL86dTsdt5y4dWHP2yFS
2hyDNC8Oy5qlrL5GjbTbqpX65IkjYa8IfWbvn036DofU2vCYnQQZW25Egmrek+K1
J3hR8sxHyOFsGBcV7UDgzuQD8UtDzfalQ0DvmqTUgNl00gT3B8tV/eHmL8XPlQID
AQABMA0GCSqGSIb3DQEBBQUAA4GBAHZ/un7lY0QzL7NSpF4xr5ThtNQyxkGDb63B
etmaRrmTyH1dhZ7haXrYC12biE9r5H4mMo01SdOIkwpbN3zabGxKJM5bB627hXW3
+DAsS/a3riKU5lQHByADwXhblbFFOMEUiDqb80ukhemRtE3fE+qV9jeLYhc/EO9c
nmX6gNkZ
-----END CERTIFICATE-----
26 changes: 13 additions & 13 deletions t/mojo/certs/client.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
MIICXgIBAAKBgQCwIlSufhfNTPhuyO+ZMM6aR090jl9pvAhZen1RL+2heDQgXXu1
MXVMmMNKGkjeVnJdOPgM/TyC11FBUmc7LWApdGduHz18v5b1jM2HxIgzYWnJWEDU
EwVbgTHQgyikcJ1hJNSs1oXSqJpamrWKZaBMApyzbfNIgvOBJyhvqTMt5QIDAQAB
AoGAcCQLgmVpxh6hdfedBQ3cHMIWRoF3IhzDvCSOsSgwxcOAfLLIVp68rh39CKsf
hd/IRK5G0A5TfoKUi2BptXW4aN3Y4KduO9+WJJMzx7HDjDfzKl3i+ozwceEo1vPJ
91dlEMqerBra3z0+m/SRPGW67+6Z+cRe2rZ58zFu8ymH9akCQQDbUIvD3eQBmrEL
reA6jufnWXHjziW+6VlDdRYZ5H3lpCKHEXpoyDc4Pxd9S/8zdIULVnxrYH8c5K43
2PBLY6NzAkEAzZi3L/RxQbWc58CNZ9E7Tq3U9rD87x3q/a4/jgkMe/O1niVrCReA
H710sWAQoczRUzfIUMUHIsMkMast4x+DRwJBAJQgSsX30E/lEz84KQJkEu2G1A1w
5r2TDd8p7ct/MCkyOr/PZkXvNJygwFS4R52RTWri9xXvDuuM6L5/n4zLt1ECQQDB
4SPO2yr6ljNS8OfoYQ0WkyLjR+Ad9g6mD23rmWjmctpwOkUHm9u9EsI6iqbkjetQ
GKiUUlj6VR+Knyx0pED9AkEAl9y0Baa/z5MKeQiZ3lytT5MOBV2+4drXEi9I7Iw7
lbc6+AgFR4URp2RmDCOG4e6ghSLd2wL/1vCcyiw9Q+10AQ==
MIICXAIBAAKBgQC74ZFnrU3GHG/XdPih2bdMLXKlKL86dTsdt5y4dWHP2yFS2hyD
NC8Oy5qlrL5GjbTbqpX65IkjYa8IfWbvn036DofU2vCYnQQZW25Egmrek+K1J3hR
8sxHyOFsGBcV7UDgzuQD8UtDzfalQ0DvmqTUgNl00gT3B8tV/eHmL8XPlQIDAQAB
AoGAaeEbtWa4Dq5V5QD5YRS1tItkMWk+Iy6PqxafjmAwSBgAtpVOPi55WogpVbZ8
4HvZcXW34dVK55KUNl+dU+rd4NaDpka8RBjY99c1sJz7CmtPh9G3HHvcq0LIHZ+o
zDDLOwY5501czxJ+H6nwf3tmiZlGVqd7D4UQsG3ZWSBdVH0CQQDv2zYFX3H2sMZV
ntLvL00XizzNinQTK5Znnjpb4ZpAQFJcGTZa0jahc/8cTQRqcGfJATg4lLEcs+Jy
C1Kroe+zAkEAyIbPi8ONBRJA+pWoPvSRBNRhmboWVJ9424t8mLzXhwyo+NOYb3f8
6Rm2YNfkUB/DEJTwhxmRPeL2fCPT4HpflwJAc805KqTnJ7w3NXVFz7bdmIVf6Lh0
zCCaMBLDiELGr0ieutptVLHzMEYJoAdLH3x/jxsooqCfVgU/SeJPmo/HYwJARaPL
4FYBW4mDV4Mx8usskejQHHsr1ier6VL/6mtqzlPvOrsBbXTWOH3dgLR5bfoZ3GBd
SA3xCvUPdP1cT9Ev8QJBANIsQHxb4VsyRvz5La0oNwrjzp9BrV8t7xf4Sz46T/6m
uVl7tyb/M2x6qpYmz1u9D3hUDSysssd0eJbtCbfuU/0=
-----END RSA PRIVATE KEY-----
20 changes: 10 additions & 10 deletions t/mojo/certs/server.crt
@@ -1,12 +1,12 @@
-----BEGIN CERTIFICATE-----
MIIBsjCCARsCCQCiVUE8+nXmejANBgkqhkiG9w0BAQUFADAaMQswCQYDVQQGEwJV
UzELMAkGA1UEAxMCY2EwHhcNMTIwNDE4MTczNzI1WhcNMzIwNDEzMTczNzI1WjAh
MQswCQYDVQQGEwJVUzESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEB
AQUAA4GNADCBiQKBgQDGYovJ6A5gUVPAWv3RvJ05tk2CLYz0y8bN07ycJZqfYZaa
dAUfAsr2wjxT3vWNJNglfk9MlEIODFiUtZXwRcayrdE4gDUFxF2g8THy79EFktZd
Ct2L0NxDiavVoPrvZlgSY49JgLux5FhMD0zyouCU+npmJVvtoemZSzG4LpwWzQID
AQABMA0GCSqGSIb3DQEBBQUAA4GBAEwCcjQDSpEgWCltyToax1fVB0n+5idAQTS7
giIkcsJeN0ixut0dqQf8cddzxXLvn5R8rwsmiPv3LsT3djXimrMPaRJI7uJEIp5X
kJfab0TT+k2fRCUdr99YUN4PTDbEQ+V5qszibNN4HtN4e1FRcteHuBpZHj5k4KF9
qkrFmHc/
MIIBsjCCARsCCQCptEBZlSnk3jANBgkqhkiG9w0BAQUFADAaMQswCQYDVQQGEwJV
UzELMAkGA1UEAxMCY2EwHhcNMTQxMjEyMDUwMzI1WhcNMzQxMjA3MDUwMzI1WjAh
MQswCQYDVQQGEwJVUzESMBAGA1UEAxMJMTI3LjAuMC4xMIGfMA0GCSqGSIb3DQEB
AQUAA4GNADCBiQKBgQDDhbj7nsfzahPilwn6pGdo6nKYCR21WZ73CuwPN86DmsZi
5LIRYRfKA0unape2BQBnMnSmInaXvHHBdVsTyt3XSFZj5+iCF9RcorXAqcDygScj
8MTWYAZxCu3lGAjtw0bGGYutlLg5jtEXvZwfe61XfJj9xDUPNQrP7mf/HTBmgQID
AQABMA0GCSqGSIb3DQEBBQUAA4GBACRIx9fB4x8UO44C9TGj3bKb1NX3bkuHMz0m
WdhCkzUUiANtRMxp2oLA3KHY4yOusZLZIUNyP10Ri5q/U1mR0poYCMm7AYee2OV7
NdQIyppeDLoWQ9uPISPjp1d+zjpGOrLrSkpD1rYLVw4R56A9ZQks/LNs6TSceZjZ
c5QST/9i
-----END CERTIFICATE-----
26 changes: 13 additions & 13 deletions t/mojo/certs/server.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
MIICXgIBAAKBgQDGYovJ6A5gUVPAWv3RvJ05tk2CLYz0y8bN07ycJZqfYZaadAUf
Asr2wjxT3vWNJNglfk9MlEIODFiUtZXwRcayrdE4gDUFxF2g8THy79EFktZdCt2L
0NxDiavVoPrvZlgSY49JgLux5FhMD0zyouCU+npmJVvtoemZSzG4LpwWzQIDAQAB
AoGBALCvE9C+3A7sX6rxXx1s3pqHwoAuEVv0IRsveMuYsh1AzODCc80qr5kVZKVN
7WPHbLn3xKhvYmUgmcPX9bIIcu0eQAkAvHF/k99FHsokN768Dy5f35NckAE0pgg7
53rb2N6mswz6jCprd+pEogwKgSFtjTAJe0TMHuvDpVFlTwABAkEA6MHCKsGMADXQ
4LnGI3arn/UvUaVmg3d0TtbMkXAklatl8hcU6lTNK9+PQQaehrUerG05G4fqkf2f
8Qc48+fTzQJBANoyGNtSacifiX+ixlQ0Taa/lsfBLyTRT313k0w+wzi6c75N352X
AxK0/jly4xKRceO942UlojALupqnCUm4TwECQQCIpwFlct7MXMw2tDtFJO4caqoO
aGpocyChDPFrzghcqxWebbjE32baBFYp2kYGVp4co7+sjz7D2cEmlJP2dzxdAkBG
cvZjmfBdvmT+uOegOGL5+9ILHOzDznED6Z+9dmZB4rGMOEiC8Uckuxt6IQX/8MX8
6kqJVeVP7fmKBXSSQNgBAkEAiihs3rRJr6AyXJwkrJv/ouwaTDpcDUBL/8TGzibs
TNZHAVwOKvjA4y5vw3bBlltuiXDey5C8fo/4Gre/rcB/tg==
MIICXAIBAAKBgQDDhbj7nsfzahPilwn6pGdo6nKYCR21WZ73CuwPN86DmsZi5LIR
YRfKA0unape2BQBnMnSmInaXvHHBdVsTyt3XSFZj5+iCF9RcorXAqcDygScj8MTW
YAZxCu3lGAjtw0bGGYutlLg5jtEXvZwfe61XfJj9xDUPNQrP7mf/HTBmgQIDAQAB
AoGBAKqQ+XLobV435+kAAkCZM20fOaDQMw6FhFvXN19/O7UrTG3xPDZVET+16EXA
g2DStCtSpNhZsENmrYYrLqzxiNxDHagmEizmicdjoU2sXCHUbLtSojwedGTixBNf
ofuDPi/j7T24CQFK34ROwA4diMVsD8YBLOv+jXZMXaq1ROwBAkEA6RfoF2P9r7MW
Q5Yq54eZdU6viQmHXV8ePe43NmcEXGUMKb049RHekCWggvAgcTz3bzLIP4v6SQxz
J17wezU7sQJBANa8nYGOX29/TF2LS4vpAf85jPa+MqeFVOHXunlZbibXwPvx6WWS
EwwimDX6Q0q+dA4XqSDrb622BED5A18fG9ECQHOT1xFCE1g7hJ6ep0eGhSEVkxRw
FR7HO0eaBuaCzjbCI/XOTZ+27JStE5nZVzzO7iHFHGXmEoSGF9M90CBHlQECQH/0
Ffpb5pweg1d+J/7vUcRN+6QPQ0m01hZYoIGse0lj6Fd4F3Xxa64gcwg+3pgMEkVP
bfTytTISMkiw2IR2mfECQE343mUbDSOGGoDAN5ByWydkwfqaJvNBCHaBAkJ6lthU
4yVXQabDGkZMh1jdxi8hK/TRLiNgGks8tgFp6Zqc0SU=
-----END RSA PRIVATE KEY-----
4 changes: 2 additions & 2 deletions t/mojo/daemon.t
Expand Up @@ -45,9 +45,9 @@ is $tx->res->body, 'Hello TestApp!', 'right content';
{
is_deeply(Mojo::Server::Daemon->new->listen,
['http://*:3000'], 'right value');
local $ENV{MOJO_LISTEN} = 'http://localhost:8080';
local $ENV{MOJO_LISTEN} = 'http://127.0.0.1:8080';
is_deeply(Mojo::Server::Daemon->new->listen,
['http://localhost:8080'], 'right value');
['http://127.0.0.1:8080'], 'right value');
$ENV{MOJO_LISTEN} = 'http://*:80,https://*:443';
is_deeply(
Mojo::Server::Daemon->new->listen,
Expand Down
2 changes: 1 addition & 1 deletion t/mojo/ioloop.t
Expand Up @@ -85,7 +85,7 @@ $id = Mojo::IOLoop->server(
my $port = Mojo::IOLoop->acceptor($id)->port;
Mojo::IOLoop->acceptor($id)->on(accept => sub { $handle2 = pop });
$id2
= Mojo::IOLoop->client((address => 'localhost', port => $port) => sub { });
= Mojo::IOLoop->client((address => '127.0.0.1', port => $port) => sub { });
Mojo::IOLoop->start;
$count = 0;
Mojo::IOLoop->recurring(10 => sub { $timer++ });
Expand Down
34 changes: 16 additions & 18 deletions t/mojo/ioloop_tls.t
Expand Up @@ -10,26 +10,24 @@ plan skip_all => 'set TEST_TLS to enable this test (developer only!)'
plan skip_all => 'IO::Socket::SSL 1.84 required for this test!'
unless Mojo::IOLoop::Server::TLS;

# To regenerate all required certificates run these commands (18.04.2012)
# To regenerate all required certificates run these commands (12.12.2014)
# openssl genrsa -out ca.key 1024
# openssl req -new -key ca.key -out ca.csr -subj "/C=US/CN=ca"
# openssl req -x509 -days 7300 -key ca.key -in ca.csr -out ca.crt
#
# openssl genrsa -out server.key 1024
# openssl req -new -key server.key -out server.csr -subj "/C=US/CN=localhost"
# openssl req -new -key server.key -out server.csr -subj "/C=US/CN=127.0.0.1"
# openssl x509 -req -days 7300 -in server.csr -out server.crt -CA ca.crt \
# -CAkey ca.key -CAcreateserial
#
# openssl genrsa -out client.key 1024
# openssl req -new -key client.key -out client.csr -subj "/C=US/CN=localhost"
# openssl req -new -key client.key -out client.csr -subj "/C=US/CN=127.0.0.1"
# openssl x509 -req -days 7300 -in client.csr -out client.crt -CA ca.crt \
# -CAkey ca.key -CAcreateserial
#
# openssl genrsa -out badclient.key 1024
# openssl req -new -key badclient.key -out badclient.csr \
# -subj "/C=US/CN=badclient"
# openssl req -x509 -days 7300 -key badclient.key -in badclient.csr \
# -out badclient.crt
# openssl genrsa -out bad.key 1024
# openssl req -new -key bad.key -out bad.csr -subj "/C=US/CN=bad"
# openssl req -x509 -days 7300 -key bad.key -in bad.csr -out bad.crt
use Mojo::IOLoop;

# Built-in certificate
Expand Down Expand Up @@ -122,8 +120,8 @@ my $client_err;
Mojo::IOLoop->client(
port => $port,
tls => 1,
tls_cert => 't/mojo/certs/badclient.crt',
tls_key => 't/mojo/certs/badclient.key',
tls_cert => 't/mojo/certs/bad.crt',
tls_key => 't/mojo/certs/bad.key',
sub {
shift->stop;
$client_err = shift;
Expand Down Expand Up @@ -232,8 +230,8 @@ $loop = Mojo::IOLoop->new;
$id = $loop->server(
address => '127.0.0.1',
tls => 1,
tls_cert => 't/mojo/certs/badclient.crt',
tls_key => 't/mojo/certs/badclient.key',
tls_cert => 't/mojo/certs/bad.crt',
tls_key => 't/mojo/certs/bad.key',
sub { $server_err = 'accepted' }
);
$port = $loop->acceptor($id)->port;
Expand All @@ -256,8 +254,8 @@ $loop = Mojo::IOLoop->new;
$id = $loop->server(
address => '127.0.0.1',
tls => 1,
tls_cert => 't/mojo/certs/server.crt',
tls_key => 't/mojo/certs/server.key',
tls_cert => 't/mojo/certs/bad.crt',
tls_key => 't/mojo/certs/bad.key',
sub { $server_err = 'accepted' }
);
$port = $loop->acceptor($id)->port;
Expand All @@ -281,8 +279,8 @@ $loop = Mojo::IOLoop->new;
$id = $loop->server(
address => '127.0.0.1',
tls => 1,
tls_cert => 't/mojo/certs/badclient.crt',
tls_key => 't/mojo/certs/badclient.key',
tls_cert => 't/mojo/certs/bad.crt',
tls_key => 't/mojo/certs/bad.key',
sub { $server_err = 'accepted' }
);
$port = $loop->acceptor($id)->port;
Expand Down Expand Up @@ -321,8 +319,8 @@ $port = $loop->acceptor($id)->port;
$loop->client(
port => $port,
tls => 1,
tls_cert => 't/mojo/certs/badclient.crt',
tls_key => 't/mojo/certs/badclient.key',
tls_cert => 't/mojo/certs/bad.crt',
tls_key => 't/mojo/certs/bad.key',
sub {
my ($loop, $err, $stream) = @_;
$stream->timeout(0.5);
Expand Down

0 comments on commit e468e77

Please sign in to comment.