mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993).
This commit is contained in:
parent
886c6295ee
commit
554768dabb
@ -616,6 +616,8 @@ ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||||||
return NGX_CONF_ERROR;
|
return NGX_CONF_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sscf->shm_zone->init = ngx_ssl_session_cache_init;
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -626,8 +628,6 @@ ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||||||
sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
|
sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
|
||||||
}
|
}
|
||||||
|
|
||||||
sscf->shm_zone->init = ngx_ssl_session_cache_init;
|
|
||||||
|
|
||||||
return NGX_CONF_OK;
|
return NGX_CONF_OK;
|
||||||
|
|
||||||
invalid:
|
invalid:
|
||||||
|
@ -464,6 +464,8 @@ ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||||||
return NGX_CONF_ERROR;
|
return NGX_CONF_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
scf->shm_zone->init = ngx_ssl_session_cache_init;
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -474,8 +476,6 @@ ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||||||
scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
|
scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
|
||||||
}
|
}
|
||||||
|
|
||||||
scf->shm_zone->init = ngx_ssl_session_cache_init;
|
|
||||||
|
|
||||||
return NGX_CONF_OK;
|
return NGX_CONF_OK;
|
||||||
|
|
||||||
invalid:
|
invalid:
|
||||||
|
Loading…
Reference in New Issue
Block a user