diff options
| author | Garrett D'Amore <garrett@damore.org> | 2020-11-17 15:25:01 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2020-11-17 19:05:32 -0800 |
| commit | 47754eff45271d674fe6d347be82d6755195e8ce (patch) | |
| tree | 6952c9fba61900e51760cb954cab24acbfb1b454 /src/supplemental/http/http_server.c | |
| parent | 1ebbe9fd8612ed2794c06108d485819f2d1e03d5 (diff) | |
| download | nng-47754eff45271d674fe6d347be82d6755195e8ce.tar.gz nng-47754eff45271d674fe6d347be82d6755195e8ce.tar.bz2 nng-47754eff45271d674fe6d347be82d6755195e8ce.zip | |
fixes #1355 wss4 and wss6 don't work as they should
This also properly reenables the wssfile_test.
Diffstat (limited to 'src/supplemental/http/http_server.c')
| -rw-r--r-- | src/supplemental/http/http_server.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/supplemental/http/http_server.c b/src/supplemental/http/http_server.c index 46f2ce8a..6fad99c2 100644 --- a/src/supplemental/http/http_server.c +++ b/src/supplemental/http/http_server.c @@ -936,13 +936,17 @@ http_server_init(nni_http_server **serverp, const nni_url *url) } else if ((strcmp(url->u_scheme, "https") == 0) || (strcmp(url->u_scheme, "wss") == 0)) { myurl.u_scheme = "tls+tcp"; - } else if (strcmp(url->u_scheme, "ws4") == 0) { + } else if ((strcmp(url->u_scheme, "ws4") == 0) || + (strcmp(url->u_scheme, "http4")) == 0) { myurl.u_scheme = "tcp4"; - } else if (strcmp(url->u_scheme, "ws6") == 0) { + } else if ((strcmp(url->u_scheme, "ws6") == 0) || + (strcmp(url->u_scheme, "http6") == 0)) { myurl.u_scheme = "tcp6"; - } else if (strcmp(url->u_scheme, "wss4") == 0) { + } else if ((strcmp(url->u_scheme, "wss4") == 0) || + (strcmp(url->u_scheme, "https4") == 0)) { myurl.u_scheme = "tls+tcp4"; - } else if (strcmp(url->u_scheme, "wss6") == 0) { + } else if ((strcmp(url->u_scheme, "wss6") == 0) || + (strcmp(url->u_scheme, "https6") == 0)) { myurl.u_scheme = "tls+tcp6"; } else { return (NNG_EADDRINVAL); |