diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-04-26 10:55:17 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-04-26 10:55:17 +0000 |
| commit | 3de040032f1bcc30e161189ed476f3b1c1c848b0 (patch) | |
| tree | 45ec9e8120d1d7dc2e43264c4b42e084b1643bc5 | |
| parent | 6894a7cd181b61f8fcc0f03f2b7fb89a2ae5012c (diff) | |
| download | ATCD-3de040032f1bcc30e161189ed476f3b1c1c848b0.tar.gz | |
Thu Apr 26 10:53:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/SSL/SSL_Asynch_Stream.cpp | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 83792e74a7b..1573359382b 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 26 10:53:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/SSL/SSL_Asynch_Stream.cpp (do_SSL_read): + Also added ERR_clear_error before doing a SSL_write, belongs to + bugzilla 2912 + Wed Apr 25 13:11:00 UTC 2007 Simon Massey <sma@prismtech.com> * ace/config-lynxos.h: diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index 68b29c21a32..877125d19c4 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -609,11 +609,13 @@ ACE_SSL_Asynch_Stream::do_SSL_write (void) ACE_Message_Block & mb = this->ext_write_result_->message_block (); size_t bytes_req = this->ext_write_result_->bytes_to_write (); + ERR_clear_error(); + const int bytes_trn = ::SSL_write (this->ssl_, mb.rd_ptr (), bytes_req); - int status = ::SSL_get_error (this->ssl_, bytes_trn); + int const status = ::SSL_get_error (this->ssl_, bytes_trn); switch (status) { |