diff --git a/.travis.yml b/.travis.yml index 61dbc54e..dbc44f0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,13 @@ env: NGINX_SRC_MAJOR=1 NGINX_SRC_MINOR=11 NGINX_SRC_PATCH=1 + - NGINX_SRC_MAJOR=1 + NGINX_SRC_MINOR=11 + NGINX_SRC_PATCH=2 + - BUILD_DYNAMIC_MODULE='TRUE' + NGINX_SRC_MAJOR=1 + NGINX_SRC_MINOR=11 + NGINX_SRC_PATCH=2 before_script: - curl -L https://www.openssl.org/source/openssl-1.0.2-latest.tar.gz > openssl-1.0.2.tar.gz diff --git a/src/stream/ngx_stream_mruby_module.c b/src/stream/ngx_stream_mruby_module.c index 3c3a469b..7090f652 100644 --- a/src/stream/ngx_stream_mruby_module.c +++ b/src/stream/ngx_stream_mruby_module.c @@ -120,7 +120,9 @@ static ngx_command_t ngx_stream_mruby_commands[] = { ngx_null_command}; +#if (nginx_version > 1011001) static ngx_stream_module_t ngx_stream_mruby_module_ctx = { + NULL, /* preconfiguration */ ngx_stream_mruby_init, /* postconfiguration */ ngx_stream_mruby_create_main_conf, /* create main configuration */ @@ -129,6 +131,17 @@ static ngx_stream_module_t ngx_stream_mruby_module_ctx = { ngx_stream_mruby_create_srv_conf, /* create server configuration */ ngx_stream_mruby_merge_srv_conf /* merge server configuration */ }; +#else +static ngx_stream_module_t ngx_stream_mruby_module_ctx = { + ngx_stream_mruby_init, /* postconfiguration */ + + ngx_stream_mruby_create_main_conf, /* create main configuration */ + ngx_stream_mruby_init_main_conf, /* init main configuration */ + + ngx_stream_mruby_create_srv_conf, /* create server configuration */ + ngx_stream_mruby_merge_srv_conf /* merge server configuration */ +}; +#endif ngx_module_t ngx_stream_mruby_module = {NGX_MODULE_V1, &ngx_stream_mruby_module_ctx, /* module context */