diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 07:38:30 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 07:38:30 +0000 |
| commit | 39d1071b90280fb5549c1d01c847998e4f69dad6 (patch) | |
| tree | ac74033c5762522ca3a7a4de4344132fbd39e759 | |
| parent | 44fcc21eb6d784359427d63030b5014ce4bbf911 (diff) | |
merge revisio(s) 29111:
* lib/net/imap.rb (initialize): sets sync_close to true.
Thanks, Hiroshi NAKAMURA. [ruby-core:31753]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/imap.rb | 1 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Nov 23 20:48:10 2010 Shugo Maeda <shugo@ruby-lang.org> + + * lib/net/imap.rb (initialize): sets sync_close to true. + Thanks, Hiroshi NAKAMURA. [ruby-core:31753] + Tue Nov 23 17:09:14 2010 NAKAMURA Usaku <usa@ruby-lang.org> * lib/pathname.rb (relative_path_from): backport r23093 and r25440 diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 97b960a0c2..58215fc8c8 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -901,6 +901,7 @@ module Net context.verify_callback = VerifyCallbackProc end @sock = SSLSocket.new(@sock, context) + @sock.sync_close = true @sock.connect # start ssl session. @sock.post_connection_check(@host) if verify else @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2010-11-23" +#define RUBY_RELEASE_DATE "2010-11-24" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20101123 -#define RUBY_PATCHLEVEL 318 +#define RUBY_RELEASE_CODE 20101124 +#define RUBY_PATCHLEVEL 319 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 24 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |