diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2022-06-22 18:34:58 +0400 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2022-06-22 18:34:58 +0400 |
| commit | c64e2ec1e94974193c286b63db4f58e6e499f5cb (patch) | |
| tree | 144428623b095d53c37fbecd31b0026a321dfec6 /src/http/modules/ngx_http_grpc_module.c | |
| parent | 854e41fec24e1f292ec5a951e7bfc9377afc0905 (diff) | |
| parent | 1009f5586ccf07375595675227d296815d91b2f2 (diff) | |
| download | nginx-c64e2ec1e94974193c286b63db4f58e6e499f5cb.tar.gz nginx-c64e2ec1e94974193c286b63db4f58e6e499f5cb.zip | |
Merged with the default branch.
Diffstat (limited to 'src/http/modules/ngx_http_grpc_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_grpc_module.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c index 864fc4fda..617814ec9 100644 --- a/src/http/modules/ngx_http_grpc_module.c +++ b/src/http/modules/ngx_http_grpc_module.c @@ -1891,8 +1891,12 @@ ngx_http_grpc_process_header(ngx_http_request_t *r) hh = ngx_hash_find(&umcf->headers_in_hash, h->hash, h->lowcase_key, h->key.len); - if (hh && hh->handler(r, h, hh->offset) != NGX_OK) { - return NGX_ERROR; + if (hh) { + rc = hh->handler(r, h, hh->offset); + + if (rc != NGX_OK) { + return rc; + } } continue; @@ -4902,8 +4906,9 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf) return NGX_ERROR; } - if (glcf->upstream.ssl_certificate) { - + if (glcf->upstream.ssl_certificate + && glcf->upstream.ssl_certificate->value.len) + { if (glcf->upstream.ssl_certificate_key == NULL) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, "no \"grpc_ssl_certificate_key\" is defined " |