Merge tag 'upstream/3.3.3'

[debian/amanda] / perl / Amanda / IPC / LineProtocol.pm

diff --git a/perl/Amanda/IPC/LineProtocol.pm b/perl/Amanda/IPC/LineProtocol.pm
index 8918dcf11eef7342134b896d9118dd756624a74d..ae8345b31dc7b45ea05c49998bdd8a745928bf3f 100644 (file)
--- a/perl/Amanda/IPC/LineProtocol.pm
+++ b/perl/Amanda/IPC/LineProtocol.pm
@@ -1,8 +1,9 @@
-# Copyright (c) 2009 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2009-2012 Zmanda, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -579,7 +580,8 @@ sub _async_read_cb {
     # and process this data
     $self->{'rx_buffer'} .= $data;
 
-    while (my ($line, $rest) = ($self->{'rx_buffer'} =~ /([^\n]*)\n(.*)/)) {
+    while ($self->{'rx_buffer'} =~ /\n/) {
+       my ($line, $rest) = split '\n', $self->{'rx_buffer'}, 2;
        $self->{'rx_buffer'} = $rest;
        $self->_incoming_line($line);
     }