details: https://hg.nginx.org/njs/rev/b9bbb230fe4f
branches:
changeset: 1729:b9bbb230fe4f
user: Dmitry Volyntsev <xeioex@nginx.com>
date: Wed Oct 20 13:01:55 2021 +0000
description:
Stream: fixed build without --with-http_ssl_module.

This closes #434 issue on Github.

diffstat:

nginx/ngx_stream_js_module.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r 9f5285c82b88 -r b9bbb230fe4f nginx/ngx_stream_js_module.c
--- a/nginx/ngx_stream_js_module.c Wed Oct 20 12:16:37 2021 +0000
+++ b/nginx/ngx_stream_js_module.c Wed Oct 20 13:01:55 2021 +0000
@@ -34,7 +34,7 @@ typedef struct {
ngx_str_t access;
ngx_str_t preread;
ngx_str_t filter;
-#if (NGX_SSL)
+#if (NGX_STREAM_SSL)
ngx_ssl_t *ssl;
ngx_str_t ssl_ciphers;
ngx_uint_t ssl_protocols;
@@ -145,13 +145,13 @@ static char *ngx_stream_js_merge_srv_con
void *child);
static ngx_int_t ngx_stream_js_init(ngx_conf_t *cf);

-#if (NGX_SSL)
+#if (NGX_STREAM_SSL)
static char * ngx_stream_js_set_ssl(ngx_conf_t *cf,
ngx_stream_js_srv_conf_t *jscf);
#endif
static ngx_ssl_t *ngx_stream_js_ssl(njs_vm_t *vm, ngx_stream_session_t *s);

-#if (NGX_HTTP_SSL)
+#if (NGX_STREAM_SSL)

static ngx_conf_bitmask_t ngx_stream_js_ssl_protocols[] = {
{ ngx_string("TLSv1"), NGX_SSL_TLSv1 },
@@ -221,7 +221,7 @@ static ngx_command_t ngx_stream_js_comm
offsetof(ngx_stream_js_srv_conf_t, filter),
NULL },

-#if (NGX_SSL)
+#if (NGX_STREAM_SSL)

{ ngx_string("js_fetch_ciphers"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
@@ -1992,7 +1992,7 @@ ngx_stream_js_create_srv_conf(ngx_conf_t
* conf->ssl_trusted_certificate = { 0, NULL };
*/

-#if (NGX_SSL)
+#if (NGX_STREAM_SSL)
conf->ssl_verify_depth = NGX_CONF_UNSET;
#endif
return conf;
@@ -2009,7 +2009,7 @@ ngx_stream_js_merge_srv_conf(ngx_conf_t
ngx_conf_merge_str_value(conf->preread, prev->preread, "");
ngx_conf_merge_str_value(conf->filter, prev->filter, "");

-#if (NGX_HTTP_SSL)
+#if (NGX_STREAM_SSL)
ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT");

ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
@@ -2057,7 +2057,7 @@ ngx_stream_js_init(ngx_conf_t *cf)
}


-#if (NGX_SSL)
+#if (NGX_STREAM_SSL)

static char *
ngx_stream_js_set_ssl(ngx_conf_t *cf, ngx_stream_js_srv_conf_t *jscf)
@@ -2106,7 +2106,7 @@ ngx_stream_js_set_ssl(ngx_conf_t *cf, ng
static ngx_ssl_t *
ngx_stream_js_ssl(njs_vm_t *vm, ngx_stream_session_t *s)
{
-#if (NGX_SSL)
+#if (NGX_STREAM_SSL)
ngx_stream_js_srv_conf_t *jscf;

jscf = ngx_stream_get_module_srv_conf(s, ngx_stream_js_module);
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel