Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nginx to v1.11.5 #220

Merged
merged 4 commits into from
Oct 12, 2016
Merged

Update nginx to v1.11.5 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83d4acd
Update nginx to v1.11.5
hfm Oct 11, 2016
b3d8a0a
Stream phases
hfm Oct 11, 2016
e39a1b8
clang-format
hfm Oct 11, 2016
a7fa1e8
fix order
hfm Oct 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nginx_version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
11 changes: 11 additions & 0 deletions src/stream/ngx_stream_mruby_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}