diff options
| author | Ryan Bloom <rbb@apache.org> | 2002-10-11 17:29:22 +0200 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2002-10-11 17:29:22 +0200 |
| commit | 37f9061757269b8f207d24dc8d90c110d9f750e4 (patch) | |
| tree | efd2f5024f1d39d8217e37336257bf85c68cf6b2 /modules/http | |
| parent | Fix receive_request, it was using the same location in the iovec for both (diff) | |
| download | apache2-37f9061757269b8f207d24dc8d90c110d9f750e4.tar.xz apache2-37f9061757269b8f207d24dc8d90c110d9f750e4.zip | |
Fix a compile of compiler warnings. I don't know how these slipped past.
Also, uncomment a line of code that the last commit should have uncommented.
Randall found this line and the fix, but I forgot to uncomment this line
along with the fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97179 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http')
| -rw-r--r-- | modules/http/http_protocol.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 6730df6dcf..09e087c88c 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -163,7 +163,12 @@ static const char * const status_lines[RESPONSE_CODES] = "422 Unprocessable Entity", "423 Locked", "424 Failed Dependency", -#define LEVEL_500 44 + /* This is a hack, but it is required for ap_index_of_response + * to work with 426. + */ + "425 No code", + "426 Upgrade Required", +#define LEVEL_500 46 "500 Internal Server Error", "501 Method Not Implemented", "502 Bad Gateway", @@ -2190,6 +2195,12 @@ static const char *get_canned_error_string(int status, return("<p>The method could not be performed on the resource\n" "because the requested action depended on another\n" "action and that other action failed.</p>\n"); + case HTTP_UPGRADE_REQUIRED: + return("<p>The requested resource can only be retrieved\n" + "using SSL. The server is willing to upgrade the current\n" + "connection to SSL, but your client doesn't support it.\n" + "Either upgrade your client, or try requesting the page\n" + "using https://\n"); case HTTP_INSUFFICIENT_STORAGE: return("<p>The method could not be performed on the resource\n" "because the server is unable to store the\n" |