summaryrefslogtreecommitdiffhomepage
path: root/src/nxt_http_route.c
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2020-03-21 01:39:00 +0300
committerValentin Bartenev <vbart@nginx.com>2020-03-21 01:39:00 +0300
commitc63b498f9416d26c1288a86ae4fc0b6007a16142 (patch)
tree7fe911579cc7f3aac50a0a649236195127cf767e /src/nxt_http_route.c
parent35d6f84426cfaa27587456a8ebb81b13f60e697a (diff)
downloadunit-c63b498f9416d26c1288a86ae4fc0b6007a16142.tar.gz
unit-c63b498f9416d26c1288a86ae4fc0b6007a16142.tar.bz2
Implemented "location" option for "return" action.
This allows to specify redirects: { "action": { "return": 301, "location": "https://www.example.com/" } }
Diffstat (limited to 'src/nxt_http_route.c')
-rw-r--r--src/nxt_http_route.c38
1 files changed, 36 insertions, 2 deletions
diff --git a/src/nxt_http_route.c b/src/nxt_http_route.c
index 6403a005..ee22f48d 100644
--- a/src/nxt_http_route.c
+++ b/src/nxt_http_route.c
@@ -42,6 +42,7 @@ typedef enum {
typedef struct {
nxt_conf_value_t *pass;
nxt_conf_value_t *ret;
+ nxt_str_t location;
nxt_conf_value_t *share;
nxt_conf_value_t *proxy;
nxt_conf_value_t *fallback;
@@ -582,6 +583,11 @@ static nxt_conf_map_t nxt_http_route_action_conf[] = {
offsetof(nxt_http_route_action_conf_t, ret)
},
{
+ nxt_string("location"),
+ NXT_CONF_MAP_STR,
+ offsetof(nxt_http_route_action_conf_t, location)
+ },
+ {
nxt_string("share"),
NXT_CONF_MAP_PTR,
offsetof(nxt_http_route_action_conf_t, share)
@@ -606,6 +612,7 @@ nxt_http_route_action_create(nxt_router_temp_conf_t *tmcf, nxt_conf_value_t *cv,
nxt_mp_t *mp;
nxt_int_t ret;
nxt_str_t name, *string;
+ nxt_uint_t encode;
nxt_conf_value_t *conf;
nxt_http_route_action_conf_t accf;
@@ -619,9 +626,38 @@ nxt_http_route_action_create(nxt_router_temp_conf_t *tmcf, nxt_conf_value_t *cv,
nxt_memzero(action, sizeof(nxt_http_action_t));
+ mp = tmcf->router_conf->mem_pool;
+
if (accf.ret != NULL) {
action->handler = nxt_http_return_handler;
action->u.return_code = nxt_conf_get_integer(accf.ret);
+
+ if (accf.location.length > 0) {
+ if (nxt_is_complex_uri_encoded(accf.location.start,
+ accf.location.length))
+ {
+ string = nxt_str_dup(mp, &action->name, &accf.location);
+ if (nxt_slow_path(string == NULL)) {
+ return NXT_ERROR;
+ }
+
+ } else {
+ string = &action->name;
+
+ encode = nxt_encode_complex_uri(NULL, accf.location.start,
+ accf.location.length);
+ string->length = accf.location.length + encode * 2;
+
+ string->start = nxt_mp_nget(mp, string->length);
+ if (nxt_slow_path(string->start == NULL)) {
+ return NXT_ERROR;
+ }
+
+ nxt_encode_complex_uri(string->start, accf.location.start,
+ accf.location.length);
+ }
+ }
+
return NXT_OK;
}
@@ -637,8 +673,6 @@ nxt_http_route_action_create(nxt_router_temp_conf_t *tmcf, nxt_conf_value_t *cv,
nxt_conf_get_string(conf, &name);
- mp = tmcf->router_conf->mem_pool;
-
string = nxt_str_dup(mp, &action->name, &name);
if (nxt_slow_path(string == NULL)) {
return NXT_ERROR;