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 2015/07/08 20:46:43 UTC
[1/2] trafficserver git commit: TS-3687 Disable the cache removal for
now,
but change the metric updates to take the expired status of a sessions
appropriately
Repository: trafficserver
Updated Branches:
refs/heads/master 7e97ec874 -> c7328aaeb
TS-3687 Disable the cache removal for now, but change the metric updates to take the expired status of a sessions appropriately
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/61bf5c4f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/61bf5c4f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/61bf5c4f
Branch: refs/heads/master
Commit: 61bf5c4fc35814a6db97b6098dd2deaa06157e3a
Parents: 7e97ec8
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Jul 8 12:37:26 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Jul 8 12:37:26 2015 -0600
----------------------------------------------------------------------
iocore/net/SSLSessionCache.cc | 10 +---------
iocore/net/SSLUtils.cc | 12 ++++++++++--
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/61bf5c4f/iocore/net/SSLSessionCache.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLSessionCache.cc b/iocore/net/SSLSessionCache.cc
index 8e55aba..e0fa401 100644
--- a/iocore/net/SSLSessionCache.cc
+++ b/iocore/net/SSLSessionCache.cc
@@ -55,7 +55,6 @@ SSLSessionCache::getSession(const SSLSessionID &sid, SSL_SESSION **sess) const
uint64_t hash = sid.hash();
uint64_t target_bucket = hash % nbuckets;
SSLSessionBucket *bucket = &session_bucket[target_bucket];
- bool ret = false;
if (is_debug_tag_set("ssl.session_cache")) {
char buf[sid.len * 2 + 1];
@@ -64,14 +63,7 @@ SSLSessionCache::getSession(const SSLSessionID &sid, SSL_SESSION **sess) const
target_bucket, bucket, buf, hash);
}
- ret = bucket->getSession(sid, sess);
-
- if (ret)
- SSL_INCREMENT_DYN_STAT(ssl_session_cache_hit);
- else
- SSL_INCREMENT_DYN_STAT(ssl_session_cache_miss);
-
- return ret;
+ return bucket->getSession(sid, sess);
}
void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/61bf5c4f/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 06dee1d..145684e 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -209,16 +209,24 @@ ssl_get_cached_session(SSL *ssl, unsigned char *id, int len, int *copy)
SSL_SESSION *session = NULL;
if (session_cache->getSession(sid, &session)) {
+ ink_assert(session);
+
// Double check the timeout
- if (session && ssl_session_timed_out(session)) {
+ if (ssl_session_timed_out(session)) {
+ SSL_INCREMENT_DYN_STAT(ssl_session_cache_miss);
// Due to bug in openssl, the timeout is checked, but only removed
// from the openssl built-in hash table. The external remove cb is not called
+#if 0 // This is currently eliminated, since it breaks things in odd ways (see TS-3710)
ssl_rm_cached_session(SSL_get_SSL_CTX(ssl), session);
session = NULL;
- } else if (session) {
+#endif
+ } else {
SSLNetVConnection *netvc = (SSLNetVConnection *)SSL_get_app_data(ssl);
+ SSL_INCREMENT_DYN_STAT(ssl_session_cache_hit);
netvc->setSSLSessionCacheHit(true);
}
+ } else {
+ SSL_INCREMENT_DYN_STAT(ssl_session_cache_miss);
}
return session;
}
[2/2] trafficserver git commit: TS-3739 Disable stream_editor build
for now, until we resolve the regex.h issue
Posted by zw...@apache.org.
TS-3739 Disable stream_editor build for now, until we resolve the regex.h issue
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c7328aae
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c7328aae
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c7328aae
Branch: refs/heads/master
Commit: c7328aaeb6815b75c562b139cbf02895e901c4e7
Parents: 61bf5c4
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Jul 8 12:46:36 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Jul 8 12:46:36 2015 -0600
----------------------------------------------------------------------
plugins/experimental/Makefile.am | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c7328aae/plugins/experimental/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index f7e0e94..aefdeb6 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -40,8 +40,10 @@ SUBDIRS = \
stale_while_revalidate \
url_sig \
xdebug \
- mp4 \
- stream_editor
+ mp4
+
+# Commented out for now, since it breaks on OSX
+# stream_editor
if HAS_MYSQL
SUBDIRS += mysql_remap