From: Bill Erickson <berick@esilibrary.com>
Date: Wed, 13 Aug 2014 14:36:11 +0000 (-0400)
Subject: Merge remote branch 'working/collab/berick/sip2-support-multiplex-personality-squash1... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2a032af6a249f36bbf9e11e5f361e9338ea58ec0;p=working%2FSIPServer.git

Merge remote branch 'working/collab/berick/sip2-support-multiplex-personality-squash1' into multiplex-plus-relais-plus-timeout

Conflicts:
	SIPServer.pm

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---

2a032af6a249f36bbf9e11e5f361e9338ea58ec0
diff --cc SIPServer.pm
index 1aba170,0888ed0..6aa38e7
mode 100755,100644..100755
--- a/SIPServer.pm
+++ b/SIPServer.pm
@@@ -26,11 -29,13 +29,14 @@@ use Net::Server::Multiplex
  use Net::Server::PreFork;
  use Net::Server::Proto;
  use IO::Socket::INET;
 +use Socket qw(:crlf SOL_SOCKET SO_KEEPALIVE IPPROTO_TCP TCP_KEEPALIVE);
+ use IO::String;
+ use Socket qw(:crlf);
  use Data::Dumper;		# For debugging
  require UNIVERSAL::require;
+ use POSIX qw/:sys_wait_h :errno_h/;
  
- #use Sip qw(readline);
+ use Sip qw($protocol_version);
  use Sip::Constants qw(:all);
  use Sip::Configuration;
  use Sip::Checksum qw(checksum verify_cksum);