# HG changeset patch # User Mark Brand # Date 1350396957 -7200 # Node ID 27a99ab695d87819d2139d59bec464412cbb04ec # Parent 45487fd67ba830a0296ae1bbe10be8144aa0f4b9 update package vmime diff -r 45487fd67ba8 -r 27a99ab695d8 src/vmime-1-fixes.patch --- a/src/vmime-1-fixes.patch Tue Oct 16 03:31:09 2012 +0200 +++ b/src/vmime-1-fixes.patch Tue Oct 16 16:15:57 2012 +0200 @@ -7,7 +7,7 @@ From 17ff5157ffdc749f60b8285f84e64ac5e06d4283 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Tue, 16 Nov 2010 13:28:05 +0000 -Subject: [PATCH 01/42] Started version 0.9.2. +Subject: [PATCH 01/47] Started version 0.9.2. diff --git a/ChangeLog b/ChangeLog @@ -47,7 +47,7 @@ From c12ee2b267b9dcfd092a298dfd9a8eec81ab3a0b Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Tue, 30 Nov 2010 14:57:03 +0000 -Subject: [PATCH 02/42] Initialize and delete object. +Subject: [PATCH 02/47] Initialize and delete object. diff --git a/vmime/net/imap/IMAPParser.hpp b/vmime/net/imap/IMAPParser.hpp @@ -80,7 +80,7 @@ From fd277afe87485c9d3377964794b76006c6d36a56 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Wed, 8 Dec 2010 08:52:54 +0000 -Subject: [PATCH 03/42] No extra space between ':' and '<' in MAIL FROM and +Subject: [PATCH 03/47] No extra space between ':' and '<' in MAIL FROM and RCPT TO. Wait for server response after QUIT and before closing connection. @@ -122,7 +122,7 @@ From d64da50e879c0e480d2e65c43e3b903c3e80101f Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 10 Dec 2010 16:24:06 +0000 -Subject: [PATCH 04/42] Fixed unit test after bug fix. +Subject: [PATCH 04/47] Fixed unit test after bug fix. diff --git a/tests/net/smtp/SMTPTransportTest.cpp b/tests/net/smtp/SMTPTransportTest.cpp @@ -145,7 +145,7 @@ From 130d0aabda2a9988913ad201390796775dc16a65 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 10 Dec 2010 16:54:38 +0000 -Subject: [PATCH 05/42] Fixed boundary parsing (thanks to John van der Kamp, +Subject: [PATCH 05/47] Fixed boundary parsing (thanks to John van der Kamp, Zarafa). @@ -233,7 +233,7 @@ From c63f37c888798f0e7e99aa03afda16445a72b7b2 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 21 Jan 2011 15:28:06 +0000 -Subject: [PATCH 06/42] Fixed possible infinite loop (thanks to John van der +Subject: [PATCH 06/47] Fixed possible infinite loop (thanks to John van der Kamp, Zarafa). @@ -285,7 +285,7 @@ From 1fafad8f913e700b350e6915de8be710fc2d1ced Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 28 Jan 2011 12:11:08 +0000 -Subject: [PATCH 07/42] Fixed possible read to invalid memory location (thanks +Subject: [PATCH 07/47] Fixed possible read to invalid memory location (thanks to Alexander Konovalov). @@ -309,7 +309,7 @@ From 73298423f695d7c4441d44619e4b7f9de75f566e Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Wed, 9 Mar 2011 18:03:31 +0000 -Subject: [PATCH 08/42] Fixed bug #3174903. Fixed word parsing when buffer +Subject: [PATCH 08/47] Fixed bug #3174903. Fixed word parsing when buffer does not end with NL. Fixed 'no encoding' when forced. @@ -515,7 +515,7 @@ From 5f5757b9d4bb0febb1e2183578eb91e801a08038 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 27 Mar 2011 11:26:55 +0000 -Subject: [PATCH 09/42] Allow static linking in mingw-cross-env. Added 'iconv' +Subject: [PATCH 09/47] Allow static linking in mingw-cross-env. Added 'iconv' and uses 'ws2_32' instead of 'winsock32' (#3213487). @@ -548,7 +548,7 @@ From 2b48b4a68ce3e9b9b1a3f485123af5938a568324 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 31 Mar 2011 19:13:03 +0000 -Subject: [PATCH 10/42] Flush stateful data from iconv (thanks to John van der +Subject: [PATCH 10/47] Flush stateful data from iconv (thanks to John van der Kamp, Zarafa). @@ -629,7 +629,7 @@ From 8d2e039c5201e144ff08e2ff7cf9efe77fe4b3d0 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 10 Jun 2011 19:39:09 +0000 -Subject: [PATCH 11/42] Requested email change. +Subject: [PATCH 11/47] Requested email change. diff --git a/AUTHORS b/AUTHORS @@ -652,7 +652,7 @@ From cc6317f28ae0b61fea36e1bc78b09dc8300579f8 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Tue, 14 Jun 2011 18:37:54 +0000 -Subject: [PATCH 12/42] Fixed compilation issue following namespace change. +Subject: [PATCH 12/47] Fixed compilation issue following namespace change. diff --git a/examples/example7.cpp b/examples/example7.cpp @@ -688,7 +688,7 @@ From a916d12d44ac43fc8e4729e0a91f4d6243f29a11 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 19 Jun 2011 17:51:33 +0000 -Subject: [PATCH 13/42] Fixed parsing of an attachment filename that is +Subject: [PATCH 13/47] Fixed parsing of an attachment filename that is between 66 and 76 characters long (Zarafa). @@ -713,7 +713,7 @@ From 9735165c57000a6368e91ce8852206a20930c1ca Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 19 Jun 2011 18:08:12 +0000 -Subject: [PATCH 14/42] Correctly generate attachment names which are long and +Subject: [PATCH 14/47] Correctly generate attachment names which are long and have high characters for Outlook Express (Zarafa). @@ -852,7 +852,7 @@ From 8d69ad6849d8d6b211674942157f2af8bcd51c26 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 19 Jun 2011 18:16:49 +0000 -Subject: [PATCH 15/42] Alias for UTF-7 charset. +Subject: [PATCH 15/47] Alias for UTF-7 charset. diff --git a/src/charset.cpp b/src/charset.cpp @@ -887,7 +887,7 @@ From ccd95daf9cdd7171fc2027afa5d0ad80b0475ded Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 19 Jun 2011 18:39:35 +0000 -Subject: [PATCH 16/42] Fixed messageBuilder to accept an empty mailbox group +Subject: [PATCH 16/47] Fixed messageBuilder to accept an empty mailbox group in 'To:' field, to allow for undisclosed-recipients (Zarafa). @@ -924,7 +924,7 @@ From 583e25bcdee132e53e0792cd8f0d8e535cabb743 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 19 Jun 2011 18:49:55 +0000 -Subject: [PATCH 17/42] Added support for mailboxes that specify an (encoded) +Subject: [PATCH 17/47] Added support for mailboxes that specify an (encoded) full name with an empty email address, set by a <> marker (Zarafa). @@ -997,7 +997,7 @@ From 461b92f84d5c16b297d33610fcd89fc7ca5a161a Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 24 Jun 2011 15:46:23 +0000 -Subject: [PATCH 18/42] Added missing libs in pkg-config file. +Subject: [PATCH 18/47] Added missing libs in pkg-config file. diff --git a/SConstruct b/SConstruct @@ -1020,7 +1020,7 @@ From 2b2c0abd02a17ccff7d49e266b9854f4ea47f8e4 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sat, 25 Jun 2011 17:07:53 +0000 -Subject: [PATCH 19/42] Fixed parsing of empty body parts (thanks to John van +Subject: [PATCH 19/47] Fixed parsing of empty body parts (thanks to John van der Kamp, from Zarafa). @@ -1083,7 +1083,7 @@ From 2648d744da0e2e744c7959999ac513c3016072b4 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 26 Jun 2011 08:19:11 +0000 -Subject: [PATCH 20/42] Use gnutls_priority_set_direct() instead of GNUTLS +Subject: [PATCH 20/47] Use gnutls_priority_set_direct() instead of GNUTLS deprecated functions. @@ -1192,7 +1192,7 @@ From 1060121ffd4315c3158ffc001040f4f705514e7a Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 26 Jun 2011 12:47:25 +0000 -Subject: [PATCH 21/42] Fixed encoding of whitespace. Fixed old test case. +Subject: [PATCH 21/47] Fixed encoding of whitespace. Fixed old test case. diff --git a/src/text.cpp b/src/text.cpp @@ -1285,7 +1285,7 @@ From dc6dc039fc0edccf4630894fa6ed8cd4bf3bb3ce Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sat, 20 Aug 2011 06:35:06 +0000 -Subject: [PATCH 22/42] Use gnutls_strerror() for reporting errors. +Subject: [PATCH 22/47] Use gnutls_strerror() for reporting errors. diff --git a/src/net/tls/TLSSession.cpp b/src/net/tls/TLSSession.cpp @@ -1435,7 +1435,7 @@ From 7ea6fc3737ef36407e1c90f3aa05f89a39bdefb7 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 21 Aug 2011 08:55:46 +0000 -Subject: [PATCH 23/42] Removed dependency on gcrypt for gnutls version >= +Subject: [PATCH 23/47] Removed dependency on gcrypt for gnutls version >= 2.12. @@ -1488,7 +1488,7 @@ From f21c55be642b166a2f0518ace2b179bed3916b23 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sun, 21 Aug 2011 09:04:46 +0000 -Subject: [PATCH 24/42] Fixed HAVE_GNUTLS_PRIORITY_FUNCS never defined when +Subject: [PATCH 24/47] Fixed HAVE_GNUTLS_PRIORITY_FUNCS never defined when configured with no TLS support. @@ -1520,7 +1520,7 @@ From d4e66226a696745adafa1767210580f8fbb7ae00 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Tue, 15 Nov 2011 11:40:42 +0000 -Subject: [PATCH 25/42] GNU TLS 3 has no 'extra' (thanks to mabrand). +Subject: [PATCH 25/47] GNU TLS 3 has no 'extra' (thanks to mabrand). diff --git a/src/net/tls/TLSSession.cpp b/src/net/tls/TLSSession.cpp @@ -1544,7 +1544,7 @@ From bacbe512e406d22f6acc83597fcdfc2d624cf82b Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Tue, 15 Nov 2011 11:46:07 +0000 -Subject: [PATCH 26/42] Set Diffie-Hellman prime size (bug SF#3434852). +Subject: [PATCH 26/47] Set Diffie-Hellman prime size (bug SF#3434852). diff --git a/src/net/tls/TLSSession.cpp b/src/net/tls/TLSSession.cpp @@ -1566,7 +1566,7 @@ From 6574b60a303c5d864e840aa23959656bb2803485 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 22 Dec 2011 08:51:28 +0000 -Subject: [PATCH 27/42] Updated coding conventions. +Subject: [PATCH 27/47] Updated coding conventions. diff --git a/HACKING b/HACKING @@ -1686,7 +1686,7 @@ From 130e5223dea0af2f8d9d01cca7845be4e1a08d13 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 5 Apr 2012 11:46:39 +0200 -Subject: [PATCH 28/42] Added function to retrieve sequence numbers of +Subject: [PATCH 28/47] Added function to retrieve sequence numbers of messages whose UID is greater or equal than a specified UID (thanks to Zahi Mashael). @@ -1856,7 +1856,7 @@ From 3f1a565b8b532f0d11a13d3f6d763b00c8ce625b Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 5 Apr 2012 11:55:07 +0200 -Subject: [PATCH 29/42] Added .gitignore. +Subject: [PATCH 29/47] Added .gitignore. diff --git a/.gitignore b/.gitignore @@ -1883,7 +1883,7 @@ From 5937bcda0fac9cb80d0cecbaa663ecdfe2839c09 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 5 Apr 2012 12:08:01 +0200 -Subject: [PATCH 30/42] Added check before dereferencing. +Subject: [PATCH 30/47] Added check before dereferencing. diff --git a/vmime/utility/smartPtr.hpp b/vmime/utility/smartPtr.hpp @@ -1908,7 +1908,7 @@ From b0d74ce63ea9563ef4b218bce2497bd668dfad29 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 5 Apr 2012 12:34:51 +0200 -Subject: [PATCH 31/42] Updated README. +Subject: [PATCH 31/47] Updated README. diff --git a/README b/README @@ -1954,7 +1954,7 @@ From 350fada21a4f11c2f633a3cde1f2195efefe7e32 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 5 Apr 2012 22:10:54 +0200 -Subject: [PATCH 32/42] Added test: Ensure '7bit' encoding is used when body +Subject: [PATCH 32/47] Added test: Ensure '7bit' encoding is used when body is 7-bit only. @@ -1996,7 +1996,7 @@ From 6c877ea41a2e408df61ac6f988c3bae7e0821141 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 5 Apr 2012 22:29:32 +0200 -Subject: [PATCH 33/42] Added tests for Quoted-Printable encoding. +Subject: [PATCH 33/47] Added tests for Quoted-Printable encoding. diff --git a/tests/utility/encoderTest.cpp b/tests/utility/encoderTest.cpp @@ -2055,7 +2055,7 @@ From e88f062ab58654aee3cf45f94e8a5dd6c1256279 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 5 Apr 2012 23:15:04 +0200 -Subject: [PATCH 34/42] Fixed wrong encoding of line breaks in QP-encoded text +Subject: [PATCH 34/47] Fixed wrong encoding of line breaks in QP-encoded text (issue #7). @@ -2306,7 +2306,7 @@ From ea77bdba96588345090e3de81d9d6af116edeeb5 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 6 Apr 2012 22:26:18 +0200 -Subject: [PATCH 35/42] Fixed memory leak. +Subject: [PATCH 35/47] Fixed memory leak. diff --git a/src/net/tls/TLSSocket.cpp b/src/net/tls/TLSSocket.cpp @@ -2333,7 +2333,7 @@ From 440d491fd6da134fcb5f19416743e8f2044556bf Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sat, 14 Apr 2012 13:46:05 +0200 -Subject: [PATCH 36/42] Split stream.hpp/.cpp into multiple source files. +Subject: [PATCH 36/47] Split stream.hpp/.cpp into multiple source files. diff --git a/SConstruct b/SConstruct @@ -5727,7 +5727,7 @@ From be30b47f09c5358db2ac8e42fa2bb4a14ec24c51 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Mon, 16 Apr 2012 22:32:33 +0200 -Subject: [PATCH 37/42] Added ability to parse directly from an input stream +Subject: [PATCH 37/47] Added ability to parse directly from an input stream (eg. file). This allows very big messages to be parsed without loading the whole message data into memory. @@ -9463,7 +9463,7 @@ From 2e05e574fde890c7ec6dd9f3930d06b1b492ea80 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 27 Apr 2012 08:34:26 +0200 -Subject: [PATCH 38/42] Fixed duplicate file reference (thanks to Enes Albay). +Subject: [PATCH 38/47] Fixed duplicate file reference (thanks to Enes Albay). diff --git a/SConstruct b/SConstruct @@ -9485,7 +9485,7 @@ From 799629fd8b21a716f3e3abc6e6a5264555470d85 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 6 Jul 2012 18:45:02 +0200 -Subject: [PATCH 39/42] Fixed issue #10. +Subject: [PATCH 39/47] Fixed issue #10. diff --git a/src/net/imap/IMAPMessage.cpp b/src/net/imap/IMAPMessage.cpp @@ -9508,7 +9508,7 @@ From 72cf7a025f7764998609683904eea1046a766d97 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sat, 28 Jul 2012 13:01:48 +0200 -Subject: [PATCH 40/42] Added functions to get messages by UID (IMAP only for +Subject: [PATCH 40/47] Added functions to get messages by UID (IMAP only for now). @@ -10122,7 +10122,7 @@ From 7501f61214b06a35c8fce7772fd48dded2cad335 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Mon, 30 Jul 2012 11:23:23 +0200 -Subject: [PATCH 41/42] Fixed compilation warning. +Subject: [PATCH 41/47] Fixed compilation warning. diff --git a/vmime/utility/parserInputStreamAdapter.hpp b/vmime/utility/parserInputStreamAdapter.hpp @@ -10154,7 +10154,7 @@ From f9f9b3bf52c76e1803855d1c44147f68ec9f62f2 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Mon, 30 Jul 2012 20:45:17 +0200 -Subject: [PATCH 42/42] Fixed body part extraction (only body should be +Subject: [PATCH 42/47] Fixed body part extraction (only body should be extracted). @@ -10314,3 +10314,175 @@ -- 1.7.10.4 + +From 1c58fc9735c9832c8e849d4f37f4f502b1fc895c Mon Sep 17 00:00:00 2001 +From: Vincent Richard +Date: Mon, 30 Jul 2012 21:28:59 +0200 +Subject: [PATCH 43/47] Added README about autotools scripts. (cherry picked + from commit 99908ce889eaa7ea6ba917255f11bf9969515793) + + +diff --git a/README.autotools b/README.autotools +new file mode 100644 +index 0000000..4b83a22 +--- /dev/null ++++ b/README.autotools +@@ -0,0 +1,8 @@ ++Where are the ./configure script and the Makefile's? ++ ++Configure and Make scripts are not included in the git source tree. They are ++automatically generated by the SConstruct script. ++ ++Just type "scons autotools" to generate everything needed for the traditional ++./configure, make, make install build process. ++ +-- +1.7.10.4 + + +From 1e3ba8c5d520a4b6ab85478672e96f219b9f6135 Mon Sep 17 00:00:00 2001 +From: Vincent Richard +Date: Mon, 15 Oct 2012 11:19:53 +0200 +Subject: [PATCH 45/47] Do not fail if charset is not recognized. (cherry + picked from commit + e4102b4374e3acde31c9d320166ef37855834c72) + + +diff --git a/src/word.cpp b/src/word.cpp +index 2876ddf..1ea2293 100644 +--- a/src/word.cpp ++++ b/src/word.cpp +@@ -695,7 +695,16 @@ const string word::getConvertedText(const charset& dest) const + { + string out; + +- charset::convert(m_buffer, out, m_charset, dest); ++ try ++ { ++ charset::convert(m_buffer, out, m_charset, dest); ++ } ++ catch (vmime::exceptions::charset_conv_error& e) ++ { ++ // Do not fail if charset is not recognized: ++ // copy 'word' as raw text ++ out = m_buffer; ++ } + + return (out); + } +-- +1.7.10.4 + + +From 927c052cafd65b14036834e9cb91a4b453aa2c5c Mon Sep 17 00:00:00 2001 +From: Vincent Richard +Date: Mon, 15 Oct 2012 11:23:22 +0200 +Subject: [PATCH 46/47] Support for bogus encoding name 'bmoted-printable' + (Zarafa). (cherry picked from commit + 2b09c6ea6cfad29682976ea7748721551dd3db64) + + +diff --git a/src/utility/encoder/encoderFactory.cpp b/src/utility/encoder/encoderFactory.cpp +index 2237178..1798ffa 100644 +--- a/src/utility/encoder/encoderFactory.cpp ++++ b/src/utility/encoder/encoderFactory.cpp +@@ -50,6 +50,9 @@ encoderFactory::encoderFactory() + // Also register some non-standard encoding names + registerName ("7-bit"); + registerName ("8-bit"); ++ ++ // Finally, register some bogus encoding names, for compatibility ++ registerName ("bmoted-printable"); + } + + +-- +1.7.10.4 + + +From fe3114a41e2803b2a6993e8dd03e1ed685e4570c Mon Sep 17 00:00:00 2001 +From: Vincent Richard +Date: Mon, 15 Oct 2012 11:48:14 +0200 +Subject: [PATCH 47/47] Added support for timeout when receiving data from a + socket (POSIX platform). (cherry picked from commit + 794afe9a1b5ee36a5de8f90f3d789ca46f393bb7) + + +diff --git a/src/platforms/posix/posixSocket.cpp b/src/platforms/posix/posixSocket.cpp +index b8bb8b1..f280dad 100644 +--- a/src/platforms/posix/posixSocket.cpp ++++ b/src/platforms/posix/posixSocket.cpp +@@ -336,7 +336,45 @@ void posixSocket::receive(vmime::string& buffer) + + posixSocket::size_type posixSocket::receiveRaw(char* buffer, const size_type count) + { +- const int ret = ::recv(m_desc, buffer, count, 0); ++ // Check whether data is available ++ fd_set fds; ++ FD_ZERO(&fds); ++ FD_SET(m_desc, &fds); ++ ++ struct timeval tv; ++ tv.tv_sec = 1; ++ tv.tv_usec = 0; ++ ++ int ret = ::select(m_desc + 1, &fds, NULL, NULL, &tv); ++ ++ if (ret < 0) ++ { ++ if (errno != EAGAIN) ++ throwSocketError(errno); ++ ++ // No data available at this time ++ // Check if we are timed out ++ if (m_timeoutHandler && ++ m_timeoutHandler->isTimeOut()) ++ { ++ if (!m_timeoutHandler->handleTimeOut()) ++ { ++ // Server did not react within timeout delay ++ throwSocketError(errno); ++ } ++ else ++ { ++ // Reset timeout ++ m_timeoutHandler->resetTimeOut(); ++ } ++ } ++ ++ // Continue waiting for data ++ return 0; ++ } ++ ++ // Read available data ++ ret = ::recv(m_desc, buffer, count, 0); + + if (ret < 0) + { +@@ -351,6 +389,12 @@ posixSocket::size_type posixSocket::receiveRaw(char* buffer, const size_type cou + // Host shutdown + throwSocketError(ENOTCONN); + } ++ else ++ { ++ // Data received, reset timeout ++ if (m_timeoutHandler) ++ m_timeoutHandler->resetTimeOut(); ++ } + + return ret; + } +@@ -383,6 +427,10 @@ void posixSocket::sendRaw(const char* buffer, const size_type count) + size -= ret; + } + } ++ ++ // Reset timeout ++ if (m_timeoutHandler) ++ m_timeoutHandler->resetTimeOut(); + } + + +-- +1.7.10.4 +