From: Kevin P. Fleming <kpfleming@digium.com>
Date: Thu, 31 Jul 2008 22:28:42 +0000 (+0000)
Subject: Merged revisions 134983 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~1536
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54b0143463d6acf0c8e4babc01203cbe690de2d8;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@135016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/http.c b/main/http.c
index 1a7579761b..e6256b3dfa 100644
--- a/main/http.c
+++ b/main/http.c
@@ -228,12 +228,12 @@ static struct ast_str *static_callback(struct ast_tcptls_session_instance *ser,
 out404:
 	return ast_http_error((*status = 404),
 			      (*title = ast_strdup("Not Found")),
-			       NULL, "Nothing to see here.  Move along.");
+			       NULL, "The requested URL was not found on this server.");
 
 out403:
 	return ast_http_error((*status = 403),
 			      (*title = ast_strdup("Access Denied")),
-			      NULL, "Sorry, I cannot let you do that, Dave.");
+			      NULL, "You do not have permission to access the requested URL.");
 }
 
 
@@ -480,7 +480,7 @@ static struct ast_str *handle_uri(struct ast_tcptls_session_instance *ser, char
 			snprintf(buf, sizeof(buf), "Location: %s\r\n", redirect->dest);
 			out = ast_http_error((*status = 302),
 					     (*title = ast_strdup("Moved Temporarily")),
-					     buf, "There is no spoon...");
+					     buf, "Redirecting...");
 
 			break;
 		}
@@ -544,7 +544,7 @@ static struct ast_str *handle_uri(struct ast_tcptls_session_instance *ser, char
 	if (method == AST_HTTP_POST && !astman_is_authed(manid_from_vars(vars))) {
 		out = ast_http_error((*status = 403),
 			      (*title = ast_strdup("Access Denied")),
-			      NULL, "Sorry, I cannot let you do that, Dave.");
+			      NULL, "You do not have permission to access the requested URL.");
 	} else if (urih) {
 		*static_content = urih->static_content;
 		out = urih->callback(ser, urih, uri, method, vars, headers, status, title, contentlength);