Update of /cvsroot/popfile/engine/Test
In directory sc8-pr-cvs1:/tmp/cvs-serv19821/Test
Modified Files:
SimpleProxy.pm
Log Message:
Improve test suite for Proxy::Proxy
Index: SimpleProxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Test/SimpleProxy.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleProxy.pm 21 Jul 2003 19:54:40 -0000 1.4
--- SimpleProxy.pm 26 Jul 2003 15:40:19 -0000 1.5
***************
*** 57,61 ****
my ( $self ) = @_;
! close $self->{remote_server__} if ( defined( $self->{remote_server__} ) );
}
--- 57,66 ----
my ( $self ) = @_;
! if ( defined( $self->{remote_server__} ) ) {
! close $self->{remote_server__};
! close $self->{remote_client__};
! undef $self->{remote_server__};
! undef $self->{remote_selector__};
! }
}
***************
*** 111,115 ****
if ( defined( $self->{remote_client_selector__}->can_read(0) ) ) {
my $line = <$handle>;
! $self->{received__} .= $line;
}
} else {
--- 116,122 ----
if ( defined( $self->{remote_client_selector__}->can_read(0) ) ) {
my $line = <$handle>;
! if ( defined( $line ) ) {
! $self->{received__} .= $line;
! }
}
} else {
***************
*** 154,161 ****
my $client_selector = new IO::Select( $client );
! while ( $client->connected ) {
if ( defined( $remote_selector->can_read(0) ) ) {
my $line = <$remote>;
if ( defined( $line ) ) {
print $client $line;
} else {
--- 161,169 ----
my $client_selector = new IO::Select( $client );
! while ( defined($client) && $client->connected ) {
if ( defined( $remote_selector->can_read(0) ) ) {
my $line = <$remote>;
if ( defined( $line ) ) {
+ last if ( $line =~ /__POPFILE__ABORT__CHILD__/ );
print $client $line;
} else {
***************
*** 165,168 ****
--- 173,177 ----
if ( defined( $client_selector->can_read(0) ) ) {
my $line = <$client>;
+ last if ( $line =~ /__POPFILE__ABORT__CHILD__/ );
print $remote $line;
}
***************
*** 171,174 ****
--- 180,185 ----
close $remote;
close $pipe;
+
+ $self->log_( "Child stopped" );
}
|
