[Tkabber-dev] r1762 - trunk/tkabber

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Mar 29 15:14:31 MSD 2009


Author: sergei
Date: 2009-03-29 15:14:31 +0400 (Sun, 29 Mar 2009)
New Revision: 1762

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/proxy.tcl
Log:
	* proxy.tcl: Changed proxy type for HTTPS traffic from HTTP to
	  tunnelling, which is more appropriate.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-03-29 10:56:32 UTC (rev 1761)
+++ trunk/tkabber/ChangeLog	2009-03-29 11:14:31 UTC (rev 1762)
@@ -11,6 +11,9 @@
 
 	* plugins/filetransfer/http.tcl: Use original call of ::http::geturl.
 
+	* proxy.tcl: Changed proxy type for HTTPS traffic from HTTP to
+	  tunnelling, which is more appropriate.
+
 2009-03-28  Sergei Golovan  <sgolovan at nes.ru>
 
 	* si.tcl, plugins/si/ibb.tcl, plugins/si/iqibb.tcl,

Modified: trunk/tkabber/proxy.tcl
===================================================================
--- trunk/tkabber/proxy.tcl	2009-03-29 10:56:32 UTC (rev 1761)
+++ trunk/tkabber/proxy.tcl	2009-03-29 11:14:31 UTC (rev 1762)
@@ -73,16 +73,11 @@
 	set host [lindex $args end-1]
 	set port [lindex $args end]
 
-	# Find HTTP proxy, not tunnelling one
-	if {![catch {proxyfilter $host} answer] && $answer != {}} {
-	    lassign $answer phost pport pusername ppassword
-	    set sock [::pconnect::socket $host $port \
-					 -proxy https \
-					 -host $phost \
-					 -port $pport \
-					 -username $pusername \
-					 -password $ppassword]
-	    return [::tls::import $sock]
+	# Find tunnelling proxy
+	if {![catch {proxyfilter $host $port} answer] && $answer != {}} {
+	    return [::tls::import \
+			[::pconnect::socket $host $port \
+			    -proxyfilter [namespace current]::proxyfilter]]
 	} else {
 	    return [eval [list ::tls::socket] $args]
 	}



More information about the Tkabber-dev mailing list