tidy blocking for windows (possibly)

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 37308b5bb89fe943dd561cdd3bf68f6294ae1331..00128af622318d2a601de452c5a646de5a7f465d 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -66,8 +66,8 @@ BEGIN {
        # defines EINPROGRESS as 10035.  We provide it here because some
        # Win32 users report POSIX::EINPROGRESS is not vendor-supported.
        if ($^O eq 'MSWin32') { 
-               eval '*EINPROGRESS = sub { 10036 };';
-               eval '*EWOULDBLOCK = *EAGAIN = sub { 10035 };';
+               eval '*EINPROGRESS = sub { 10036 };' unless defined *EINPROGRESS;
+               eval '*EWOULDBLOCK = *EAGAIN = sub { 10035 };' unless defined *EWOULDBLOCK;
                eval '*F_GETFL     = sub {     0 };';
                eval '*F_SETFL     = sub {     0 };';
                eval '*IPPROTO_TCP     = sub {     6 };';
@@ -487,10 +487,10 @@ sub _rcv {                     # Complement to _send
     return unless defined($sock);
 
        my @lines;
-       if ($conn->{blocking}) {
-               blocking($sock, 0);
-               $conn->{blocking} = 0;
-       }
+#      if ($conn->{blocking}) {
+#              blocking($sock, 0);
+#              $conn->{blocking} = 0;
+#      }
        $bytes_read = sysread ($sock, $msg, 1024, 0);
        if (defined ($bytes_read)) {
                if ($bytes_read > 0) {

diff --git a/perl/Version.pm b/perl/Version.pm
index b878232df1431efd9b2db1b7e7dc4d3129cb4872..734321331d8c4d01f99fd0f5b7f87f17fb0463ba 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '135';
+$build = '136';
 
 1;