danwin1210/hosting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix nginx patch

Browse Source
This commit is contained in:
Daniel Winzen
2020-11-09 22:51:23 +01:00
parent 78a7bdfb3e
commit a3da873635
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
install_binaries.sh
View File

@ -365,7 +365,7 @@ index 329760d0..2c72f932 100644
typedef struct ngx_ssl_sess_id_s ngx_ssl_sess_id_t; typedef struct ngx_ssl_sess_id_s ngx_ssl_sess_id_t;
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
index e062b03a..fe8ed2eb 100644 index e062b03a..2dae17d4 100644
--- a/src/http/modules/ngx_http_ssl_module.c --- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c
@@ -301,6 +301,41 @@ static ngx_command_t ngx_http_ssl_commands[] = { @@ -301,6 +301,41 @@ static ngx_command_t ngx_http_ssl_commands[] = {
@ -443,11 +443,10 @@ index e062b03a..fe8ed2eb 100644
conf->ssl.log = cf->log; conf->ssl.log = cf->log;
if (conf->enable) { if (conf->enable) {
@@ -941,6 +995,27 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) @@ -943,6 +997,28 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
if (ngx_ssl_conf_commands(cf, &conf->ssl, conf->conf_commands) != NGX_OK) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
+ }
+ if (conf->dyn_rec_enable) { + if (conf->dyn_rec_enable) {
+ conf->ssl.dyn_rec.timeout = conf->dyn_rec_timeout; + conf->ssl.dyn_rec.timeout = conf->dyn_rec_timeout;
+ conf->ssl.dyn_rec.threshold = conf->dyn_rec_threshold; + conf->ssl.dyn_rec.threshold = conf->dyn_rec_threshold;
@ -468,9 +467,11 @@ index e062b03a..fe8ed2eb 100644
+ +
+ } else { + } else {
+ conf->ssl.dyn_rec.timeout = 0; + conf->ssl.dyn_rec.timeout = 0;
} + }
+
return NGX_CONF_OK; return NGX_CONF_OK;
}
diff --git a/src/http/modules/ngx_http_ssl_module.h b/src/http/modules/ngx_http_ssl_module.h diff --git a/src/http/modules/ngx_http_ssl_module.h b/src/http/modules/ngx_http_ssl_module.h
index 7ab0f7ea..4485a8b8 100644 index 7ab0f7ea..4485a8b8 100644
--- a/src/http/modules/ngx_http_ssl_module.h --- a/src/http/modules/ngx_http_ssl_module.h