Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993).

This commit is contained in:
Maxim Dounin 2011-09-27 12:06:07 +00:00
parent 2b20643338
commit 9a87e3af39
2 changed files with 4 additions and 4 deletions

View file

@ -616,6 +616,8 @@ ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR;
}
sscf->shm_zone->init = ngx_ssl_session_cache_init;
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->shm_zone->init = ngx_ssl_session_cache_init;
return NGX_CONF_OK;
invalid:

View file

@ -464,6 +464,8 @@ ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR;
}
scf->shm_zone->init = ngx_ssl_session_cache_init;
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->shm_zone->init = ngx_ssl_session_cache_init;
return NGX_CONF_OK;
invalid: