Make it compile at least
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f3830380 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f3830380 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f3830380 Branch: refs/heads/lua_config Commit: f3830380f8793ad2d3e57362aff9726baaae72d2 Parents: 72da02a Author: Leif Hedstrom <[email protected]> Authored: Tue Jan 14 20:32:25 2014 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Tue Jan 14 20:32:25 2014 -0700 ---------------------------------------------------------------------- iocore/net/SSLUtils.cc | 5 +++-- proxy/luaConfig.cc | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3830380/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index 0b8553e..9cd6700 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -787,7 +787,7 @@ static int SSLUtils_lua_ssl_store_ssl_context(lua_State *L) { const SSLConfigParams * params; SSLCertLookup * lookup; - xptr<char> dest_ip, ssl_key_name, ssl_ca_name, ssl_cert_name; + xptr<char> dest_ip, ssl_key_name, ssl_ca_name, ssl_cert_name, ticket_key_filename; params = (const SSLConfigParams *) lua_touserdata(L, lua_upvalueindex(1)); lookup = (SSLCertLookup *) lua_touserdata(L, lua_upvalueindex(2)); #define LUAGETF(name) do { \ @@ -799,7 +799,8 @@ SSLUtils_lua_ssl_store_ssl_context(lua_State *L) { LUAGETF(ssl_key_name); LUAGETF(ssl_ca_name); LUAGETF(ssl_cert_name); - if(!ssl_store_ssl_context(params, lookup, dest_ip, ssl_cert_name, ssl_ca_name, ssl_key_name)) + // TODO: ticket_key_filename stuff should be popped here I think + if(!ssl_store_ssl_context(params, lookup, dest_ip, ssl_cert_name, ssl_ca_name, ssl_key_name, -1, ticket_key_filename)) lua_pushboolean(L,0); else lua_pushboolean(L,1); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3830380/proxy/luaConfig.cc ---------------------------------------------------------------------- diff --git a/proxy/luaConfig.cc b/proxy/luaConfig.cc index 626b40d..7dd845d 100644 --- a/proxy/luaConfig.cc +++ b/proxy/luaConfig.cc @@ -134,7 +134,7 @@ tsrec_call_func(lua_State *L) { lua_rawget(L,2); bpath = lua_tostring(L,-1); if(bpath == NULL) return tsrec_dispatch_method(L,"",opath); - int blen = strlen(bpath); + size_t blen = strlen(bpath); lua_pop(L,1); if(blen > strlen(opath) || strncmp(bpath, opath, blen) || @@ -305,7 +305,7 @@ lua_State *luaConfig::open(const char *config_file_path, const char *module) { lua_pop(L,1); luaopen_ats(L); - UrlRewrite::luaopen(L); + // UrlRewrite::luaopen(L); // TODO: Not available now lua_getglobal(L,"require"); lua_pushstring(L,module); if(lua_pcall(L,1,1,0) != 0) {
