[OpenSRF-GIT] OpenSRF branch rel_2_1 updated. osrf_rel_2_1_0-alpha1-3-g5849a11

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, rel_2_1 has been updated
       via  5849a119bd363b152b41ed7a39c787f009412572 (commit)
       via  0ed34101e67dc04292f906945dd5752c73985412 (commit)
       via  cf4d4798c5949abaf6bc9a4c3a62bf9a6533977b (commit)
      from  fff96812ff55cc50374d5a16e7c803fac2c2f2a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5849a119bd363b152b41ed7a39c787f009412572
Author: Dan Scott <dscott at laurentian.ca>
Date:   Mon Apr 2 16:48:15 2012 -0400

    Bump version numbers for 2.1.0-RC1 release
    
    Also update the ChangeLog with relevant entries.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/ChangeLog b/ChangeLog
index f4f8300..2a9fd41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 Changelog for 2.1.0
 ===================
+
+commit 0ed34101e67dc04292f906945dd5752c73985412
+Author: Dan Scott <dscott at laurentian.ca>
+Date:   Fri Mar 23 13:05:31 2012 -0400
+
+    Add trailing period, "localhost" to ejabberd.cfg example
+    
+    Thanks to Yamil Suarez for noticing a discrepancy between the older wiki
+    instructions and the README.
+    
+    Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+commit cf4d4798c5949abaf6bc9a4c3a62bf9a6533977b
+Author: Bill Erickson <berick at esilibrary.com>
+Date:   Wed Mar 14 11:38:18 2012 -0400
+
+    Prevent undef warnings on perl socket read nbytes test
+    
+    Signed-off-by: Bill Erickson <berick at esilibrary.com>
+    Signed-off-by: Dan Scott <dan at coffeecode.net>
+
  
 commit f470b55b86fd59f31dd142d8cb55fe812265892e
 Author: Bill Erickson <berick at esilibrary.com>
diff --git a/src/perl/lib/OpenSRF.pm b/src/perl/lib/OpenSRF.pm
index be36226..d4bae88 100644
--- a/src/perl/lib/OpenSRF.pm
+++ b/src/perl/lib/OpenSRF.pm
@@ -14,7 +14,7 @@ OpenSRF - Top level class for OpenSRF perl modules.
 
 =head1 VERSION
 
-Version 2.1.0-alpha1
+Version 2.1.0-RC1
 
 =cut
 
diff --git a/version.m4 b/version.m4
index e99404b..e5e8736 100644
--- a/version.m4
+++ b/version.m4
@@ -1 +1 @@
-m4_define([VERSION_NUMBER],[2.1.0-alpha1]) 
+m4_define([VERSION_NUMBER],[2.1.0-RC1]) 

commit 0ed34101e67dc04292f906945dd5752c73985412
Author: Dan Scott <dscott at laurentian.ca>
Date:   Fri Mar 23 13:05:31 2012 -0400

    Add trailing period, "localhost" to ejabberd.cfg example
    
    Thanks to Yamil Suarez for noticing a discrepancy between the older wiki
    instructions and the README.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/README b/README
index a3aec37..8a87ef8 100644
--- a/README
+++ b/README
@@ -199,7 +199,7 @@ changes:
    example:
 +
 ---------------------------------------------------------------------------
-{hosts, ["private.localhost", "public.localhost"]}
+{hosts, ["localhost", "private.localhost", "public.localhost"]}.
 ---------------------------------------------------------------------------
 +
   b. Comment out the `mod_offline` directive

commit cf4d4798c5949abaf6bc9a4c3a62bf9a6533977b
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Mar 14 11:38:18 2012 -0400

    Prevent undef warnings on perl socket read nbytes test
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm b/src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm
index b8a5da1..b68e418 100644
--- a/src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm
+++ b/src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm
@@ -226,7 +226,7 @@ sub wait {
         $first_read = 0;
     }
 
-    if ($nbytes == 0 and $first_read) {
+    if ($first_read and defined $nbytes and $nbytes == 0) {
         # if the first read on an active socket is 0 bytes, 
         # the socket has been disconnected from the remote end. 
         $logger->error("Disconnected from Jabber server");

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   21 ++++++++++++++++++++
 README                                             |    2 +-
 src/perl/lib/OpenSRF.pm                            |    2 +-
 .../lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm |    2 +-
 version.m4                                         |    2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
OpenSRF