Skip to content

Commit 22705da

Browse files
committed
don't change Mojo::IOLoop::Client default address
1 parent f6af3ab commit 22705da

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

lib/Mojo/IOLoop/Client.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ sub connect {
3737

3838
# Blocking name resolution
3939
$_ && s/[[\]]//g for @$args{qw(address socks_address)};
40-
my $address = $args->{socks_address} || ($args->{address} ||= 'localhost');
40+
my $address = $args->{socks_address} || ($args->{address} ||= '127.0.0.1');
4141
return $reactor->next_tick(sub { $self && $self->_connect($args) }) if !NNR || $args->{handle} || $args->{path};
4242

4343
# Non-blocking name resolution
@@ -254,7 +254,7 @@ These options are currently available:
254254
255255
address => 'mojolicious.org'
256256
257-
Address or host name of the peer to connect to, defaults to C<localhost>.
257+
Address or host name of the peer to connect to, defaults to C<127.0.0.1>.
258258
259259
=item handle
260260

t/mojo/ioloop_tls.t

+18-9
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ my $id = $loop->server(
4646
my $port = $loop->acceptor($id)->port;
4747
my $promise2 = Mojo::Promise->new->ioloop($loop);
4848
$loop->client(
49-
{port => $port, tls => 1, tls_options => {SSL_verify_mode => 0x00}} => sub {
49+
{address => 'localhost', port => $port, tls => 1, tls_options => {SSL_verify_mode => 0x00}} => sub {
5050
my ($loop, $err, $stream) = @_;
5151
$stream->write('tset' => sub { shift->write('123') });
5252
$stream->on(close => sub { $promise2->resolve });
@@ -88,6 +88,7 @@ $id = Mojo::IOLoop->server(
8888
$port = Mojo::IOLoop->acceptor($id)->port;
8989
$promise2 = Mojo::Promise->new;
9090
Mojo::IOLoop->client(
91+
address => 'localhost',
9192
port => $port,
9293
tls => 1,
9394
tls_cert => 't/mojo/certs/client.crt',
@@ -118,6 +119,7 @@ ok !$server_err, 'no error';
118119
# Invalid client certificate
119120
my $client_err;
120121
Mojo::IOLoop->client(
122+
address => 'localhost',
121123
port => $port,
122124
tls => 1,
123125
tls_cert => 't/mojo/certs/bad.crt',
@@ -133,7 +135,7 @@ ok $client_err, 'has error';
133135
# Missing client certificate
134136
($server_err, $client_err) = ();
135137
Mojo::IOLoop->client(
136-
{port => $port, tls => 1} => sub {
138+
{address => 'localhost', port => $port, tls => 1} => sub {
137139
shift->stop;
138140
$client_err = shift;
139141
}
@@ -155,6 +157,7 @@ $id = $loop->server(
155157
);
156158
$port = $loop->acceptor($id)->port;
157159
$loop->client(
160+
address => 'localhost',
158161
port => $port,
159162
tls => 1,
160163
tls_cert => 't/mojo/certs/client.crt',
@@ -195,6 +198,7 @@ $id = Mojo::IOLoop->server(
195198
$port = Mojo::IOLoop->acceptor($id)->port;
196199
$promise2 = Mojo::Promise->new;
197200
Mojo::IOLoop->client(
201+
address => 'localhost',
198202
port => $port,
199203
tls => 1,
200204
tls_ca => 't/mojo/certs/ca.crt',
@@ -235,9 +239,10 @@ $id = $loop->server(
235239
);
236240
$port = $loop->acceptor($id)->port;
237241
$loop->client(
238-
port => $port,
239-
tls => 1,
240-
tls_ca => 't/mojo/certs/ca.crt',
242+
address => 'localhost',
243+
port => $port,
244+
tls => 1,
245+
tls_ca => 't/mojo/certs/ca.crt',
241246
sub {
242247
shift->stop;
243248
$client_err = shift;
@@ -259,6 +264,7 @@ $id = $loop->server(
259264
);
260265
$port = $loop->acceptor($id)->port;
261266
$loop->client(
267+
address => 'localhost',
262268
port => $port,
263269
tls => 1,
264270
tls_ca => 't/mojo/certs/ca.crt',
@@ -283,9 +289,10 @@ $id = $loop->server(
283289
);
284290
$port = $loop->acceptor($id)->port;
285291
$loop->client(
286-
port => $port,
287-
tls => 1,
288-
tls_ca => 'no cert',
292+
address => 'localhost',
293+
port => $port,
294+
tls => 1,
295+
tls_ca => 'no cert',
289296
sub {
290297
shift->stop;
291298
$client_err = shift;
@@ -314,6 +321,7 @@ $id = $loop->server(
314321
);
315322
$port = $loop->acceptor($id)->port;
316323
$loop->client(
324+
address => 'localhost',
317325
port => $port,
318326
tls => 1,
319327
tls_cert => 't/mojo/certs/bad.crt',
@@ -349,7 +357,7 @@ $id = Mojo::IOLoop->server(
349357
);
350358
$port = Mojo::IOLoop->acceptor($id)->port;
351359
Mojo::IOLoop->client(
352-
{port => $port, tls => 1, tls_options => {SSL_verify_mode => 0x00}} => sub {
360+
{address => 'localhost', port => $port, tls => 1, tls_options => {SSL_verify_mode => 0x00}} => sub {
353361
shift->stop;
354362
$client = 'connected';
355363
$client_err = shift;
@@ -375,6 +383,7 @@ subtest 'ALPN' => sub {
375383
);
376384
$port = Mojo::IOLoop->acceptor($id)->port;
377385
Mojo::IOLoop->client(
386+
address => 'localhost',
378387
port => $port,
379388
tls => 1,
380389
tls_options => {SSL_alpn_protocols => ['baz', 'bar'], SSL_verify_mode => 0x00},

0 commit comments

Comments
 (0)