Skip to content

Commit 7375005

Browse files
hdurand0710oktalz
authored andcommitted
MINOR: http_request_rule: return content type can be nil
When parsing return content type, it should be nil if the string is empty.
1 parent 85c25d2 commit 7375005

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

configuration/http_request_rule.go

+10-2
Original file line numberDiff line numberDiff line change
@@ -301,14 +301,18 @@ func ParseHTTPRequestRule(f types.Action) (rule *models.HTTPRequestRule, err err
301301
CondTest: v.CondTest,
302302
}
303303
case *http_actions.Deny:
304+
var returnContentTypePtr *string
305+
if v.ContentType != "" {
306+
returnContentTypePtr = &v.ContentType
307+
}
304308
rule = &models.HTTPRequestRule{
305309
Type: "deny",
306310
Cond: v.Cond,
307311
CondTest: v.CondTest,
308312
ReturnHeaders: actionHdr2ModelHdr(v.Hdrs),
309313
ReturnContent: v.Content,
310314
ReturnContentFormat: v.ContentFormat,
311-
ReturnContentType: &v.ContentType,
315+
ReturnContentType: returnContentTypePtr,
312316
DenyStatus: v.Status,
313317
}
314318
case *http_actions.DisableL7Retry:
@@ -418,13 +422,17 @@ func ParseHTTPRequestRule(f types.Action) (rule *models.HTTPRequestRule, err err
418422
CondTest: v.CondTest,
419423
}
420424
case *http_actions.Return:
425+
var returnContentTypePtr *string
426+
if v.ContentType != "" {
427+
returnContentTypePtr = &v.ContentType
428+
}
421429
rule = &models.HTTPRequestRule{
422430
Cond: v.Cond,
423431
CondTest: v.CondTest,
424432
ReturnHeaders: actionHdr2ModelHdr(v.Hdrs),
425433
ReturnContent: v.Content,
426434
ReturnContentFormat: v.ContentFormat,
427-
ReturnContentType: &v.ContentType,
435+
ReturnContentType: returnContentTypePtr,
428436
ReturnStatusCode: v.Status,
429437
Type: "return",
430438
}

0 commit comments

Comments
 (0)