svn commit: r1483348 - /httpd/httpd/trunk/modules/lua/lua_request.c

[fu...@apache.org]

Author: fuankg
Date: Thu May 16 13:18:48 2013
New Revision: 1483348

URL: http://svn.apache.org/r1483348
Log:
Cast uint16 return value to int.
This fixes a crash on Windows when compiled with MSVC9.

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=1483348&r1=1483347&r2=1483348&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_request.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_request.c Thu May 16 13:18:48 2013
@@ -614,6 +614,11 @@ static int req_ssl_is_https_field(reques
     return ap_lua_ssl_is_https(r->connection);
 }
 
+static int req_ap_get_server_port(request_rec *r)
+{
+    return (int) ap_get_server_port(r);
+}
+
 static int lua_ap_rflush (lua_State *L) {
 
     int returnValue;
@@ -1997,7 +2002,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(&ap_get_server_port, APL_REQ_FUNTYPE_INT, p));
+                 makefun(&req_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,