diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-13 12:14:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-13 12:14:07 +0000 |
| commit | e9188d4e05eeadfd9246d9dc44160736f6fa64d6 (patch) | |
| tree | 7fcdcc5cd7c7e90e2ae4f8abc309fc74101b025b /phpBB/includes/functions_jabber.php | |
| parent | 11f05e3513f4133cce57d4177f9616c1ef32cd34 (diff) | |
| download | forums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.tar forums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.tar.gz forums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.tar.bz2 forums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.tar.xz forums-e9188d4e05eeadfd9246d9dc44160736f6fa64d6.zip | |
Some changes... non-invasive...
git-svn-id: file:///svn/phpbb/trunk@8025 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_jabber.php')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index f9c0a6308e..e58b85db19 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -416,7 +416,7 @@ class jabber } // Let's use TLS if SSL is not enabled and we can actually use it - if (!$this->session['ssl'] && $this->can_use_tls() && isset($xml['stream:features'][0]['#']['starttls'])) + if (!$this->session['ssl'] && $this->can_use_tls() && $this->can_use_ssl() && isset($xml['stream:features'][0]['#']['starttls'])) { $this->add_to_log('Switching to TLS.'); $this->send("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>\n"); |