Skip to content

Commit 36f2388

Browse files
committed
bugfix: fixed compilation errors in gcc and etc when nginx is built without --with-debug. thanks Mathew Heard for the report in #7.
1 parent 109b505 commit 36f2388

File tree

4 files changed

+6
-15
lines changed

4 files changed

+6
-15
lines changed

src/ngx_stream_lua_output.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,6 @@ ngx_stream_lua_ngx_flush(lua_State *L)
555555
static int
556556
ngx_stream_lua_ngx_eof(lua_State *L)
557557
{
558-
ngx_connection_t *c;
559558
ngx_stream_session_t *s;
560559
ngx_stream_lua_ctx_t *ctx;
561560

@@ -591,9 +590,7 @@ ngx_stream_lua_ngx_eof(lua_State *L)
591590

592591
ngx_stream_lua_check_context(L, ctx, NGX_STREAM_LUA_CONTEXT_CONTENT);
593592

594-
c = s->connection;
595-
596-
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
593+
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
597594
"stream lua send eof");
598595

599596
lua_pushinteger(L, 1);

src/ngx_stream_lua_sleep.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,13 @@ ngx_stream_lua_ngx_sleep(lua_State *L)
8383
void
8484
ngx_stream_lua_sleep_handler(ngx_event_t *ev)
8585
{
86-
ngx_connection_t *c;
8786
ngx_stream_session_t *s;
8887
ngx_stream_lua_ctx_t *ctx;
8988
ngx_stream_lua_co_ctx_t *coctx;
9089

9190
coctx = ev->data;
9291

9392
s = coctx->data;
94-
c = s->connection;
9593

9694
ctx = ngx_stream_get_module_ctx(s, ngx_stream_lua_module);
9795

@@ -101,7 +99,7 @@ ngx_stream_lua_sleep_handler(ngx_event_t *ev)
10199

102100
coctx->cleanup = NULL;
103101

104-
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
102+
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
105103
"stream lua sleep timer expired");
106104

107105
ctx->cur_co_ctx = coctx;

src/ngx_stream_lua_socket_tcp.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,6 @@ static void
759759
ngx_stream_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
760760
{
761761
ngx_stream_session_t *s;
762-
ngx_connection_t *c;
763762
ngx_stream_lua_resolved_t *ur;
764763
ngx_stream_lua_ctx_t *lctx;
765764
lua_State *L;
@@ -777,10 +776,9 @@ ngx_stream_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
777776

778777
u = ctx->data;
779778
s = u->request;
780-
c = s->connection;
781779
ur = u->resolved;
782780

783-
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
781+
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
784782
"stream lua tcp socket resolve handler");
785783

786784
lctx = ngx_stream_get_module_ctx(s, ngx_stream_lua_module);
@@ -797,7 +795,7 @@ ngx_stream_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
797795
waiting = u->conn_waiting;
798796

799797
if (ctx->state) {
800-
ngx_log_debug2(NGX_LOG_DEBUG_STREAM, c->log, 0,
798+
ngx_log_debug2(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
801799
"stream lua tcp socket resolver error: %s "
802800
"(connect waiting: %d)",
803801
ngx_resolver_strerror(ctx->state), (int) waiting);

src/ngx_stream_lua_socket_udp.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ static void
417417
ngx_stream_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
418418
{
419419
ngx_stream_session_t *s;
420-
ngx_connection_t *c;
421420
ngx_stream_lua_resolved_t *ur;
422421
ngx_stream_lua_ctx_t *lctx;
423422
lua_State *L;
@@ -436,10 +435,9 @@ ngx_stream_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
436435

437436
u = ctx->data;
438437
s = u->session;
439-
c = s->connection;
440438
ur = u->resolved;
441439

442-
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
440+
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
443441
"stream lua udp socket resolve handler");
444442

445443
lctx = ngx_stream_get_module_ctx(s, ngx_stream_lua_module);
@@ -458,7 +456,7 @@ ngx_stream_lua_socket_resolve_handler(ngx_resolver_ctx_t *ctx)
458456
waiting = u->waiting;
459457

460458
if (ctx->state) {
461-
ngx_log_debug2(NGX_LOG_DEBUG_STREAM, c->log, 0,
459+
ngx_log_debug2(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
462460
"stream lua udp socket resolver error: %s (waiting: %d)",
463461
ngx_resolver_strerror(ctx->state), (int) u->waiting);
464462

0 commit comments

Comments
 (0)