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/08/27 16:31:29 UTC
[1/2] git commit: TS-2154: Lua plugin asserts traffic_server on
startup
Updated Branches:
refs/heads/4.0.x 426301d03 -> c9e7328bb
TS-2154: Lua plugin asserts traffic_server on startup
The Lua plugin keep a number of per-instance hook tables. TS-1469
added a hook, but the Lua plugin was never updated, so we ended
passing a NULL continuation pointer to TSContDataSet() in
LuaPluginInstance::init(). Lets add the missing hook, and also add
a static assertion so that the next person do add a hook knows that
this requirement exists.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a08f3a73
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a08f3a73
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a08f3a73
Branch: refs/heads/4.0.x
Commit: a08f3a739249d23dbef03de18dfac1bb7726b5a6
Parents: 426301d
Author: James Peach <jp...@apache.org>
Authored: Mon Aug 26 16:52:08 2013 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Aug 27 08:30:16 2013 -0600
----------------------------------------------------------------------
CHANGES | 6 +++++-
plugins/experimental/lua/state.cc | 5 +++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a08f3a73/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 32a86b4..3f1d817 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
-*- coding: utf-8 -*-
+Changes with Apache Traffic Server 4.0.1
+
+ *) [TS-2154] Lua plugin asserts traffic_server on startup
+
+
Changes with Apache Traffic Server 4.0.0
*) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
@@ -28,7 +33,6 @@ Changes with Apache Traffic Server 4.0.0
Changes with Apache Traffic Server 3.3.5
-
*) [TS-2051] Fix SSL crash due to excess READ_COMPLETE events.
*) [TS-2099] Using wrong member when setting active timeout.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a08f3a73/plugins/experimental/lua/state.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/lua/state.cc b/plugins/experimental/lua/state.cc
index 01d357e..502e6fd 100644
--- a/plugins/experimental/lua/state.cc
+++ b/plugins/experimental/lua/state.cc
@@ -29,6 +29,10 @@
#define INVALID_INSTANCE_ID (instanceid_t)(-1)
+// InitDemuxTable() requires an initializer for every hook. Make sure that we don't
+// get out of sync with the number of hooks.
+extern void * __static_assert_hook_count[TS_HTTP_LAST_HOOK == 17 ? 0 : -1];
+
typedef int (*LuaHookDemuxer)(TSHttpHookID, TSCont, TSEvent, void *);
template <TSHttpHookID hookid, LuaHookDemuxer demuxer> int
@@ -57,6 +61,7 @@ InitDemuxTable(LuaPluginInstance::demux_table_t& table)
table[TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK] = MakeLuaHook(demuxer, TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK);
table[TS_HTTP_PRE_REMAP_HOOK] = MakeLuaHook(demuxer, TS_HTTP_PRE_REMAP_HOOK);
table[TS_HTTP_POST_REMAP_HOOK] = MakeLuaHook(demuxer, TS_HTTP_POST_REMAP_HOOK);
+ table[TS_HTTP_RESPONSE_CLIENT_HOOK] = MakeLuaHook(demuxer, TS_HTTP_RESPONSE_CLIENT_HOOK);
}
// Global storage for Lua plugin instances. We vend instanceid_t's as an index into
[2/2] git commit: Updated for v4.0.1 respin
Posted by zw...@apache.org.
Updated for v4.0.1 respin
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c9e7328b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c9e7328b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c9e7328b
Branch: refs/heads/4.0.x
Commit: c9e7328bbf1d2d0794c0053fd4fbb5429d6b913a
Parents: a08f3a7
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Aug 27 08:31:22 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Aug 27 08:31:22 2013 -0600
----------------------------------------------------------------------
CHANGES | 2 +-
STATUS | 2 +-
configure.ac | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c9e7328b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 3f1d817..3cf450c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@ Changes with Apache Traffic Server 4.0.1
*) [TS-2154] Lua plugin asserts traffic_server on startup
-Changes with Apache Traffic Server 4.0.0
+Changes with Apache Traffic Server 4.0.0 [not released]
*) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
host.db itself.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c9e7328b/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 704d0b0..c1221b5 100644
--- a/STATUS
+++ b/STATUS
@@ -7,7 +7,7 @@ The current version of this file can be found at:
Release history:
- 4.0.0 : Released on August 30, 2013
+ 4.0.1 : Released on August 30, 2013
3.2.5 : Released on July 17, 2013
3.2.4 : Released on January 25, 2013
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c9e7328b/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 196e928..05faa4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
# Version number is calculated as MAJOR * 1000000 + MINOR * 1000 + MICRO
# Version string is in the form of MAJOR.MINOR.MICRO[sufix]
#
-m4_define([TS_VERSION_S],[4.0.0])
-m4_define([TS_VERSION_N],[4000000])
+m4_define([TS_VERSION_S],[4.0.1])
+m4_define([TS_VERSION_N],[4000001])
AC_INIT([Apache Traffic Server], TS_VERSION_S(), [dev@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org])
AC_PREREQ([2.59])