[Tkabber-dev] r1767 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Mon Mar 30 20:26:27 MSD 2009


Author: sergei
Date: 2009-03-30 20:26:26 +0400 (Mon, 30 Mar 2009)
New Revision: 1767

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/proxy.tcl
Log:
	* proxy.tcl: Fixed proxy filter setting in case of HTTP protocol, so
	  HTTP-polling now works via proxy again. Also, don't send Proxy-
	  Authorization header if username and password are empty.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-03-30 11:48:26 UTC (rev 1766)
+++ trunk/tkabber/ChangeLog	2009-03-30 16:26:26 UTC (rev 1767)
@@ -3,6 +3,10 @@
 	* plugins/general/session.tcl: Changed default values for saving state
 	  on exit and loading state on start to true.
 
+	* proxy.tcl: Fixed proxy filter setting in case of HTTP protocol, so
+	  HTTP-polling now works via proxy again. Also, don't send Proxy-
+	  Authorization header if username and password are empty.
+
 2009-03-29  Sergei Golovan  <sgolovan at nes.ru>
 
 	* si.tcl: Fixed sending error stanza to a filetransfer peer when the

Modified: trunk/tkabber/proxy.tcl
===================================================================
--- trunk/tkabber/proxy.tcl	2009-03-30 11:48:26 UTC (rev 1766)
+++ trunk/tkabber/proxy.tcl	2009-03-30 16:26:26 UTC (rev 1767)
@@ -127,11 +127,11 @@
                    proto user host port srvurl]} {
 
 	if {$proto != "https"} {
-	    ::http::config -proxyfilter [namespace current]::proxyfilter
+	    ::http::config -proxyfilter ::proxy::proxyfilter
 
 	    if {![catch {eval proxyfilter $host} answer]} {
 		lassign $answer phost pport pusername ppassword
-		if {[info exists pusername] && [info exists ppassword]} {
+		if {![string equal $pusername ""] || ![string equal $ppassword ""]} {
 		    set auth [list Proxy-Authorization \
 				   "Basic [base64::encode \
 					        [encoding convertto \



More information about the Tkabber-dev mailing list