summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-11-03 08:11:59 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-11-03 08:11:59 -0500
commit543d8ee388b6541191789ff18a9638a527d9352c (patch)
treee2098834c4ab3fc85ce5cfbafa5b86127539330e
parenta1d6920745f910e0602e0ffec16a287b593b6d03 (diff)
parentffcb7e2a2540181ea41062ca0e1bc3e4fed9b3a5 (diff)
Merge "res_pjsip: Add to list of valid characters for from_user." into 13
-rw-r--r--res/res_pjsip/pjsip_configuration.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index 629e85b9b..e000039d2 100644
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -1142,11 +1142,11 @@ static int from_user_handler(const struct aco_option *opt,
{
struct ast_sip_endpoint *endpoint = obj;
/* Valid non-alphanumeric characters for URI */
- char *valid_uri_marks = "-_.!~*`()";
+ char *valid_uri_marks = "-._~%!$&'()*+,;=:";
const char *val;
for (val = var->value; *val; val++) {
- if (!strchr(valid_uri_marks, *val) && !isdigit(*val) && !isalpha(*val)) {
+ if (!isalpha(*val) && !isdigit(*val) && !strchr(valid_uri_marks, *val)) {
ast_log(LOG_ERROR, "Error configuring endpoint '%s' - '%s' field "
"contains invalid character '%c'\n",
ast_sorcery_object_get_id(endpoint), var->name, *val);