You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/07/24 06:01:06 UTC
[1/3] git commit: TS-2061 Avoid overwriting overspill buffer in
logging.
Updated Branches:
refs/heads/master 2d9ad48c5 -> 956a4d70f
TS-2061 Avoid overwriting overspill buffer in logging.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/439d973f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/439d973f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/439d973f
Branch: refs/heads/master
Commit: 439d973ffa38fafd0eef1c84cda4e73d223d0ef5
Parents: 2d9ad48
Author: quehan <qu...@taobao.com>
Authored: Tue Jul 23 15:15:39 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jul 23 21:59:48 2013 -0600
----------------------------------------------------------------------
proxy/logging/LogFile.cc | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/439d973f/proxy/logging/LogFile.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index a47ba63..e7b9593 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -727,6 +727,8 @@ LogFile::write_ascii_logbuffer3(LogBufferHeader * buffer_header, char *alt_forma
} else {
if (bytes_written < fmt_buf_bytes) {
m_overspill_bytes = fmt_buf_bytes - bytes_written;
+ if (m_overspill_bytes > m_max_line_size)
+ m_overspill_bytes = m_max_line_size;
memcpy(m_overspill_buffer, &m_ascii_buffer[bytes_written], m_overspill_bytes);
m_overspill_written = 0;
}
[3/3] git commit: Added proper credit
Posted by zw...@apache.org.
Added proper credit
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/956a4d70
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/956a4d70
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/956a4d70
Branch: refs/heads/master
Commit: 956a4d70f100640294a6660d6b5bb4811e665538
Parents: 0d1d146
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jul 23 21:59:45 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jul 23 22:00:24 2013 -0600
----------------------------------------------------------------------
CHANGES | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/956a4d70/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8ff1495..fac88db 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ Changes with Apache Traffic Server 3.3.5
*) [TS-2064] Fix the authproxy plugin to send an error body.
*) [TS-2061] Avoid writing outside buffer boundaries in LogFile overfill
- buffers (for ASCII logging).
+ buffers (for ASCII logging). Author: quehan.
*) [TS-2041] Allow environment values to override records.config settings.
[2/3] git commit: Added Ts-2061.
Posted by zw...@apache.org.
Added Ts-2061.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0d1d146c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0d1d146c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0d1d146c
Branch: refs/heads/master
Commit: 0d1d146ce8a32a47679bff5b8711a36216124c6b
Parents: 439d973
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jul 23 15:17:00 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jul 23 22:00:24 2013 -0600
----------------------------------------------------------------------
CHANGES | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0d1d146c/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 5bcf4f3..8ff1495 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,13 @@
Changes with Apache Traffic Server 3.3.5
- *) [TS-1280] add url match token about cache control rule.
+ *) [TS-1280] Add url match token about cache control rule.
*) [TS-2064] Fix the authproxy plugin to send an error body.
+ *) [TS-2061] Avoid writing outside buffer boundaries in LogFile overfill
+ buffers (for ASCII logging).
+
*) [TS-2041] Allow environment values to override records.config settings.
*) [TS-2044] Avoid logging client running into DENY status infinitely.