Skip to content

Commit f4e1311

Browse files
committed
feature: fixed compilation failures with nginx 1.9.0. thanks Charles R. Portwood II for the original patch in #500.
1 parent 847bc0f commit f4e1311

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

src/ngx_http_lua_initworkerby.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,16 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
227227

228228
#if defined(nginx_version) && nginx_version >= 1003014
229229

230+
# if nginx_version >= 1009000
231+
232+
ngx_set_connection_log(r->connection, clcf->error_log);
233+
234+
# else
235+
230236
ngx_http_set_connection_log(r->connection, clcf->error_log);
231237

238+
# endif
239+
232240
#else
233241

234242
c->log->file = clcf->error_log->file;

src/ngx_http_lua_timer.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,16 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
350350

351351
#if defined(nginx_version) && nginx_version >= 1003014
352352

353+
# if nginx_version >= 1009000
354+
355+
ngx_set_connection_log(r->connection, clcf->error_log);
356+
357+
# else
358+
353359
ngx_http_set_connection_log(r->connection, clcf->error_log);
354360

361+
# endif
362+
355363
#else
356364

357365
c->log->file = clcf->error_log->file;

util/build2.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ time ngx-build $force $version \
4949
--with-http_gunzip_module \
5050
--with-select_module \
5151
--with-poll_module \
52-
--with-rtsig_module \
5352
$opts \
5453
--with-debug
5554

0 commit comments

Comments
 (0)