comparison src/event/ngx_event_openssl_stapling.c @ 5330:314c3d7cc3a5

Backed out f1a91825730a and 7094bd12c1ff. While ngx_get_full_name() might have a bit more descriptive arguments, the ngx_conf_full_name() is generally easier to use when parsing configuration and limits exposure of cycle->prefix / cycle->conf_prefix details.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 20 Aug 2013 21:11:19 +0400
parents f1a91825730a
children 07dd5bd222ac
comparison
equal deleted inserted replaced
5329:00bdc9f08a16 5330:314c3d7cc3a5
195 OCSP_RESPONSE *response; 195 OCSP_RESPONSE *response;
196 ngx_ssl_stapling_t *staple; 196 ngx_ssl_stapling_t *staple;
197 197
198 staple = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_stapling_index); 198 staple = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_stapling_index);
199 199
200 if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, file) != NGX_OK) { 200 if (ngx_conf_full_name(cf->cycle, file, 1) != NGX_OK) {
201 return NGX_ERROR; 201 return NGX_ERROR;
202 } 202 }
203 203
204 bio = BIO_new_file((char *) file->data, "r"); 204 bio = BIO_new_file((char *) file->data, "r");
205 if (bio == NULL) { 205 if (bio == NULL) {