diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:41 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:41 +0100 |
| commit | 723e38ece20f7a7a3611b86a4feafeb28560ce02 (patch) | |
| tree | 705f26afa4b1ff84f830bec9545ab1b8e9479305 /phpBB/includes/functions_jabber.php | |
| parent | 6ebc26e330d5e204eab0ac9061bb5817534047fe (diff) | |
| parent | 199bb1366018c61fe9c140d711369a92d576e757 (diff) | |
| download | forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.tar forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.tar.gz forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.tar.bz2 forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.tar.xz forums-723e38ece20f7a7a3611b86a4feafeb28560ce02.zip | |
Merge commit 'release-3.0.6-RC4'
Diffstat (limited to 'phpBB/includes/functions_jabber.php')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index 6d5021b9aa..16dce16a72 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -476,8 +476,9 @@ class jabber } else if (in_array('PLAIN', $methods) && ($this->session['ssl'] || !empty($this->session['tls']))) { + // http://www.ietf.org/rfc/rfc4616.txt (PLAIN SASL Mechanism) $this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>" - . base64_encode(chr(0) . $this->username . '@' . $this->server . chr(0) . $this->password) . + . base64_encode($this->username . '@' . $this->server . chr(0) . $this->username . chr(0) . $this->password) . '</auth>'); } else if (in_array('ANONYMOUS', $methods)) |