[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.03-17-ge49a6b8

[Git repo owner]

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.18.x has been updated
       via  e49a6b8ad46b3e5f92c7360d8d6d04c6972cac97 (commit)
       via  eb7bc4ea3109afb8e90f684cd00e2494901bf90e (commit)
       via  1cf327125a2ab4175882355a2bd835aca2e7b47b (commit)
      from  f5309088063b1ef36732f76cedf31d41cd10514a (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 e49a6b8ad46b3e5f92c7360d8d6d04c6972cac97
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Dec 10 12:27:59 2014 -0500

    Bug 13432 - SIP Server does not respect timeout setting
    
    Koha's SIP server accepts timeout parameters, but those parameters
    are only used for the login portion of a telnet transport session.
    Other than that, they are ignored, and as long as whatever opened
    the connection keeps it open, it will stay open indefinitely.
    
    Test Plan:
    1) Set the timeout setting on your SIP server to 10 seconds
    2) Modify misc/sip_cli_emulator.pl, add "sleep 100;" directly after line 91
    3) Start your SIP server
    4) Run the modified sip script with valid parameters
    5) Watch the SIP server stderr
    6) Note that even though the script waits far too long before continuing,
       the SIP server never kills the connection, and the requests the cli
       script makes come back with valid data.
    7) Apply this patch
    8) Restart your SIP server
    9) Repeat step 4
    10) Note that this time you see "SIP Timed Out!" in the SIP server
        stderr and when the script finally makes it's request, it doesn't
        come back with valid data.
    
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 03335ab401576355dfc5bcee1aa45714fd9fc411)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit eb7bc4ea3109afb8e90f684cd00e2494901bf90e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jan 20 07:18:11 2015 -0500

    Bug 13599 - Add patron cardnumber to self registration confirmation
    
    Some libraries wish to display the patron's cardnumber on the
    confirmation screen for patron self registration, rather than make the
    patron locate it his or her cardnumber by logging in and browsing to the
    personal details page. We should also add ids to these fields for easy
    css styling/hiding.
    
    Test Plan:
    1) Apply this patch
    2) Ensure that autoMemberNum is enabled
    3) Self-register a new patron
    4) Note confirmation screen now displays the patron cardnumber
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 06f4950aa21ff889cff81f27b2f4e79788db193f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 1cf327125a2ab4175882355a2bd835aca2e7b47b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Jan 9 16:01:35 2015 +0100

    Bug 13544: Make it explicit that getauthtypes returns a hash ref
    
    Prior to perl 5.12 keys can only operate on a hash.
    
    Test plan:
    With perl 5.10, access to admin/auth_subfields_structure.pl.
    Without this patch, you get:
    Type of arg 1 to keys must be hash (not subroutine entry) at
    /home/koha/src/admin/auth_subfields_structure.pl line 102, near
    "getauthtypes)"
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Confirmed problem and tested patch on a sandbox, signed off locally.
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit c9af47b86c653946916349ea021171b99f6bb44d)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/SIP/SIPServer.pm                                 |    4 ++++
 admin/auth_subfields_structure.pl                   |    2 +-
 .../en/modules/opac-registration-confirmation.tt    |   19 ++++++++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository