diff -Nru tclws-2.6.2/ClientSide.tcl tclws-2.6.3/ClientSide.tcl --- tclws-2.6.2/ClientSide.tcl 2018-12-06 13:06:47.000000000 +0000 +++ tclws-2.6.3/ClientSide.tcl 2019-12-03 19:39:38.000000000 +0000 @@ -1,6 +1,6 @@ ############################################################################### ## ## -## Copyright (c) 2016-2017, Harald Oehlmann ## +## Copyright (c) 2016-2019, Harald Oehlmann ## ## Copyright (c) 2006-2013, Gerald W. Lester ## ## Copyright (c) 2008, Georgios Petasis ## ## Copyright (c) 2006, Visiprise Software, Inc ## @@ -47,7 +47,7 @@ package require log package require uri -package provide WS::Client 2.6.0 +package provide WS::Client 2.6.3 namespace eval ::WS::Client { # register https only if not yet registered @@ -2054,20 +2054,18 @@ ( [::http::ncode $token] != 200 && $body eq {} )} { set errorCode [list WS CLIENT HTTPERROR [::http::code $token]] set hadError 1 - set errorInfo [FormatHTTPError $token] + set results [FormatHTTPError $token] + set errorInfo "" } else { SaveAndSetOptions $serviceName - if {[catch {set hadError [catch {parseResults $serviceName $operationName $body} results]} err]} { - RestoreSavedOptions $serviceName - return -code error -errorcode $::errorCode -errorinfo $::errorInfo $err - } else { - RestoreSavedOptions $serviceName - } + set hadError [catch {parseResults $serviceName $operationName $body} results] + RestoreSavedOptions $serviceName if {$hadError} { set errorCode $::errorCode set errorInfo $::errorInfo } } + ::http::cleanup $token ## ## Call the appropriate callback @@ -2078,14 +2076,16 @@ } else { set cmd $succesCmd } - lappend cmd $results - catch $cmd - + if {$cmd ne ""} { + lappend cmd $results + if {[catch $cmd cmdErr]} { + ::log::log error "Error invoking callback '$cmd': $cmdErr" + } + } ## ## All done ## - ::http::cleanup $token - return; + return } ########################################################################### @@ -2281,8 +2281,8 @@ if {![info exists rootName]} { return \ -code error \ - -errorcode [list WS CLIENT BADREPLY [list $rootName $expectedMsgTypeBase]] \ - "Bad reply type, received '$rootName'; but expected '$expectedMsgTypeBase'." + -errorcode [list WS CLIENT BADREPLY [list $rootNameCur $expectedMsgTypeBase]] \ + "Bad reply type, received '$rootNameCur'; but expected '$expectedMsgTypeBase'." } ## diff -Nru tclws-2.6.2/debian/changelog tclws-2.6.3/debian/changelog --- tclws-2.6.2/debian/changelog 2019-01-25 10:51:24.000000000 +0000 +++ tclws-2.6.3/debian/changelog 2020-01-07 14:54:59.000000000 +0000 @@ -1,3 +1,10 @@ +tclws (2.6.3-1) unstable; urgency=medium + + * New upstream release + * Standard compliance checked up to 4.4.1 + + -- Massimo Manghi Tue, 07 Jan 2020 15:54:59 +0100 + tclws (2.6.2-1) unstable; urgency=medium * New upstream release diff -Nru tclws-2.6.2/debian/control tclws-2.6.3/debian/control --- tclws-2.6.2/debian/control 2019-01-25 10:51:24.000000000 +0000 +++ tclws-2.6.3/debian/control 2020-01-07 14:54:59.000000000 +0000 @@ -3,13 +3,14 @@ Priority: optional Maintainer: Massimo Manghi Build-Depends: debhelper (>=9) -Standards-Version: 4.3.0 +Standards-Version: 4.4.1 Homepage: http://core.tcl.tk/tclws/ #Vcs-Git: git://anonscm.debian.org/collab-maint/tclws.git #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/tclws.git Package: tclws Architecture: all +Section: net Depends: ${misc:Depends}, tcl (>=8.5), tdom, tcllib, tcl-tls Suggests: libapache2-mod-rivet, aolserver4 Description: Tcl Web Services diff -Nru tclws-2.6.2/docs/Calling_a_Web_Service.html tclws-2.6.3/docs/Calling_a_Web_Service.html --- tclws-2.6.2/docs/Calling_a_Web_Service.html 2018-12-06 13:06:47.000000000 +0000 +++ tclws-2.6.3/docs/Calling_a_Web_Service.html 2019-12-03 19:39:38.000000000 +0000 @@ -287,11 +287,13 @@ succesCmd - A command prefix to be called if the operations does not raise an error. The results, as a dictionary object are concatinated to the prefix. This includes - both the return result and any return headers. + both the return result and any return headers. Leave + empty to not call any function. errorCmd - A command prefix to be called if the operations - raises an error. The error code and stack trace - are concatinated to the prefix. + raises an error. The error code, stack trace and + error message are concatinated to the prefix. Leave + empty to not call any function. headers - Extra headers to add to the HTTP request. This is a key value list argument. It must be a list with an even number of elements that alternate between diff -Nru tclws-2.6.2/pkgIndex.tcl tclws-2.6.3/pkgIndex.tcl --- tclws-2.6.2/pkgIndex.tcl 2018-12-06 13:06:47.000000000 +0000 +++ tclws-2.6.3/pkgIndex.tcl 2019-12-03 19:39:38.000000000 +0000 @@ -10,7 +10,7 @@ package ifneeded WS::AOLserver 2.4.0 [list source [file join $dir AOLserver.tcl]] package ifneeded WS::Channel 2.4.0 [list source [file join $dir ChannelServer.tcl]] -package ifneeded WS::Client 2.6.0 [list source [file join $dir ClientSide.tcl]] +package ifneeded WS::Client 2.6.3 [list source [file join $dir ClientSide.tcl]] package ifneeded WS::Embeded 2.6.0 [list source [file join $dir Embedded.tcl]] package ifneeded WS::Embedded 2.6.0 [list source [file join $dir Embedded.tcl]] package ifneeded WS::Server 2.6.0 [list source [file join $dir ServerSide.tcl]]