Apply patch to fix SSL server support

git-svn-id: file:///home/svn/framework3/trunk@6391 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2009-03-25 16:41:10 +00:00
parent 5f5dfbf823
commit 753c7aa7d5
1 changed files with 11 additions and 6 deletions

View File

@ -142,14 +142,19 @@ protected
# Accept the new client connection # Accept the new client connection
if (sd and sd[0].length > 0) if (sd and sd[0].length > 0)
cli = accept begin
cli = accept
next unless cli next unless cli
# Insert it into some lists # Insert it into some lists
self.clients << cli self.clients << cli
on_client_connect(cli) on_client_connect(cli)
# Skip exceptions caused by accept() [ SSL ]
rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
end
end end
rescue ::Exception rescue ::Exception
@ -176,7 +181,7 @@ protected
sd[0].each { |fd| sd[0].each { |fd|
begin begin
on_client_data(fd) on_client_data(fd)
rescue EOFError rescue ::EOFError, ::Errno::ECONNRESET, ::Errno::ENOTCONN, ::Errno::ECONNABORTED
on_client_close(fd) on_client_close(fd)
close_client(fd) close_client(fd)
rescue ::Interrupt rescue ::Interrupt