Merge pull request #220 from hfm/nginx-1-11-5

Update nginx to v1.11.5

.travis.yml

@@ -41,6 +41,13 @@ env:
     NGINX_SRC_MAJOR=1
     NGINX_SRC_MINOR=11
     NGINX_SRC_PATCH=4
+  - NGINX_SRC_MAJOR=1
+    NGINX_SRC_MINOR=11
+    NGINX_SRC_PATCH=5
+  - BUILD_DYNAMIC_MODULE='TRUE'
+    NGINX_SRC_MAJOR=1
+    NGINX_SRC_MINOR=11
+    NGINX_SRC_PATCH=5
 
 before_script:
   - curl -L https://www.openssl.org/source/openssl-1.0.2-latest.tar.gz > openssl-1.0.2.tar.gz

nginx_version

@@ -1,4 +1,4 @@
 NGINX_SRC_MAJOR=1
 NGINX_SRC_MINOR=11
-NGINX_SRC_PATCH=4
+NGINX_SRC_PATCH=5
 NGINX_SRC_VER=nginx-${NGINX_SRC_MAJOR}.${NGINX_SRC_MINOR}.${NGINX_SRC_PATCH}

src/stream/ngx_stream_mruby_module.c

@@ -699,7 +699,18 @@ static ngx_int_t ngx_stream_mruby_init(ngx_conf_t *cf)
 {
   ngx_stream_core_main_conf_t *cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module);
 
+#if (nginx_version >= 1011005)
+  ngx_stream_handler_pt *h;
+
+  h = ngx_array_push(&cmcf->phases[NGX_STREAM_ACCESS_PHASE].handlers);
+  if (h == NULL) {
+    return NGX_ERROR;
+  }
+
+  *h = ngx_stream_mruby_handler;
+#else
   cmcf->access_handler = ngx_stream_mruby_handler;
+#endif
 
   return NGX_OK;
 }