[koha-commits] main Koha release repository branch master updated. v16.05.00-336-ge465d1a
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 15 16:09:32 CEST 2016
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 "main Koha release repository".
The branch, master has been updated
via e465d1aa4b16d7392950b2b682f99eb0c58c1ffd (commit)
via 64fe6e350074db48cf337dcf1794b40a58d7e606 (commit)
via 4ad4ab6396af26bed9dceb442adf4aad6687f362 (commit)
via eb8666357ce72e910569843f8acce674a332f4b0 (commit)
via b27da7e0ce25c806612743100609255ace48257c (commit)
via 2b725b6728ea4156562aa6225b2323861f616885 (commit)
via 4f0fd3db556652f961710c64b9806512a491a7d3 (commit)
from e75d9befca13c2f74706e5eb7874a27bdc1928f1 (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 e465d1aa4b16d7392950b2b682f99eb0c58c1ffd
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 13 11:59:28 2016 +0200
Bug 15006: [QA Follow-up] Only handle login requests in raw_transport
Although mainly hypothetical, it would still be possible to get
response from the server for an acs resend request. (This exception
is allowed in MsgType::handle.)
I also noticed that the response may well be a message from an older
session still.
This patch just removes that exception by only passing login requests
to sub handle in the raw_transport loop.
Test plan:
[1] Verify normal login procedure for raw.
[2] Check a few acs resend requests in raw. They should terminate without
a response.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 64fe6e350074db48cf337dcf1794b40a58d7e606
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Jul 12 15:48:34 2016 +0200
Bug 15006: [QA Follow-up] Satisfy qa tools with one tab less
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 4ad4ab6396af26bed9dceb442adf4aad6687f362
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Jul 6 15:25:21 2016 +0100
Bug 15006 Correct indentation of EXPORTs in Sip.pm
Removed tabs and used spaces consistently
Used 'use base' to remove unnecessary BEGIN sub and
explicit setting of ISA at application level
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit eb8666357ce72e910569843f8acce674a332f4b0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 6 15:14:45 2016 +0100
Bug 15006: Centralize timeout logic and allow zero client timeout
Moving timeout logic to one routine (with unit test).
This further implements two suggestions from Kyle and Larry:
[1] You could use a client_timeout of 0 to specify no timeout at all.
[2] Have the client_timeout default to the timeout if not defined.
Test plan:
[1] Run t/db_dependent/SIP/SIPServer.t.
[2] Test login timeout for raw and telnet.
[3] Check ACS status message for timeout value. Should match policy
timeout from institution.
[4] Test client timeout (zero and non-zero).
[5] Remove client timeout. Test fallback to service.
[6] Remove service timeout too. Test fallback to 30 at login.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended to incorporate Srdjan's suggestion to move get_timeout to
SIPServer.pm; this requires some additional mocking in the unit test.
And even makes the test db dependent, as documented.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit b27da7e0ce25c806612743100609255ace48257c
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Fri Nov 20 12:12:48 2015 +0000
Bug 15006: Introduce client_timeout in SIPconfig.xml
Most selfchecks have persistent connections and send a
periodic status request at intervals (approx every 5mins appears
the norm) The timeout was dropping connections by default every 30secs
which for the client appears as a very flakey network.
This patch adds a separate parameter client_timeout that can be
used if you do want to force a disconnect if the client sends
no requests for a period. The sample config sets it to 600, but you
can also define a 0 value meaning no timeout. If the parameter is not
defined, it will fallback to service timeout.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Restored this patch from Colin in order to separate it from the
get_timeout patch. Adjusted the commit message slightly.
The original value of 600 from Colin's earlier patch may give less
discussion than setting to 0 (no timeout) in a later proposal.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 2b725b6728ea4156562aa6225b2323861f616885
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Jul 5 10:36:31 2016 +0100
Bug 15006 Remove tabs from sip_protocol_loop
Remove the tabs causing inconsistent indentation
of sip_protocol_loop and replace with spaces
Reimplements the renaining parts of Marcel de Rooy's
original QA patch
No logic changes in this patch - layout only
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 4f0fd3db556652f961710c64b9806512a491a7d3
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Mon Jul 4 16:13:16 2016 +0100
Bug 15006 Drop raw connection if login fails
raw_connection was not behaving correctly if an invalid string was
passed or a login failed.
It was not checking that the login succeeded ( it checked that account
existed not that it contained data and it existed even if login failed)
and so failed logins instead of aborting immediately fell through into
the sip_protocol_loop, forcing that to timeout invalid connections.
It now checks that account has id set and returns if not.
The timeout alarm is now set on the while loop, in normal running this
should not be triggered as the socket is opened and the first data
should be a login message and the while loop should only iterate once,
but lets not go into an infinite loop due to unforeseen circumstances.
I have reindented the routine as the flow was not clear (the while was
not indented at all.
Also if using Net::Server::PreFork when a new connection comes in you
may be handed the the successful login parameters from a preceding call.
Because of this you could successfully transmit transactions and Koha
would carry them out without having received a valid login ( and
possibly with the wrong account details!) We now delete any existing
account for new connections.
NB: This patch requires that the patch for bug 13807 has been applied
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/SIP/SIPServer.pm | 108 +++++++++++++++++++++++++++++++---------
C4/SIP/Sip.pm | 28 +++++------
C4/SIP/Sip/MsgType.pm | 7 +--
etc/SIPconfig.xml | 8 +++
t/{SIP_Sip.t => SIP/Sip.t} | 0
t/db_dependent/SIP/SIPServer.t | 78 +++++++++++++++++++++++++++++
6 files changed, 183 insertions(+), 46 deletions(-)
rename t/{SIP_Sip.t => SIP/Sip.t} (100%)
create mode 100755 t/db_dependent/SIP/SIPServer.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list