diff --git a/src/ngx_stream_lua_module.c b/src/ngx_stream_lua_module.c index 38892c67..7c344e98 100644 --- a/src/ngx_stream_lua_module.c +++ b/src/ngx_stream_lua_module.c @@ -919,7 +919,7 @@ ngx_stream_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_stream_lua_srv_conf_t *conf = child; #if (NGX_STREAM_SSL) -#if defined(nginx_version) && nginx_version >= 1025005 +#if !defined (freenginx) && (defined(nginx_version) && nginx_version >= 1025005) ngx_stream_ssl_srv_conf_t *sscf; #else ngx_stream_ssl_conf_t *sscf; diff --git a/src/ngx_stream_lua_socket_tcp.c b/src/ngx_stream_lua_socket_tcp.c index a92bbf14..21f4ee52 100644 --- a/src/ngx_stream_lua_socket_tcp.c +++ b/src/ngx_stream_lua_socket_tcp.c @@ -2261,7 +2261,9 @@ ngx_stream_lua_socket_tcp_serversslhandshake(lua_State *L) ngx_stream_lua_ctx_t *ctx; ngx_stream_lua_co_ctx_t *coctx; ngx_stream_lua_socket_tcp_upstream_t *u; +#if !defined (freenginx) ngx_stream_ssl_srv_conf_t *sscf; +#endif /* Lua function arguments: self */ @@ -2317,6 +2319,7 @@ ngx_stream_lua_socket_tcp_serversslhandshake(lua_State *L) return 1; } +#if !defined (freenginx) sscf = ngx_stream_get_module_srv_conf(r->session, ngx_stream_ssl_module); if (sscf == NULL || sscf->ssl.ctx == NULL) { @@ -2330,6 +2333,7 @@ ngx_stream_lua_socket_tcp_serversslhandshake(lua_State *L) lua_pushliteral(L, "failed to create ssl connection"); return 2; } +#endif ctx = ngx_stream_lua_get_module_ctx(r, ngx_stream_lua_module); if (ctx == NULL) { diff --git a/src/ngx_stream_lua_ssl_certby.c b/src/ngx_stream_lua_ssl_certby.c index 6bb0da8d..d25a32d7 100644 --- a/src/ngx_stream_lua_ssl_certby.c +++ b/src/ngx_stream_lua_ssl_certby.c @@ -1560,7 +1560,7 @@ ngx_stream_lua_ffi_ssl_verify_client(ngx_stream_lua_request_t *r, ngx_stream_lua_ctx_t *ctx; ngx_ssl_conn_t *ssl_conn; -#if defined(nginx_version) && nginx_version >= 1025005 +#if !defined (freenginx) && (defined(nginx_version) && nginx_version >= 1025005) ngx_stream_ssl_srv_conf_t *sscf; #else ngx_stream_ssl_conf_t *sscf; diff --git a/src/ngx_stream_lua_ssl_client_helloby.c b/src/ngx_stream_lua_ssl_client_helloby.c index 087fa2cd..236dcb45 100644 --- a/src/ngx_stream_lua_ssl_client_helloby.c +++ b/src/ngx_stream_lua_ssl_client_helloby.c @@ -218,7 +218,7 @@ ngx_stream_lua_ssl_client_hello_handler(ngx_ssl_conn_t *ssl_conn, return -1; } -#if (nginx_version > 1029001) +#if !(freenginx) && (nginx_version > 1029001) #ifdef SSL_CLIENT_HELLO_SUCCESS /* see commit 0373fe5d98c1515640 for more details */ rc = ngx_ssl_client_hello_callback(ssl_conn, al, arg); diff --git a/src/ngx_stream_lua_time.c b/src/ngx_stream_lua_time.c index c70dc91b..d4593645 100644 --- a/src/ngx_stream_lua_time.c +++ b/src/ngx_stream_lua_time.c @@ -36,7 +36,21 @@ ngx_stream_lua_ffi_now(void) double ngx_stream_lua_ffi_req_start_time(ngx_stream_lua_request_t *r) { +#if defined freenginx + ngx_time_t *tp; + + tp = ngx_timeofday(); + tp->sec -= (ngx_current_msec - r->session->start_time) / 1000; + tp->msec -= (ngx_current_msec - r->session->start_time) % 1000; + if (tp->msec > NGX_MAX_INT_T_VALUE) { + tp->msec += 1000; + tp->sec -= 1; + } + + return tp->sec + tp->msec / 1000.0; +#else return r->session->start_sec + r->session->start_msec / 1000.0; +#endif }