diff options
| -rw-r--r-- | src/supplemental/http/http_server.c | 11 | ||||
| -rw-r--r-- | tests/httpserver.c | 53 |
2 files changed, 57 insertions, 7 deletions
diff --git a/src/supplemental/http/http_server.c b/src/supplemental/http/http_server.c index cb003aff..624ba1e4 100644 --- a/src/supplemental/http/http_server.c +++ b/src/supplemental/http/http_server.c @@ -95,9 +95,9 @@ nni_http_handler_init( if ((h = NNI_ALLOC_STRUCT(h)) == NULL) { return (NNG_ENOMEM); } - // Default for HTTP is /. - if ((uri == NULL) || (strlen(uri) == 0)) { - uri = "/"; + // Default for HTTP is /. But remap it to "" for ease of matching. + if ((uri == NULL) || (strlen(uri) == 0) || (strcmp(uri, "/") == 0)) { + uri = ""; } if (((h->uri = nni_strdup(uri)) == NULL) || ((h->method = nni_strdup("GET")) == NULL)) { @@ -159,6 +159,9 @@ nni_http_handler_get_data(nni_http_handler *h) const char * nni_http_handler_get_uri(nni_http_handler *h) { + if (strlen(h->uri) == 0) { + return ("/"); + } return (h->uri); } @@ -1089,7 +1092,7 @@ nni_http_server_add_handler(nni_http_server *s, nni_http_handler *h) // Must have a legal method (and not one that is HEAD), path, // and handler. (The reason HEAD is verboten is that we supply // it automatically as part of GET support.) - if (((len = strlen(h->uri)) == 0) || (h->uri[0] != '/') || + if ((((len = strlen(h->uri)) > 0) && (h->uri[0] != '/')) || (h->cb == NULL)) { return (NNG_EINVAL); } diff --git a/tests/httpserver.c b/tests/httpserver.c index c7530f88..996d20b4 100644 --- a/tests/httpserver.c +++ b/tests/httpserver.c @@ -8,7 +8,6 @@ // found online at https://opensource.org/licenses/MIT. // - #ifdef _WIN32 #define strdup _strdup #else @@ -22,8 +21,8 @@ #include <nng/supplemental/http/http.h> #include <nng/supplemental/tls/tls.h> -#include "core/nng_impl.h" #include "convey.h" +#include "core/nng_impl.h" const char *doc1 = "<html><body>Someone <b>is</b> home!</body</html>"; const char *doc2 = "This is a text file."; @@ -485,6 +484,7 @@ TestMain("HTTP Server", { nng_url_free(curl); }); }); + Convey("Custom POST handler works", { char urlstr[32]; nng_url *url; @@ -669,4 +669,51 @@ TestMain("HTTP Server", { nng_url_free(curl); }); }); -}) + + Convey("Root tree handler works", { + char urlstr[32]; + nng_url *url; + + trantest_next_address(urlstr, "http://127.0.0.1:%u"); + So(nng_url_parse(&url, urlstr) == 0); + So(nng_http_server_hold(&s, url) == 0); + + Reset({ + nng_http_server_release(s); + nng_url_free(url); + }); + + So(nng_http_handler_alloc(&h, "/", httpecho) == 0); + So(nng_http_handler_set_method(h, "POST") == 0); + So(nng_http_handler_set_tree(h) == 0); + So(nng_http_server_add_handler(s, h) == 0); + So(nng_http_server_start(s) == 0); + + Convey("Echo POST works", { + char fullurl[256]; + size_t size; + nng_http_req *req; + nng_http_res *res; + nng_url * curl; + char txdata[5]; + char * rxdata; + + snprintf(txdata, sizeof(txdata), "1234"); + So(nng_http_res_alloc(&res) == 0); + snprintf(fullurl, sizeof(fullurl), + "%s/some_sub/directory", urlstr); + So(nng_url_parse(&curl, fullurl) == 0); + So(nng_http_req_alloc(&req, curl) == 0); + nng_http_req_set_data(req, txdata, strlen(txdata)); + So(nng_http_req_set_method(req, "POST") == 0); + So(httpdo(curl, req, res, (void **) &rxdata, &size) == + 0); + So(nng_http_res_get_status(res) == NNG_HTTP_STATUS_OK); + So(size == strlen(txdata)); + So(strncmp(txdata, rxdata, size) == 0); + nng_http_req_free(req); + nng_http_res_free(res); + nng_url_free(curl); + }); + }); +}); |