Skip to content

Commit

Permalink
Merge remote branch 'remotes/origin/parrot-iocleanup1' into nom
Browse files Browse the repository at this point in the history
  • Loading branch information
moritz committed Jul 22, 2012
2 parents 5b56cfc + d0dc2d3 commit e09fbe6
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/core/IO/Socket/INET.pm
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ my class IO::Socket::INET does IO::Socket {
constant PROTO_UDP = 17; constant PROTO_UDP = 17;
} }


has Str $.encoding = 'utf8';
has Str $.host; has Str $.host;
has Int $.port = 80; has Int $.port = 80;
has Str $.localhost; has Str $.localhost;
Expand Down Expand Up @@ -76,6 +77,7 @@ my class IO::Socket::INET does IO::Socket {
$PIO.bind($addr); $PIO.bind($addr);
} }


$PIO.encoding(nqp::unbox_s(PARROT_ENCODING(self.encoding)));
if $.listen { if $.listen {
$PIO.listen($.listen); $PIO.listen($.listen);
} }
Expand Down

0 comments on commit e09fbe6

Please sign in to comment.