lighttpd
/
lighttpd1.4
2
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[core] http_status_append()

personal/stbuehler/fix-fdevent
Glenn Strauss 3 years ago
parent
b192231392
commit
90c30d5e90
6 changed files with 121 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/connections.c
  2. 204
      src/http_kv.c
  3. 3
      src/http_kv.h
  4. 4
      src/mod_webdav.c
  5. 4
      src/response.c
  6. 8
      tests/request.t

8
src/connections.c
View File

@ -340,18 +340,14 @@ static int connection_handle_write_prepare(server *srv, connection *con) {
"<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n"
" <head>\n"
" <title>"));
buffer_append_int(b, con->http_status);
buffer_append_string_len(b, CONST_STR_LEN(" - "));
buffer_append_string(b, get_http_status_name(con->http_status));
http_status_append(b, con->http_status);
buffer_append_string_len(b, CONST_STR_LEN(
"</title>\n"
" </head>\n"
" <body>\n"
" <h1>"));
buffer_append_int(b, con->http_status);
buffer_append_string_len(b, CONST_STR_LEN(" - "));
buffer_append_string(b, get_http_status_name(con->http_status));
http_status_append(b, con->http_status);
buffer_append_string_len(b, CONST_STR_LEN("</h1>\n"
" </body>\n"

204
src/http_kv.c
View File

@ -1,115 +1,117 @@
#include "first.h"
#include "http_kv.h"
#include "buffer.h"
#include <string.h>
typedef struct {
int key;
const char *value;
size_t vlen;
} keyvalue;
static const keyvalue http_versions[] = {
{ HTTP_VERSION_1_1, "HTTP/1.1" },
{ HTTP_VERSION_1_0, "HTTP/1.0" },
{ HTTP_VERSION_UNSET, NULL }
{ HTTP_VERSION_1_1, CONST_STR_LEN("HTTP/1.1") },
{ HTTP_VERSION_1_0, CONST_STR_LEN("HTTP/1.0") },
{ HTTP_VERSION_UNSET, NULL, 0 }
};
static const keyvalue http_methods[] = {
{ HTTP_METHOD_GET, "GET" },
{ HTTP_METHOD_HEAD, "HEAD" },
{ HTTP_METHOD_POST, "POST" },
{ HTTP_METHOD_PUT, "PUT" },
{ HTTP_METHOD_DELETE, "DELETE" },
{ HTTP_METHOD_CONNECT, "CONNECT" },
{ HTTP_METHOD_OPTIONS, "OPTIONS" },
{ HTTP_METHOD_TRACE, "TRACE" },
{ HTTP_METHOD_ACL, "ACL" },
{ HTTP_METHOD_BASELINE_CONTROL, "BASELINE-CONTROL" },
{ HTTP_METHOD_BIND, "BIND" },
{ HTTP_METHOD_CHECKIN, "CHECKIN" },
{ HTTP_METHOD_CHECKOUT, "CHECKOUT" },
{ HTTP_METHOD_COPY, "COPY" },
{ HTTP_METHOD_LABEL, "LABEL" },
{ HTTP_METHOD_LINK, "LINK" },
{ HTTP_METHOD_LOCK, "LOCK" },
{ HTTP_METHOD_MERGE, "MERGE" },
{ HTTP_METHOD_MKACTIVITY, "MKACTIVITY" },
{ HTTP_METHOD_MKCALENDAR, "MKCALENDAR" },
{ HTTP_METHOD_MKCOL, "MKCOL" },
{ HTTP_METHOD_MKREDIRECTREF, "MKREDIRECTREF" },
{ HTTP_METHOD_MKWORKSPACE, "MKWORKSPACE" },
{ HTTP_METHOD_MOVE, "MOVE" },
{ HTTP_METHOD_ORDERPATCH, "ORDERPATCH" },
{ HTTP_METHOD_PATCH, "PATCH" },
{ HTTP_METHOD_PROPFIND, "PROPFIND" },
{ HTTP_METHOD_PROPPATCH, "PROPPATCH" },
{ HTTP_METHOD_REBIND, "REBIND" },
{ HTTP_METHOD_REPORT, "REPORT" },
{ HTTP_METHOD_SEARCH, "SEARCH" },
{ HTTP_METHOD_UNBIND, "UNBIND" },
{ HTTP_METHOD_UNCHECKOUT, "UNCHECKOUT" },
{ HTTP_METHOD_UNLINK, "UNLINK" },
{ HTTP_METHOD_UNLOCK, "UNLOCK" },
{ HTTP_METHOD_UPDATE, "UPDATE" },
{ HTTP_METHOD_UPDATEREDIRECTREF, "UPDATEREDIRECTREF" },
{ HTTP_METHOD_VERSION_CONTROL, "VERSION-CONTROL" },
{ HTTP_METHOD_UNSET, NULL }
{ HTTP_METHOD_GET, CONST_STR_LEN("GET") },
{ HTTP_METHOD_HEAD, CONST_STR_LEN("HEAD") },
{ HTTP_METHOD_POST, CONST_STR_LEN("POST") },
{ HTTP_METHOD_PUT, CONST_STR_LEN("PUT") },
{ HTTP_METHOD_DELETE, CONST_STR_LEN("DELETE") },
{ HTTP_METHOD_CONNECT, CONST_STR_LEN("CONNECT") },
{ HTTP_METHOD_OPTIONS, CONST_STR_LEN("OPTIONS") },
{ HTTP_METHOD_TRACE, CONST_STR_LEN("TRACE") },
{ HTTP_METHOD_ACL, CONST_STR_LEN("ACL") },
{ HTTP_METHOD_BASELINE_CONTROL, CONST_STR_LEN("BASELINE-CONTROL") },
{ HTTP_METHOD_BIND, CONST_STR_LEN("BIND") },
{ HTTP_METHOD_CHECKIN, CONST_STR_LEN("CHECKIN") },
{ HTTP_METHOD_CHECKOUT, CONST_STR_LEN("CHECKOUT") },
{ HTTP_METHOD_COPY, CONST_STR_LEN("COPY") },
{ HTTP_METHOD_LABEL, CONST_STR_LEN("LABEL") },
{ HTTP_METHOD_LINK, CONST_STR_LEN("LINK") },
{ HTTP_METHOD_LOCK, CONST_STR_LEN("LOCK") },
{ HTTP_METHOD_MERGE, CONST_STR_LEN("MERGE") },
{ HTTP_METHOD_MKACTIVITY, CONST_STR_LEN("MKACTIVITY") },
{ HTTP_METHOD_MKCALENDAR, CONST_STR_LEN("MKCALENDAR") },
{ HTTP_METHOD_MKCOL, CONST_STR_LEN("MKCOL") },
{ HTTP_METHOD_MKREDIRECTREF, CONST_STR_LEN("MKREDIRECTREF") },
{ HTTP_METHOD_MKWORKSPACE, CONST_STR_LEN("MKWORKSPACE") },
{ HTTP_METHOD_MOVE, CONST_STR_LEN("MOVE") },
{ HTTP_METHOD_ORDERPATCH, CONST_STR_LEN("ORDERPATCH") },
{ HTTP_METHOD_PATCH, CONST_STR_LEN("PATCH") },
{ HTTP_METHOD_PROPFIND, CONST_STR_LEN("PROPFIND") },
{ HTTP_METHOD_PROPPATCH, CONST_STR_LEN("PROPPATCH") },
{ HTTP_METHOD_REBIND, CONST_STR_LEN("REBIND") },
{ HTTP_METHOD_REPORT, CONST_STR_LEN("REPORT") },
{ HTTP_METHOD_SEARCH, CONST_STR_LEN("SEARCH") },
{ HTTP_METHOD_UNBIND, CONST_STR_LEN("UNBIND") },
{ HTTP_METHOD_UNCHECKOUT, CONST_STR_LEN("UNCHECKOUT") },
{ HTTP_METHOD_UNLINK, CONST_STR_LEN("UNLINK") },
{ HTTP_METHOD_UNLOCK, CONST_STR_LEN("UNLOCK") },
{ HTTP_METHOD_UPDATE, CONST_STR_LEN("UPDATE") },
{ HTTP_METHOD_UPDATEREDIRECTREF, CONST_STR_LEN("UPDATEREDIRECTREF") },
{ HTTP_METHOD_VERSION_CONTROL, CONST_STR_LEN("VERSION-CONTROL") },
{ HTTP_METHOD_UNSET, NULL, 0 }
};
static const keyvalue http_status[] = {
{ 100, "Continue" },
{ 101, "Switching Protocols" },
{ 102, "Processing" }, /* WebDAV */
{ 200, "OK" },
{ 201, "Created" },
{ 202, "Accepted" },
{ 203, "Non-Authoritative Information" },
{ 204, "No Content" },
{ 205, "Reset Content" },
{ 206, "Partial Content" },
{ 207, "Multi-status" }, /* WebDAV */
{ 300, "Multiple Choices" },
{ 301, "Moved Permanently" },
{ 302, "Found" },
{ 303, "See Other" },
{ 304, "Not Modified" },
{ 305, "Use Proxy" },
{ 306, "(Unused)" },
{ 307, "Temporary Redirect" },
{ 308, "Permanent Redirect" },
{ 400, "Bad Request" },
{ 401, "Unauthorized" },
{ 402, "Payment Required" },
{ 403, "Forbidden" },
{ 404, "Not Found" },
{ 405, "Method Not Allowed" },
{ 406, "Not Acceptable" },
{ 407, "Proxy Authentication Required" },
{ 408, "Request Timeout" },
{ 409, "Conflict" },
{ 410, "Gone" },
{ 411, "Length Required" },
{ 412, "Precondition Failed" },
{ 413, "Request Entity Too Large" },
{ 414, "Request-URI Too Long" },
{ 415, "Unsupported Media Type" },
{ 416, "Requested Range Not Satisfiable" },
{ 417, "Expectation Failed" },
{ 422, "Unprocessable Entity" }, /* WebDAV */
{ 423, "Locked" }, /* WebDAV */
{ 424, "Failed Dependency" }, /* WebDAV */
{ 426, "Upgrade Required" }, /* TLS */
{ 500, "Internal Server Error" },
{ 501, "Not Implemented" },
{ 502, "Bad Gateway" },
{ 503, "Service Not Available" },
{ 504, "Gateway Timeout" },
{ 505, "HTTP Version Not Supported" },
{ 507, "Insufficient Storage" }, /* WebDAV */
{ -1, NULL }
{ 100, CONST_STR_LEN("100 Continue") },
{ 101, CONST_STR_LEN("101 Switching Protocols") },
{ 102, CONST_STR_LEN("102 Processing") }, /* WebDAV */
{ 200, CONST_STR_LEN("200 OK") },
{ 201, CONST_STR_LEN("201 Created") },
{ 202, CONST_STR_LEN("202 Accepted") },
{ 203, CONST_STR_LEN("203 Non-Authoritative Information") },
{ 204, CONST_STR_LEN("204 No Content") },
{ 205, CONST_STR_LEN("205 Reset Content") },
{ 206, CONST_STR_LEN("206 Partial Content") },
{ 207, CONST_STR_LEN("207 Multi-status") }, /* WebDAV */
{ 300, CONST_STR_LEN("300 Multiple Choices") },
{ 301, CONST_STR_LEN("301 Moved Permanently") },
{ 302, CONST_STR_LEN("302 Found") },
{ 303, CONST_STR_LEN("303 See Other") },
{ 304, CONST_STR_LEN("304 Not Modified") },
{ 305, CONST_STR_LEN("305 Use Proxy") },
{ 306, CONST_STR_LEN("306 (Unused)") },
{ 307, CONST_STR_LEN("307 Temporary Redirect") },
{ 308, CONST_STR_LEN("308 Permanent Redirect") },
{ 400, CONST_STR_LEN("400 Bad Request") },
{ 401, CONST_STR_LEN("401 Unauthorized") },
{ 402, CONST_STR_LEN("402 Payment Required") },
{ 403, CONST_STR_LEN("403 Forbidden") },
{ 404, CONST_STR_LEN("404 Not Found") },
{ 405, CONST_STR_LEN("405 Method Not Allowed") },
{ 406, CONST_STR_LEN("406 Not Acceptable") },
{ 407, CONST_STR_LEN("407 Proxy Authentication Required") },
{ 408, CONST_STR_LEN("408 Request Timeout") },
{ 409, CONST_STR_LEN("409 Conflict") },
{ 410, CONST_STR_LEN("410 Gone") },
{ 411, CONST_STR_LEN("411 Length Required") },
{ 412, CONST_STR_LEN("412 Precondition Failed") },
{ 413, CONST_STR_LEN("413 Request Entity Too Large") },
{ 414, CONST_STR_LEN("414 Request-URI Too Long") },
{ 415, CONST_STR_LEN("415 Unsupported Media Type") },
{ 416, CONST_STR_LEN("416 Requested Range Not Satisfiable") },
{ 417, CONST_STR_LEN("417 Expectation Failed") },
{ 422, CONST_STR_LEN("422 Unprocessable Entity") }, /* WebDAV */
{ 423, CONST_STR_LEN("423 Locked") }, /* WebDAV */
{ 424, CONST_STR_LEN("424 Failed Dependency") }, /* WebDAV */
{ 426, CONST_STR_LEN("426 Upgrade Required") }, /* TLS */
{ 500, CONST_STR_LEN("500 Internal Server Error") },
{ 501, CONST_STR_LEN("501 Not Implemented") },
{ 502, CONST_STR_LEN("502 Bad Gateway") },
{ 503, CONST_STR_LEN("503 Service Not Available") },
{ 504, CONST_STR_LEN("504 Gateway Timeout") },
{ 505, CONST_STR_LEN("505 HTTP Version Not Supported") },
{ 507, CONST_STR_LEN("507 Insufficient Storage") }, /* WebDAV */
{ -1, NULL, 0 }
};
@ -149,3 +151,17 @@ int get_http_version_key(const char *s) {
http_method_t get_http_method_key(const char *s) {
return (http_method_t)keyvalue_get_key(http_methods, s);
}
void http_status_append(buffer * const b, const int status) {
const keyvalue * const kv = http_status;
int i;
for (i = 0; kv[i].key != status && kv[i].value; ++i) ;
if (kv[i].value) {
buffer_append_string_len(b, kv[i].value, kv[i].vlen);
}
else {
buffer_append_int(b, status);
buffer_append_string_len(b, CONST_STR_LEN(" "));
}
}

3
src/http_kv.h
View File

@ -2,6 +2,8 @@
#define INCLUDED_HTTP_KV_H
#include "first.h"
#include "buffer.h"
/* sources:
* - [RFC2616], Section 9
* (or http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-22)
@ -61,5 +63,6 @@ const char *get_http_version_name(int i);
const char *get_http_method_name(http_method_t i);
int get_http_version_key(const char *s);
http_method_t get_http_method_key(const char *s);
void http_status_append(buffer *b, int status);
#endif

4
src/mod_webdav.c
View File

@ -527,9 +527,7 @@ static int webdav_gen_response_status_tag(server *srv, connection *con, physical
} else {
buffer_copy_string_len(b, CONST_STR_LEN("HTTP/1.0 "));
}
buffer_append_int(b, status);
buffer_append_string_len(b, CONST_STR_LEN(" "));
buffer_append_string(b, get_http_status_name(status));
http_status_append(b, status);
buffer_append_string_len(b,CONST_STR_LEN("</D:status>\n"));
buffer_append_string_len(b,CONST_STR_LEN("</D:response>\n"));

4
src/response.c
View File

@ -31,9 +31,7 @@ int http_response_write_header(server *srv, connection *con) {
} else {
buffer_copy_string_len(b, CONST_STR_LEN("HTTP/1.0 "));
}
buffer_append_int(b, con->http_status);
buffer_append_string_len(b, CONST_STR_LEN(" "));
buffer_append_string(b, get_http_status_name(con->http_status));
http_status_append(b, con->http_status);
/* disable keep-alive if requested */
if (con->request_count > con->conf.max_keep_alive_requests || 0 == con->conf.max_keep_alive_idle) {

8
tests/request.t
View File

@ -332,10 +332,10 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 416, 'HTTP-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>416 - Requested Range Not Satisfiable</title>
<title>416 Requested Range Not Satisfiable</title>
</head>
<body>
<h1>416 - Requested Range Not Satisfiable</h1>
<h1>416 Requested Range Not Satisfiable</h1>
</body>
</html>
EOF
@ -354,10 +354,10 @@ $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 416, 'HTTP-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>416 - Requested Range Not Satisfiable</title>
<title>416 Requested Range Not Satisfiable</title>
</head>
<body>
<h1>416 - Requested Range Not Satisfiable</h1>
<h1>416 Requested Range Not Satisfiable</h1>
</body>
</html>
EOF

Write Preview
Loading…
Cancel
Save