From 14202c762193a2f0f359fbdd89622c0c920564b4 Mon Sep 17 00:00:00 2001 From: OKUMURA Takahiro Date: Wed, 6 Jul 2016 14:55:45 +0900 Subject: [PATCH 1/3] Nginx 1.11.2 added new element of preconfiguration to ngx_stream_module_t see also: http://hg.nginx.org/nginx/rev/2f41d383c9c7 --- src/stream/ngx_stream_mruby_module.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/stream/ngx_stream_mruby_module.c b/src/stream/ngx_stream_mruby_module.c index 3c3a469b..0d3ec012 100644 --- a/src/stream/ngx_stream_mruby_module.c +++ b/src/stream/ngx_stream_mruby_module.c @@ -121,6 +121,7 @@ static ngx_command_t ngx_stream_mruby_commands[] = { ngx_null_command}; 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 */ From f27f2f129ddcafd324759134f57b4383c7e8e1cd Mon Sep 17 00:00:00 2001 From: OKUMURA Takahiro Date: Wed, 6 Jul 2016 15:04:16 +0900 Subject: [PATCH 2/3] Add build job of nginx 1.11.2 --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) 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 From 0796906b899c5e1130a7ae63e736b5932b37c6f9 Mon Sep 17 00:00:00 2001 From: OKUMURA Takahiro Date: Wed, 6 Jul 2016 17:00:16 +0900 Subject: [PATCH 3/3] If nginx_version is greater than 1011001 (1.11.1), add preconfiguration to ngx_stream_module_t --- src/stream/ngx_stream_mruby_module.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/stream/ngx_stream_mruby_module.c b/src/stream/ngx_stream_mruby_module.c index 0d3ec012..7090f652 100644 --- a/src/stream/ngx_stream_mruby_module.c +++ b/src/stream/ngx_stream_mruby_module.c @@ -120,6 +120,7 @@ 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 */ @@ -130,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 */