From: minima <minima>
Date: Sat, 3 Mar 2001 12:33:41 +0000 (+0000)
Subject: remove conflicts
X-Git-Tag: R_1_47~159
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=55777026bbfa5b9cf988a85bbe28fe94993482b8;p=spider.git

remove conflicts
---

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 09008781..ce73b79f 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -29,7 +29,7 @@ sub enqueue
 {
 	my ($conn, $msg) = @_;
 	unless ($msg =~ /^[ABZ]/) {
-		if ($msg =~ /^E[-\w]+\|([01])/) {
+		if ($msg =~ /^E[-\w]+\|([01])/ && $conn->{csort} eq 'telnet') {
 			$conn->{echo} = $1;
 			if ($1) {
 #				$conn->send_raw("\xFF\xFC\x01");