diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-31 22:34:44 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-31 22:34:44 +0000 |
commit | 9c48a6a0b13e000ddade5ebc182d37062eacc72c (patch) | |
tree | 80fbe185d6954a67b6b23b1f7dc0f106d1fdb1b0 /main | |
parent | 85b4942553deee4b864bbb2fd206b72eccf5480b (diff) |
Merged revisions 135016 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r135016 | kpfleming | 2008-07-31 17:28:42 -0500 (Thu, 31 Jul 2008) | 11 lines
Merged revisions 134983 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r134983 | kpfleming | 2008-07-31 17:18:11 -0500 (Thu, 31 Jul 2008) | 3 lines
accomodate users who seem to lack a sense of humor :-)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@135034 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/http.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/main/http.c b/main/http.c index 5ba869886..c561c634a 100644 --- a/main/http.c +++ b/main/http.c @@ -220,14 +220,14 @@ static struct ast_str *static_callback(struct ast_tcptls_session_instance *ser, return NULL; out404: - *status = 404; - *title = ast_strdup("Not Found"); - return ast_http_error(404, "Not Found", NULL, "Nothing to see here. Move along."); + return ast_http_error((*status = 404), + (*title = ast_strdup("Not Found")), + NULL, "The requested URL was not found on this server."); out403: - *status = 403; - *title = ast_strdup("Access Denied"); - return ast_http_error(403, "Access Denied", NULL, "Sorry, I cannot let you do that, Dave."); + return ast_http_error((*status = 403), + (*title = ast_strdup("Access Denied")), + NULL, "You do not have permission to access the requested URL."); } @@ -638,10 +638,10 @@ static struct ast_str *handle_uri(struct ast_tcptls_session_instance *ser, char if (!strcasecmp(uri, redirect->target)) { char buf[512]; snprintf(buf, sizeof(buf), "Location: %s\r\n", redirect->dest); - out = ast_http_error(302, "Moved Temporarily", buf, - "There is no spoon..."); - *status = 302; - *title = ast_strdup("Moved Temporarily"); + out = ast_http_error((*status = 302), + (*title = ast_strdup("Moved Temporarily")), + buf, "Redirecting..."); + break; } } |