summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-06 08:05:24 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-06 08:05:24 +0000
commit061fd36d75bff6335d2c6fdced5a70eb14bc8322 (patch)
tree19e04b8c92576201ace9e7f828047a44776383a4 /win32
parent70bde7a3b5347e6e68a6cb82714ef03304c13bb1 (diff)
* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
Add a null check for ssl; submitted by akira yamada in [ruby-dev:34950]. * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if SSL_OP_NO_TICKET is present; submitted by akira yamada in [ruby-dev:34944]. * test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a workaround for the case where OpenSSL is configured with --enable-tlsext; submitted by akira yamada in [ruby-dev:34944]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/win32/win32.h b/win32/win32.h
index abac2b1e3d..4d97ee4d5c 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -25,6 +25,7 @@
#endif
#ifdef USE_WINSOCK2
#include <winsock2.h>
+#include <ws2tcpip.h>
#include <windows.h>
#else
#include <windows.h>