You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2013/04/13 08:33:07 UTC
svn commit: r1467558 - /httpd/httpd/trunk/modules/lua/lua_request.c
Author: humbedooh
Date: Sat Apr 13 06:33:07 2013
New Revision: 1467558
URL: http://svn.apache.org/r1467558
Log:
fix up r.banner and r.port so they work like variables and not functions (seems to have already been put in there), duplicate??
Modified:
httpd/httpd/trunk/modules/lua/lua_request.c
Modified: httpd/httpd/trunk/modules/lua/lua_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?rev=1467558&r1=1467557&r2=1467558&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_request.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_request.c Sat Apr 13 06:33:07 2013
@@ -613,10 +613,6 @@ static int lua_ap_rflush (lua_State *L)
return 1;
}
-static int lua_ap_port(request_rec* r)
-{
- return (int) ap_get_server_port(r);
-}
static const char* lua_ap_options(request_rec* r)
{
@@ -1878,7 +1874,7 @@ AP_LUA_DECLARE(void) ap_lua_load_request
apr_hash_set(dispatch, "flush", APR_HASH_KEY_STRING,
makefun(&lua_ap_rflush, APL_REQ_FUNTYPE_LUACFUN, p));
apr_hash_set(dispatch, "port", APR_HASH_KEY_STRING,
- makefun(&lua_ap_port, APL_REQ_FUNTYPE_INT, p));
+ makefun(&ap_get_server_port, APL_REQ_FUNTYPE_INT, p));
apr_hash_set(dispatch, "banner", APR_HASH_KEY_STRING,
makefun(&ap_get_server_banner, APL_REQ_FUNTYPE_STRING, p));
apr_hash_set(dispatch, "options", APR_HASH_KEY_STRING,
@@ -1925,10 +1921,6 @@ AP_LUA_DECLARE(void) ap_lua_load_request
makefun(&lua_ap_escape, APL_REQ_FUNTYPE_LUACFUN, p));
apr_hash_set(dispatch, "unescape", APR_HASH_KEY_STRING,
makefun(&lua_ap_unescape, APL_REQ_FUNTYPE_LUACFUN, p));
- apr_hash_set(dispatch, "banner", APR_HASH_KEY_STRING,
- makefun(&lua_ap_banner, APL_REQ_FUNTYPE_LUACFUN, p));
- apr_hash_set(dispatch, "port", APR_HASH_KEY_STRING,
- makefun(&lua_ap_port, APL_REQ_FUNTYPE_LUACFUN, p));
apr_hash_set(dispatch, "mpm_query", APR_HASH_KEY_STRING,
makefun(&lua_ap_mpm_query, APL_REQ_FUNTYPE_LUACFUN, p));
apr_hash_set(dispatch, "expr", APR_HASH_KEY_STRING,