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 2014/12/31 03:39:28 UTC
[1/7] trafficserver git commit: TS-3261: Fix SSL BIO memory leak
issue introduced in TS-3006
Repository: trafficserver
Updated Branches:
refs/heads/5.2.x 0be68b86f -> d0323f409
TS-3261: Fix SSL BIO memory leak issue introduced in TS-3006
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/439c5314
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/439c5314
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/439c5314
Branch: refs/heads/5.2.x
Commit: 439c531452c78e4857a97ea710960b361eac33c4
Parents: 0be68b8
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Dec 30 17:51:02 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Dec 30 17:51:02 2014 -0700
----------------------------------------------------------------------
iocore/net/SSLInternal.cc | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/439c5314/iocore/net/SSLInternal.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLInternal.cc b/iocore/net/SSLInternal.cc
index d2c96fe..b6d657a 100644
--- a/iocore/net/SSLInternal.cc
+++ b/iocore/net/SSLInternal.cc
@@ -32,5 +32,8 @@
void
SSL_set_rbio(SSLNetVConnection *sslvc, BIO *rbio)
{
+ if (sslvc->ssl->rbio != NULL) {
+ BIO_free(sslvc->ssl->rbio);
+ }
sslvc->ssl->rbio = rbio;
}
[4/7] trafficserver git commit: TS-3262 Change abs() to std::abs(),
avoid compiler errors
Posted by zw...@apache.org.
TS-3262 Change abs() to std::abs(), avoid compiler errors
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/48db76d5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/48db76d5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/48db76d5
Branch: refs/heads/5.2.x
Commit: 48db76d5da2ad282c290edac2acdb8562cdc6432
Parents: 9fed259
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Dec 29 16:45:44 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Dec 30 19:28:56 2014 -0700
----------------------------------------------------------------------
proxy/CoreUtils.cc | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/48db76d5/proxy/CoreUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/CoreUtils.cc b/proxy/CoreUtils.cc
index 31eb50e..9723c39 100644
--- a/proxy/CoreUtils.cc
+++ b/proxy/CoreUtils.cc
@@ -114,9 +114,10 @@ int program_counter = 0;
#endif /* darwin || freebsd || solaris */
#include "EventName.h"
-
#include "http/HttpSM.h"
+#include <cstdlib>
+
bool inTable;
FILE *fp;
memTable default_memTable = { 0, 0, 0 };
@@ -263,7 +264,7 @@ CoreUtils::read_from_core(intptr_t vaddr, intptr_t bytes, char *buf)
intptr_t vadd = arrayMem[index - 1].vaddr;
intptr_t offset = arrayMem[index - 1].offset;
intptr_t size = arrayMem[index - 1].fsize;
- intptr_t offset2 = abs(vaddr - vadd);
+ intptr_t offset2 = std::abs(vaddr - vadd);
if (bytes > (size - offset2))
return -1;
@@ -302,7 +303,7 @@ CoreUtils::get_base_frame(intptr_t framep, core_stack_state *coress)
intptr_t index = find_vaddr(framep, arrayMem.length(), 0);
intptr_t vadd = arrayMem[index - 1].vaddr;
intptr_t off = arrayMem[index - 1].offset;
- intptr_t off2 = abs(vadd - framep);
+ intptr_t off2 = std::abs(vadd - framep);
intptr_t size = arrayMem[index - 1].fsize;
intptr_t i = 0;
@@ -345,7 +346,7 @@ CoreUtils::get_next_frame(core_stack_state * coress)
// finds vaddress less than framep
intptr_t vadd = arrayMem[index - 1].vaddr;
intptr_t off = arrayMem[index - 1].offset;
- intptr_t off2 = abs(vadd - framep);
+ intptr_t off2 = std::abs(vadd - framep);
// seek to the framep offset
if (fseek(fp, off + off2, SEEK_SET) != -1) {
@@ -649,7 +650,7 @@ CoreUtils::load_http_hdr(HTTPHdr * core_hdr, HTTPHdr * live_hdr)
}
char *free_start = (char *) (((HdrStrHeap *) str_hdr)->m_free_start);
- int nto_copy = abs((char *) copy_start - free_start);
+ int nto_copy = std::abs((char *) copy_start - free_start);
ats_free(str_hdr);
#if defined(__GNUC__)
char rw_heap[sizeof(char) * nto_copy];
@@ -791,7 +792,7 @@ CoreUtils::read_heap_header(intptr_t vaddr, intptr_t bytes, HdrHeap h)
intptr_t vadd = arrayMem[index - 1].vaddr;
intptr_t offset = arrayMem[index - 1].offset;
intptr_t size = arrayMem[index - 1].fsize;
- intptr_t offset2 = abs(vaddr - vadd);
+ intptr_t offset2 = std::abs(vaddr - vadd);
if (bytes > (size - offset2))
return -1;
[7/7] trafficserver git commit: Update CHANGES with the backported
changes.
Posted by zw...@apache.org.
Update CHANGES with the backported changes.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d0323f40
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d0323f40
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d0323f40
Branch: refs/heads/5.2.x
Commit: d0323f40925b047c93b4e0d37718a6963d433de9
Parents: a3572c3
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Dec 30 19:30:38 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Dec 30 19:30:38 2014 -0700
----------------------------------------------------------------------
CHANGES | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d0323f40/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index f92dae8..d34d697 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.2.0
+ *) [TS-3262] Change abs() to std::abs(), avoid compiler errors.
+
+ *) [TS-3265] Fix spdy req_map access to use iterator instead of operator[].
+
+ *) [TS-3261] Fix SSL BIO memory leak issue introduced in TS-3006.
+
*) [TS-3257] Fix ssl handshake buffer memory leak introduced in TS-3006.
*) [TS-3248] Fix to resolve crash introduced in TS-3189.
[6/7] trafficserver git commit: Update release date.
Posted by zw...@apache.org.
Update release date.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a3572c39
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a3572c39
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a3572c39
Branch: refs/heads/5.2.x
Commit: a3572c39afa1ac9c4483dd9872ff307cf26dd472
Parents: aef60cf
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Dec 30 19:30:07 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Dec 30 19:30:07 2014 -0700
----------------------------------------------------------------------
STATUS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a3572c39/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index cc19811..3647191 100644
--- a/STATUS
+++ b/STATUS
@@ -8,7 +8,7 @@ The current version of this file can be found at:
Release history:
- 5.2.0 : Released on Dec 29nd, 2014
+ 5.2.0 : Released on Jan 7th, 2014
5.1.2 : Released on Dec 15th, 2014
5.1.1 : Released on Oct 31st, 2014
5.1.0 : Released on Sep 18th, 2014
[5/7] trafficserver git commit: TS-3262 Check _hostname[0],
which seems correct
Posted by zw...@apache.org.
TS-3262 Check _hostname[0], which seems correct
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/aef60cfa
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/aef60cfa
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/aef60cfa
Branch: refs/heads/5.2.x
Commit: aef60cfa86d4e010e29963556ae965cffad0caf6
Parents: 48db76d
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Dec 30 17:18:17 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Dec 30 19:29:05 2014 -0700
----------------------------------------------------------------------
proxy/ICPConfig.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/aef60cfa/proxy/ICPConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/ICPConfig.cc b/proxy/ICPConfig.cc
index e799fc5..1aadd44 100644
--- a/proxy/ICPConfig.cc
+++ b/proxy/ICPConfig.cc
@@ -473,7 +473,7 @@ ICPConfiguration::UpdatePeerConfig()
//
memcpy(_peer_cdata[i], _peer_cdata_current[i], sizeof(*_peer_cdata[i]));
// Setup IP address
- if ((_peer_cdata[i]->_ip_addr.isValid()) && _peer_cdata[i]->_hostname) {
+ if ((_peer_cdata[i]->_ip_addr.isValid()) && _peer_cdata[i]->_hostname[0]) {
// IP address not specified, lookup using hostname.
(void) PeerConfigData::GetHostIPByName(_peer_cdata[i]->_hostname, _peer_cdata[i]->_my_ip_addr);
} else {
[2/7] trafficserver git commit: [TS-3265]: Fix spdy req_map access to
use iterator instead of operator[]
Posted by zw...@apache.org.
[TS-3265]: Fix spdy req_map access to use iterator instead of operator[]
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9a599bb5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9a599bb5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9a599bb5
Branch: refs/heads/5.2.x
Commit: 9a599bb5b9b18d9c41b00cd02f1e3eb79ba348d5
Parents: 439c531
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Sun Dec 28 18:05:48 2014 +0000
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Dec 30 19:27:22 2014 -0700
----------------------------------------------------------------------
proxy/spdy/SpdyCallbacks.cc | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9a599bb5/proxy/spdy/SpdyCallbacks.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyCallbacks.cc b/proxy/spdy/SpdyCallbacks.cc
index 4d1aceb..7d7605d 100644
--- a/proxy/spdy/SpdyCallbacks.cc
+++ b/proxy/spdy/SpdyCallbacks.cc
@@ -52,7 +52,11 @@ spdy_callbacks_init(spdylay_session_callbacks *callbacks)
void
spdy_prepare_status_response_and_clean_request(SpdyClientSession *sm, int stream_id, const char *status)
{
- SpdyRequest *req = sm->req_map[stream_id];
+ SpdyRequest *req = sm->find_request(stream_id);
+ if (!req) {
+ Error ("spdy_prepare_status_response_and_clean_request, req object null for sm %" PRId64 ", stream_id %d", sm->sm_id, stream_id);
+ return;
+ }
string date_str = http_date(time(0));
const char **nv = new const char*[8+req->headers.size()*2+1];
@@ -328,7 +332,11 @@ spdy_on_ctrl_recv_callback(spdylay_session *session, spdylay_frame_type type,
case SPDYLAY_HEADERS:
stream_id = frame->syn_stream.stream_id;
- req = sm->req_map[stream_id];
+ req = sm->find_request(stream_id);
+ if (!req) {
+ Error ("spdy_on_ctrl_recv_callback, req object null on SPDYLAY_HEADERS for sm %" PRId64 ", stream_id %d", sm->sm_id, stream_id);
+ return;
+ }
req->append_nv(frame->headers.nv);
break;
[3/7] trafficserver git commit: TS-3265 Fix indentation,
120 character lines
Posted by zw...@apache.org.
TS-3265 Fix indentation, 120 character lines
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9fed2590
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9fed2590
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9fed2590
Branch: refs/heads/5.2.x
Commit: 9fed259098edec15577d7ad1c585ac7a5b4be09a
Parents: 9a599bb
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Dec 30 17:55:39 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Dec 30 19:27:36 2014 -0700
----------------------------------------------------------------------
proxy/spdy/SpdyCallbacks.cc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9fed2590/proxy/spdy/SpdyCallbacks.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyCallbacks.cc b/proxy/spdy/SpdyCallbacks.cc
index 7d7605d..64504af 100644
--- a/proxy/spdy/SpdyCallbacks.cc
+++ b/proxy/spdy/SpdyCallbacks.cc
@@ -54,7 +54,8 @@ spdy_prepare_status_response_and_clean_request(SpdyClientSession *sm, int stream
{
SpdyRequest *req = sm->find_request(stream_id);
if (!req) {
- Error ("spdy_prepare_status_response_and_clean_request, req object null for sm %" PRId64 ", stream_id %d", sm->sm_id, stream_id);
+ Error ("spdy_prepare_status_response_and_clean_request, req object null for sm %" PRId64 ", stream_id %d",
+ sm->sm_id, stream_id);
return;
}
string date_str = http_date(time(0));
@@ -334,7 +335,8 @@ spdy_on_ctrl_recv_callback(spdylay_session *session, spdylay_frame_type type,
stream_id = frame->syn_stream.stream_id;
req = sm->find_request(stream_id);
if (!req) {
- Error ("spdy_on_ctrl_recv_callback, req object null on SPDYLAY_HEADERS for sm %" PRId64 ", stream_id %d", sm->sm_id, stream_id);
+ Error ("spdy_on_ctrl_recv_callback, req object null on SPDYLAY_HEADERS for sm %" PRId64 ", stream_id %d",
+ sm->sm_id, stream_id);
return;
}
req->append_nv(frame->headers.nv);