Summary: | Switch Net::Server personality in sipserver to Fork | ||
---|---|---|---|
Product: | Koha | Reporter: | Colin Campbell <colin.campbell> |
Component: | SIP2 | Assignee: | Martin Renvoize (ashimema) <martin.renvoize> |
Status: | CLOSED WONTFIX | QA Contact: | Testopia <testopia> |
Severity: | enhancement | ||
Priority: | P5 - low | CC: | colin.campbell, dcook, srdjan |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
Change sponsored?: | --- | Patch complexity: | --- |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: | ||
Circulation function: | |||
Attachments: | Proposed patch |
Description
Colin Campbell
2015-12-23 10:44:34 UTC
Created attachment 45944 [details] [review] Proposed patch * read_SIP_packet() should be removed if not used any more * syslog should get SIPServer::read_request rather than "read_SIP_packet" Also, not sure if LOG_INFO is appropriate level. Patch doesn't apply. Opting for 'Failed QA' because of Srdjan's comment#2. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15418 Use Fork Net::Server personality for sip Using index info to reconstruct a base tree... M C4/SIP/SIPServer.pm M etc/SIPconfig.xml Falling back to patching base and 3-way merge... Auto-merging etc/SIPconfig.xml CONFLICT (content): Merge conflict in etc/SIPconfig.xml Auto-merging C4/SIP/SIPServer.pm CONFLICT (content): Merge conflict in C4/SIP/SIPServer.pm Failed to merge in the changes. Patch failed at 0001 Bug 15418 Use Fork Net::Server personality for sip The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Proposed-patch-pNkHlx.patch An old patch from Colin, Martin, can you review if this should remain open? |