Mercurial > prosody-hg

comparison net/server_event.lua @ 2462:2d81cc25b5a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
net.server_event: Remove access to starttls method when starttls is negotiated - fixes offering starttls to client who are already using it (thanks darkrain and Adium)
author Matthew Wild <mwild1@gmail.com>
date Mon, 18 Jan 2010 18:20:03 +0000
parents 44d4c69155e0
children a08ba94c2a29
comparison
equal deleted inserted replaced
2461:a6a50cf0e444 2462:2d81cc25b5a6
413 self.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, self.startsslcallback, 0 ) -- add event to start handshake 413 self.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, self.startsslcallback, 0 ) -- add event to start handshake
414 else -- wait until writebuffer is empty 414 else -- wait until writebuffer is empty
415 self:_lock( true, true, false ) 415 self:_lock( true, true, false )
416 debug "ssl session delayed until writebuffer is empty..." 416 debug "ssl session delayed until writebuffer is empty..."
417 end 417 end
418 self.starttls = false;
418 return true 419 return true
419 end 420 end
420 421
421 function interface_mt:setoption(option, value) 422 function interface_mt:setoption(option, value)
422 return self.conn:setoption(option, value); 423 return self.conn:setoption(option, value);