Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
documentation tweaks
  • Loading branch information
kraih committed Dec 8, 2012
1 parent 026d7bc commit 55ca84d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Changes
@@ -1,5 +1,5 @@

3.65 2012-12-08
3.65 2012-12-09
- Added upgrade method to Mojo::UserAgent::Transactor.
- Added is_range method to Mojo::Asset.
- Improved documentation.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mojo/JSON.pm
Expand Up @@ -331,7 +331,7 @@ Mojo::JSON - Minimalistic JSON
use Mojo::JSON;
my $json = Mojo::JSON->new;
my $bytes = $json->encode({foo => [1, 2], bar => 'hello!'});
my $bytes = $json->encode({foo => [1, 2], bar => 'hello!', baz => \1});
my $hash = $json->decode($bytes);
=head1 DESCRIPTION
Expand Down
4 changes: 2 additions & 2 deletions lib/Mojo/Reactor.pm
Expand Up @@ -177,8 +177,8 @@ seconds. Meant to be overloaded in a subclass.
$reactor = $reactor->watch($handle, $readable, $writable);
Change I/O events to watch handle for with C<true> and C<false> values. Meant
to be overloaded in a subclass. Note that this method requires an active I/O
Change I/O events to watch handle for with true and false values. Meant to be
overloaded in a subclass. Note that this method requires an active I/O
watcher.
# Watch only for readable events
Expand Down
4 changes: 2 additions & 2 deletions lib/Mojo/Reactor/EV.pm
Expand Up @@ -161,8 +161,8 @@ seconds.
$reactor = $reactor->watch($handle, $readable, $writable);
Change I/O events to watch handle for with C<true> and C<false> values. Note
that this method requires an active I/O watcher.
Change I/O events to watch handle for with true and false values. Note that
this method requires an active I/O watcher.
=head1 SEE ALSO
Expand Down
4 changes: 2 additions & 2 deletions lib/Mojo/Reactor/Poll.pm
Expand Up @@ -218,8 +218,8 @@ seconds.
$reactor = $reactor->watch($handle, $readable, $writable);
Change I/O events to watch handle for with C<true> and C<false> values. Note
that this method requires an active I/O watcher.
Change I/O events to watch handle for with true and false values. Note that
this method requires an active I/O watcher.
=head1 SEE ALSO
Expand Down
5 changes: 1 addition & 4 deletions lib/Mojo/UserAgent.pm
Expand Up @@ -223,10 +223,8 @@ sub _connect_proxy {
return $self->_finish($old, $cb);
}

# Prevent proxy reassignment
# Prevent proxy reassignment and start real transaction
$old->req->proxy(0);

# Start real transaction
return $self->_start($old->connection($tx->connection), $cb)
unless $tx->req->url->protocol eq 'https';

Expand Down Expand Up @@ -470,7 +468,6 @@ sub _upgrade {
return undef unless my $new = $self->transactor->upgrade($c->{tx});
weaken $self;
$new->on(resume => sub { $self->_write($id) });

return $c->{tx} = $new;
}

Expand Down

0 comments on commit 55ca84d

Please sign in to comment.