Skip to content

Do not segfault with stream #28

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

Open
wants to merge 1 commit into
base: refactor_replace_peers_refactor
Choose a base branch
from
Open

Do not segfault with stream #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ export PATH := $(PWD)/t/build/sbin:$(PWD)/t/build/bin:$(PATH)
export PERL5LIB := $(PWD)/t/build/lib/perl5
export UNBOUND_PID := $(PWD)/t/build/etc/unbound/unbound.pid

unbound_version=1.4.22
lua_jit_version=2.0.3
lua_nginx_module_version=0.10.8
lua_upstream_nginx_module_version=0.02
nginx_version=1.10.0
unbound_version=1.6.7
lua_jit_version=2.1.0-beta3
lua_nginx_module_version=0.10.11
lua_upstream_nginx_module_version=0.07
nginx_version=1.13.6
nginx_no_pool_version=1.9.15
nginx_url=http://nginx.org/download/nginx-$(nginx_version).tar.gz

Expand Down Expand Up @@ -108,14 +108,16 @@ t/tmp/nginx-$(nginx_version)/.patches-applied: | t/tmp/nginx-$(nginx_version) t/
t/tmp/nginx-$(nginx_version)/Makefile: config | t/tmp/nginx-$(nginx_version) t/tmp/nginx-$(nginx_version)/.patches-applied t/build/bin/luajit t/tmp/lua-nginx-module-$(lua_nginx_module_version) t/tmp/lua-upstream-nginx-module-$(lua_upstream_nginx_module_version)
cd t/tmp/nginx-$(nginx_version) && env \
LUAJIT_LIB=$(PWD)/t/build/lib \
LUAJIT_INC=$(PWD)/t/build/include/luajit-2.0 \
LUAJIT_INC=$(PWD)/t/build/include/luajit-2.1 \
./configure \
--prefix=$(PWD)/t/build \
--with-debug \
--with-ipv6 \
--add-module=$(PWD)/t/tmp/lua-nginx-module-$(lua_nginx_module_version) \
--add-module=$(PWD)/t/tmp/lua-upstream-nginx-module-$(lua_upstream_nginx_module_version) \
--add-module=$(PWD) \
--with-stream \
--with-stream_ssl_module \
--without-http_charset_module \
--without-http_userid_module \
--without-http_auth_basic_module \
Expand Down
4 changes: 4 additions & 0 deletions ngx_http_upstream_dynamic_servers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,10 @@ ngx_http_upstream_dynamic_servers_merge_conf(ngx_conf_t *cf, void *parent, void
static ngx_int_t
ngx_http_upstream_dynamic_servers_init_process(ngx_cycle_t *cycle) {
ngx_http_upstream_dynamic_server_main_conf_t *udsmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_upstream_dynamic_servers_module);
if(udsmcf == NULL) {
return NGX_OK;
}

ngx_http_upstream_dynamic_server_conf_t *dynamic_server = udsmcf->dynamic_servers.elts;
ngx_uint_t i;
ngx_event_t *timer;
Expand Down