1 From: msvensson at mysql dot com
2 Date: December 22 2006 12:05am
3 Subject: bk commit into 5.0 tree (msvensson:1.2352) BUG#24148
5 Below is the list of changes that have just been committed into a local
6 5.0 repository of msvensson. When msvensson does a push these changes will
7 be propagated to the main repository and, within 24 hours after the
8 push, to the public repository.
9 For information on how to access the public repository
10 see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
12 ChangeSet@stripped, 2006-12-22 00:05:40+01:00, msvensson@stripped +1 -0
13 Bug#24148 regression tests hang with SSL enabled
14 - Don't call SSL_shutdown a second time
16 vio/viossl.c@stripped, 2006-12-22 00:05:39+01:00, msvensson@stripped +9 -5
17 SSL_shutdown might return 0 indicating that it should be called once
18 again for a graceful shutdown. Since the socket are going to be closed
19 anyway ther is no need for the second call.
21 # This is a BitKeeper patch. What follows are the unified diffs for the
22 # set of deltas contained in the patch. The rest of the patch, the part
23 # that BitKeeper cares about, is below these diffs.
25 # Host: pilot.mysql.com
26 # Root: /home/msvensson/mysql/mysql-5.0-maint
28 --- 1.38/vio/viossl.c 2006-11-20 21:41:56 +01:00
29 +++ 1.39/vio/viossl.c 2006-12-22 00:05:39 +01:00
32 switch ((r= SSL_shutdown(ssl)))
34 - case 1: /* Shutdown successful */
36 + /* Shutdown successful */
40 + Shutdown not yet finished - since the socket is going to
41 + be closed there is no need to call SSL_shutdown() a second
42 + time to wait for the other side to respond
45 - case 0: /* Shutdown not yet finished, call it again */
46 - if ((r= SSL_shutdown(ssl) >= 0))
49 default: /* Shutdown failed */
50 DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %d",
51 SSL_get_error(ssl, r)));