[svn-commits] kpfleming: trunk r135016 - in /trunk: ./ main/http.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Jul 31 17:28:42 2008
New Revision: 135016

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135016
Log:
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 :-)


........

Modified:
    trunk/   (props changed)
    trunk/main/http.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/http.c
URL: http://svn.digium.com/view/asterisk/trunk/main/http.c?view=diff&rev=135016&r1=135015&r2=135016
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Thu Jul 31 17:28:42 2008
@@ -228,12 +228,12 @@
 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 @@
 			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 @@
 	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);