diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-06-15 12:50:03 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-06-15 13:39:29 -0700 |
| commit | 5ecea06b1f39a93735e8b2f711b125d0b1a84d16 (patch) | |
| tree | 843c699c3618328856c0b373a4b49b75205bf234 /tests/httpserver.c | |
| parent | 16088417694de3d3300ae8429c20e944128d3f52 (diff) | |
| download | nng-5ecea06b1f39a93735e8b2f711b125d0b1a84d16.tar.gz nng-5ecea06b1f39a93735e8b2f711b125d0b1a84d16.tar.bz2 nng-5ecea06b1f39a93735e8b2f711b125d0b1a84d16.zip | |
fixes #539 Feature request: customizable http error page
Diffstat (limited to 'tests/httpserver.c')
| -rw-r--r-- | tests/httpserver.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/tests/httpserver.c b/tests/httpserver.c index 9fefe1f7..a36901f5 100644 --- a/tests/httpserver.c +++ b/tests/httpserver.c @@ -25,6 +25,7 @@ const char *doc1 = "<html><body>Someone <b>is</b> home!</body</html>"; const char *doc2 = "This is a text file."; const char *doc3 = "<html><body>This is doc number 3.</body></html>"; +const char *doc4 = "<html><body>Whoops, Errored!</body></html>"; void cleanup(void) @@ -68,8 +69,7 @@ httpdo(nng_url *url, nng_http_req *req, nng_http_res *res, void **datap, } clen = 0; - if ((nng_http_res_get_status(res) == NNG_HTTP_STATUS_OK) && - ((ptr = nng_http_res_get_header(res, "Content-Length")) != NULL)) { + if ((ptr = nng_http_res_get_header(res, "Content-Length")) != NULL) { clen = atoi(ptr); } @@ -377,7 +377,21 @@ TestMain("HTTP Server", { snprintf(fullurl, sizeof(fullurl), "%s/docs/", urlstr); So(httpget(fullurl, &data, &size, &stat, &ctype) == 0); So(stat == NNG_HTTP_STATUS_NOT_FOUND); - So(size == 0); + }); + + Convey("Custom error page works", { + char fullurl[256]; + void * data; + size_t size; + uint16_t stat; + char * ctype; + + So(nng_http_server_set_error_page(s, 404, doc4) == 0); + snprintf(fullurl, sizeof(fullurl), "%s/docs/", urlstr); + So(httpget(fullurl, &data, &size, &stat, &ctype) == 0); + So(stat == NNG_HTTP_STATUS_NOT_FOUND); + So(size == strlen(doc4)); + So(memcmp(data, doc4, size) == 0); }); Convey("Bad method gives 405", { @@ -397,7 +411,6 @@ TestMain("HTTP Server", { So(httpdo(curl, req, res, &data, &size) == 0); So(nng_http_res_get_status(res) == NNG_HTTP_STATUS_METHOD_NOT_ALLOWED); - So(size == 0); nng_http_req_free(req); nng_http_res_free(res); nng_url_free(curl); @@ -419,7 +432,6 @@ TestMain("HTTP Server", { So(httpdo(curl, req, res, &data, &size) == 0); So(nng_http_res_get_status(res) == NNG_HTTP_STATUS_HTTP_VERSION_NOT_SUPP); - So(size == 0); nng_http_req_free(req); nng_http_res_free(res); nng_url_free(curl); @@ -441,7 +453,6 @@ TestMain("HTTP Server", { So(httpdo(curl, req, res, &data, &size) == 0); So(nng_http_res_get_status(res) == NNG_HTTP_STATUS_BAD_REQUEST); - So(size == 0); nng_http_req_free(req); nng_http_res_free(res); nng_url_free(curl); |