summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2012-09-07 20:02:50 +0000
committerSteve Huston <shuston@riverace.com>2012-09-07 20:02:50 +0000
commit54b9ea849f00f4893899280456eddc80c1052952 (patch)
treeeb2cd269de47c83f5e0c973f9baedabcc78a9cf8
parentde4f47c01ff53c4074c979e80b60d3b3251a8fef (diff)
downloadATCD-54b9ea849f00f4893899280456eddc80c1052952.tar.gz
ChangeLogTag:Fri Sep 7 20:00:51 UTC 2012 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Stream.inl2
2 files changed, 6 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a68d5fc202c..c87900851a6 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 7 20:00:51 UTC 2012 Steve Huston <shuston@riverace.com>
+
+ * ace/SSL/SSL_SOCK_Stream.inl (recv_i): Remove the incorrect comment
+ form the syscall case about falling through to the default. That's
+ not right. Thanks to Simon Massey for pointing this out.
+
Fri Sep 7 19:43:12 UTC 2012 Steve Huston <shuston@riverace.com>
* ace/Sig_Handler.cpp (remove_handler_i): Check if the event handler
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.inl b/ACE/ace/SSL/SSL_SOCK_Stream.inl
index a720f07ebc6..239a44bc16e 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.inl
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.inl
@@ -194,8 +194,6 @@ ACE_SSL_SOCK_Stream::recv_i (void *buf,
// sent. This is a protocol error, but we ignore it.
break;
- // If not an EOF, then fall through to "default" case.
-
// On some platforms (e.g. MS Windows) OpenSSL does not store
// the last error in errno so explicitly do so.
ACE_OS::set_errno_to_last_error ();