[Phpbb-checkins] r10245 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/functions_jabber.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Thu Oct 29 15:04:19 2009
New Revision: 10245

Log:
Fix Jabber SASL PLAIN authentication failures. (Bug #52995)

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/functions_jabber.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Thu Oct 29 15:04:19 2009
***************
*** 211,216 ****
--- 211,217 ----
  		<li>[Fix] Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)</li>
  		<li>[Fix] Only check whether forum image exists if forum image is specified. (Bug #51905)</li>
  		<li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li>
+ 		<li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li>
  		<li>[Change] Database updater now supports checking for existing/missing indexes.</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_jabber.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_jabber.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_jabber.php Thu Oct 29 15:04:19 2009
***************
*** 476,483 ****
  					}
  					else if (in_array('PLAIN', $methods) && ($this->session['ssl'] || !empty($this->session['tls'])))
  					{
  						$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) .
  							'</auth>');
  					}
  					else if (in_array('ANONYMOUS', $methods))
--- 476,484 ----
  					}
  					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($this->username . '@' . $this->server . chr(0) . $this->username . chr(0) . $this->password) .
  							'</auth>');
  					}
  					else if (in_array('ANONYMOUS', $methods))