Author: asterix Date: 2009-04-06 16:05:07 +0200 (Mon, 06 Apr 2009) New Revision: 11202

Modified: trunk/src/common/xmpp/transports_nb.py Log: ignore port in bosh URL, it's entered separetly. Take into account proxy username when using bosh

Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2009-04-06 13:36:29 UTC (rev 11201) +++ trunk/src/common/xmpp/transports_nb.py 2009-04-06 14:05:07 UTC (rev 11202) @@ -57,12 +57,13 @@ if proxy_type == 'bosh' and not proxy['bosh_useproxy']: # with BOSH not over proxy we have to parse the hostname from BOSH URI tcp_host, tcp_port = urisplit(proxy['bosh_uri'])[1], proxy['bosh_port'] + tcp_host = tcp_host.split(':')[0] else: # with proxy!=bosh or with bosh over HTTP proxy we're connecting to proxy # machine tcp_host, tcp_port = proxy['host'], proxy['port'] - if proxy['useauth']: - proxy_user, proxy_pass = proxy['user'], proxy['pass'] + if proxy['useauth']: + proxy_user, proxy_pass = proxy['user'], proxy['pass'] return tcp_host, tcp_port, proxy_user, proxy_pass

#: timeout to connect to the server socket, it doesn't include auth