[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.09-65-ga5e1af5

Wed Aug 17 12:19:27 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, 3.22.x has been updated
       via  a5e1af5eb6136a354f4f9df58216a6ab52ead05c (commit)
       via  85caad0f3803aedd199b2998b0a549c24ad0e2c4 (commit)
       via  f891d7b990d704af231467f062de11f7341710c6 (commit)
       via  b3786fb159f669b10e5d37e06d8f8177b9a12eab (commit)
       via  c6f1fa2aad6469e9c4221f903ea571e259a92e4f (commit)
       via  ef3c9078f94446783ef3ac9b7e21ab935a685636 (commit)
       via  4cb5e38fc85ec07785cbdd8799ed356ec9d3db5f (commit)
       via  23689f4d24b572f82e663ae21a9cdd96693fc433 (commit)
      from  e028a289235202efe735c660ceac1b85c41e5ced (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 a5e1af5eb6136a354f4f9df58216a6ab52ead05c
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Mon Aug 1 13:29:32 2016 +0200

    Bug 15006: Update DB rev (3.22.09.001)

commit 85caad0f3803aedd199b2998b0a549c24ad0e2c4
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>
    (cherry picked from commit e465d1aa4b16d7392950b2b682f99eb0c58c1ffd)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit a0a0e057c0620a49246d0b5c55a6013b1f664780)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit f891d7b990d704af231467f062de11f7341710c6
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>
    (cherry picked from commit 64fe6e350074db48cf337dcf1794b40a58d7e606)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit aee5ba06949551ec789e5d95a41f8f224b2ae295)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit b3786fb159f669b10e5d37e06d8f8177b9a12eab
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>
    (cherry picked from commit 4ad4ab6396af26bed9dceb442adf4aad6687f362)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit ad235daaa74193947a328f96ed35d43aa0ec6663)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit c6f1fa2aad6469e9c4221f903ea571e259a92e4f
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>
    (cherry picked from commit eb8666357ce72e910569843f8acce674a332f4b0)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit e8a03065affb09718d16781a8beecfa262497639)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit ef3c9078f94446783ef3ac9b7e21ab935a685636
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>
    (cherry picked from commit b27da7e0ce25c806612743100609255ace48257c)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit d477ba8b0621fae9c847ef4e84d685ef396b3258)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 4cb5e38fc85ec07785cbdd8799ed356ec9d3db5f
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>
    (cherry picked from commit 2b725b6728ea4156562aa6225b2323861f616885)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit f5995e7ae9d66ce492d8314d087bf0d4f39c668a)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 23689f4d24b572f82e663ae21a9cdd96693fc433
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>
    (cherry picked from commit 4f0fd3db556652f961710c64b9806512a491a7d3)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit 4c91e8777004392459371bb20db8599c8c5a2646)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 C4/SIP/SIPServer.pm                    |  108 +++++++++++++++++++++++++-------
 C4/SIP/Sip.pm                          |   31 +++++----
 C4/SIP/Sip/MsgType.pm                  |    7 +--
 Koha.pm                                |    2 +-
 etc/SIPconfig.xml                      |    8 +++
 installer/data/mysql/updatedatabase.pl |    5 ++
 t/{SIP_Sip.t => SIP/Sip.t}             |    0
 t/db_dependent/SIP/SIPServer.t         |   78 +++++++++++++++++++++++
 8 files changed, 191 insertions(+), 48 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