[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] branch master updated (41c097c1 -> 7138f352)
|
From: |
gnunet |
|
Subject: |
[libmicrohttpd] branch master updated (41c097c1 -> 7138f352) |
|
Date: |
Sun, 20 Sep 2020 21:20:06 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a change to branch master
in repository libmicrohttpd.
from 41c097c1 Re-factor debugging macros. 'MHD_NO' is meaningless for
precompiler, used special macro instead
new 1c90123d uncrustify.cfg: updated
new e1f5f53a contrib/gen_http_statuses_inserts.sh: updated to generate
better formatted C code
new 7138f352 Updated HTTP headers names, status codes and methods
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
contrib/gen_http_statuses_inserts.sh | 47 ++++++---
contrib/uncrustify.cfg | 16 +++
src/include/microhttpd.h | 20 +++-
src/microhttpd/reason_phrase.c | 198 +++++++++++++++++------------------
4 files changed, 163 insertions(+), 118 deletions(-)
diff --git a/contrib/gen_http_statuses_inserts.sh
b/contrib/gen_http_statuses_inserts.sh
index 07c2075f..6c8e6454 100755
--- a/contrib/gen_http_statuses_inserts.sh
+++ b/contrib/gen_http_statuses_inserts.sh
@@ -56,30 +56,45 @@ gawk -e 'BEGIN {
hundreds[5]="five"
hundreds[6]="six"
prev_num=0
+ prev_reason=""
+ prev_desc=""
+ num=0
+ reason=""
+ desc=""
}
FNR > 1 {
gsub(/^\[|^"\[|\]"$|\]$/, "", $3)
gsub(/\]\[/, "; ", $3)
- if ($1 % 100 == 0) {
- if ($1 != 100) { printf("\n};\n\n") }
- prev_num=$1 - 1;
+ num = $1
+ reason = $2
+ desc = $3
+ if (num % 100 == 0) {
+ if (num != 100) {
+ printf (" /* %s */ %-24s /* %s */\n};\n\n", prev_num,
"\""prev_reason"\"", prev_desc)
+ }
+ prev_num = num;
print "static const char *const " hundreds[$1/100] "_hundred[] = {"
}
- if ($1 == 306) {
- $2 = "Switch Proxy"
- $3 = "Not used! " $3
+ if (num == 306) {
+ reason = "Switch Proxy"
+ desc = "Not used! " desc
}
- if ($2 == "Unassigned") next
- while(++prev_num != $1) {
- if (prev_num == 449) {reason="Reply With"; desc="MS IIS extension";}
- else if (prev_num == 450) {reason="Blocked by Windows Parental Controls";
desc="MS extension";}
- else if (prev_num == 509) {reason="Bandwidth Limit Exceeded"; desc="Apache
extension";}
- else {reason="Unknown"; desc="Not used";}
- printf (",\n /* %s */ %-24s /* %s */", prev_num, "\"" reason "\"", desc)
+ if (reason == "Unassigned") next
+ if (prev_num != num)
+ printf (" /* %s */ %-24s /* %s */\n", prev_num, "\""prev_reason"\",",
prev_desc)
+ while(++prev_num < num) {
+ if (prev_num == 449) {prev_reason="Reply With"; prev_desc="MS IIS
extension";}
+ else if (prev_num == 450) {prev_reason="Blocked by Windows Parental
Controls"; prev_desc="MS extension";}
+ else if (prev_num == 509) {prev_reason="Bandwidth Limit Exceeded";
prev_desc="Apache extension";}
+ else {prev_reason="Unknown"; prev_desc="Not used";}
+ printf (" /* %s */ %-24s /* %s */\n", prev_num, "\""prev_reason"\",",
prev_desc)
}
- if ($1 % 100 != 0) { print "," }
- printf (" /* %s */ %-24s /* %s */", $1, "\""$2"\"", $3)
+ prev_num = num
+ prev_reason = reason
+ prev_desc = desc
}
-END {printf("\n};\n")}' http-status-codes-1.csv >> code_insert_statuses.c && \
+END {
+ printf (" /* %s */ %-24s /* %s */\n};\n", prev_num, "\""prev_reason"\"",
prev_desc)
+}' http-status-codes-1.csv > code_insert_statuses.c && \
echo OK && \
rm http-status-codes-1.csv || exit
diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
index 8c9df2c4..72520189 100644
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@ -93,3 +93,19 @@ nl_func_type_name = force
nl_else_brace = add
nl_elseif_brace = add
nl_for_brace = add
+
+# Whether to ignore the '#define' body while formatting.
+pp_ignore_define_body = true # true/false
+
+# Add or remove space between #else or #endif and a trailing comment.
+sp_endif_cmt = add # ignore/add/remove/force
+
+# The span for aligning comments that end lines.
+#
+# 0: Don't align (default).
+align_right_cmt_span = 3 # unsigned number
+
+# Minimum number of columns between preceding text and a trailing comment in
+# order for the comment to qualify for being aligned. Must be non-zero to have
+# an effect.
+align_right_cmt_gap = 2 # unsigned number
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 9a49f67b..ad056c9b 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -539,7 +539,7 @@ MHD_get_reason_phrase_for (unsigned int code);
* @defgroup headers HTTP headers
* These are the standard headers found in HTTP requests and responses.
* See: http://www.iana.org/assignments/message-headers/message-headers.xml
- * Registry export date: 2019-06-09
+ * Registry export date: 2020-09-20
* @{
*/
@@ -646,6 +646,8 @@ MHD_get_reason_phrase_for (unsigned int code);
#define MHD_HTTP_HEADER_A_IM "A-IM"
/* No category. RFC4229 */
#define MHD_HTTP_HEADER_ACCEPT_ADDITIONS "Accept-Additions"
+/* Experimental. RFC-ietf-httpbis-client-hints-15, Section 3.1 */
+#define MHD_HTTP_HEADER_ACCEPT_CH "Accept-CH"
/* Informational. RFC7089 */
#define MHD_HTTP_HEADER_ACCEPT_DATETIME "Accept-Datetime"
/* No category. RFC4229 */
@@ -684,6 +686,10 @@ MHD_get_reason_phrase_for (unsigned int code);
#define MHD_HTTP_HEADER_CALDAV_TIMEZONES "CalDAV-Timezones"
/* Standard. RFC8586 */
#define MHD_HTTP_HEADER_CDN_LOOP "CDN-Loop"
+/* Standard. RFC8739, Section 3.3 */
+#define MHD_HTTP_HEADER_CERT_NOT_AFTER "Cert-Not-After"
+/* Standard. RFC8739, Section 3.3 */
+#define MHD_HTTP_HEADER_CERT_NOT_BEFORE "Cert-Not-Before"
/* Obsoleted. RFC2068; RFC2616 */
#define MHD_HTTP_HEADER_CONTENT_BASE "Content-Base"
/* Standard. RFC6266 */
@@ -759,6 +765,14 @@ MHD_get_reason_phrase_for (unsigned int code);
#define MHD_HTTP_HEADER_METER "Meter"
/* No category. RFC4229 */
#define MHD_HTTP_HEADER_NEGOTIATE "Negotiate"
+/* Standard. OData Version 4.01 Part 1: Protocol; OASIS; Chet_Ensign */
+#define MHD_HTTP_HEADER_ODATA_ENTITYID "OData-EntityId"
+/* Standard. OData Version 4.01 Part 1: Protocol; OASIS; Chet_Ensign */
+#define MHD_HTTP_HEADER_ODATA_ISOLATION "OData-Isolation"
+/* Standard. OData Version 4.01 Part 1: Protocol; OASIS; Chet_Ensign */
+#define MHD_HTTP_HEADER_ODATA_MAXVERSION "OData-MaxVersion"
+/* Standard. OData Version 4.01 Part 1: Protocol; OASIS; Chet_Ensign */
+#define MHD_HTTP_HEADER_ODATA_VERSION "OData-Version"
/* No category. RFC4229 */
#define MHD_HTTP_HEADER_OPT "Opt"
/* Experimental. RFC8053, Section 3 */
@@ -767,7 +781,7 @@ MHD_get_reason_phrase_for (unsigned int code);
#define MHD_HTTP_HEADER_ORDERING_TYPE "Ordering-Type"
/* Standard. RFC6454 */
#define MHD_HTTP_HEADER_ORIGIN "Origin"
-/* Standard. RFC-ietf-core-object-security-16, Section 11.1 */
+/* Standard. RFC8613, Section 11.1 */
#define MHD_HTTP_HEADER_OSCORE "OSCORE"
/* Standard. RFC4918 */
#define MHD_HTTP_HEADER_OVERWRITE "Overwrite"
@@ -893,7 +907,7 @@ MHD_get_reason_phrase_for (unsigned int code);
* @defgroup methods HTTP methods
* HTTP methods (as strings).
* See: http://www.iana.org/assignments/http-methods/http-methods.xml
- * Registry export date: 2019-06-09
+ * Registry export date: 2020-09-20
* @{
*/
diff --git a/src/microhttpd/reason_phrase.c b/src/microhttpd/reason_phrase.c
index 7891854a..4e54d920 100644
--- a/src/microhttpd/reason_phrase.c
+++ b/src/microhttpd/reason_phrase.c
@@ -36,121 +36,121 @@ static const char *const invalid_hundred[] = {
};
static const char *const one_hundred[] = {
- /* 100 */ "Continue" /* RFC7231, Section 6.2.1 */,
- /* 101 */ "Switching Protocols" /* RFC7231, Section 6.2.2 */,
- /* 102 */ "Processing" /* RFC2518 */,
+ /* 100 */ "Continue", /* RFC7231, Section 6.2.1 */
+ /* 101 */ "Switching Protocols", /* RFC7231, Section 6.2.2 */
+ /* 102 */ "Processing", /* RFC2518 */
/* 103 */ "Early Hints" /* RFC8297 */
};
static const char *const two_hundred[] = {
- /* 200 */ "OK" /* RFC7231, Section 6.3.1 */,
- /* 201 */ "Created" /* RFC7231, Section 6.3.2 */,
- /* 202 */ "Accepted" /* RFC7231, Section 6.3.3 */,
- /* 203 */ "Non-Authoritative Information" /* RFC7231, Section 6.3.4 */,
- /* 204 */ "No Content" /* RFC7231, Section 6.3.5 */,
- /* 205 */ "Reset Content" /* RFC7231, Section 6.3.6 */,
- /* 206 */ "Partial Content" /* RFC7233, Section 4.1 */,
- /* 207 */ "Multi-Status" /* RFC4918 */,
- /* 208 */ "Already Reported" /* RFC5842 */,
- /* 209 */ "Unknown" /* Not used */,
- /* 210 */ "Unknown" /* Not used */,
- /* 211 */ "Unknown" /* Not used */,
- /* 212 */ "Unknown" /* Not used */,
- /* 213 */ "Unknown" /* Not used */,
- /* 214 */ "Unknown" /* Not used */,
- /* 215 */ "Unknown" /* Not used */,
- /* 216 */ "Unknown" /* Not used */,
- /* 217 */ "Unknown" /* Not used */,
- /* 218 */ "Unknown" /* Not used */,
- /* 219 */ "Unknown" /* Not used */,
- /* 220 */ "Unknown" /* Not used */,
- /* 221 */ "Unknown" /* Not used */,
- /* 222 */ "Unknown" /* Not used */,
- /* 223 */ "Unknown" /* Not used */,
- /* 224 */ "Unknown" /* Not used */,
- /* 225 */ "Unknown" /* Not used */,
+ /* 200 */ "OK", /* RFC7231, Section 6.3.1 */
+ /* 201 */ "Created", /* RFC7231, Section 6.3.2 */
+ /* 202 */ "Accepted", /* RFC7231, Section 6.3.3 */
+ /* 203 */ "Non-Authoritative Information", /* RFC7231, Section 6.3.4 */
+ /* 204 */ "No Content", /* RFC7231, Section 6.3.5 */
+ /* 205 */ "Reset Content", /* RFC7231, Section 6.3.6 */
+ /* 206 */ "Partial Content", /* RFC7233, Section 4.1 */
+ /* 207 */ "Multi-Status", /* RFC4918 */
+ /* 208 */ "Already Reported", /* RFC5842 */
+ /* 209 */ "Unknown", /* Not used */
+ /* 210 */ "Unknown", /* Not used */
+ /* 211 */ "Unknown", /* Not used */
+ /* 212 */ "Unknown", /* Not used */
+ /* 213 */ "Unknown", /* Not used */
+ /* 214 */ "Unknown", /* Not used */
+ /* 215 */ "Unknown", /* Not used */
+ /* 216 */ "Unknown", /* Not used */
+ /* 217 */ "Unknown", /* Not used */
+ /* 218 */ "Unknown", /* Not used */
+ /* 219 */ "Unknown", /* Not used */
+ /* 220 */ "Unknown", /* Not used */
+ /* 221 */ "Unknown", /* Not used */
+ /* 222 */ "Unknown", /* Not used */
+ /* 223 */ "Unknown", /* Not used */
+ /* 224 */ "Unknown", /* Not used */
+ /* 225 */ "Unknown", /* Not used */
/* 226 */ "IM Used" /* RFC3229 */
};
static const char *const three_hundred[] = {
- /* 300 */ "Multiple Choices" /* RFC7231, Section 6.4.1 */,
- /* 301 */ "Moved Permanently" /* RFC7231, Section 6.4.2 */,
- /* 302 */ "Found" /* RFC7231, Section 6.4.3 */,
- /* 303 */ "See Other" /* RFC7231, Section 6.4.4 */,
- /* 304 */ "Not Modified" /* RFC7232, Section 4.1 */,
- /* 305 */ "Use Proxy" /* RFC7231, Section 6.4.5 */,
- /* 306 */ "Switch Proxy" /* Not used! RFC7231, Section 6.4.6 */,
- /* 307 */ "Temporary Redirect" /* RFC7231, Section 6.4.7 */,
+ /* 300 */ "Multiple Choices", /* RFC7231, Section 6.4.1 */
+ /* 301 */ "Moved Permanently", /* RFC7231, Section 6.4.2 */
+ /* 302 */ "Found", /* RFC7231, Section 6.4.3 */
+ /* 303 */ "See Other", /* RFC7231, Section 6.4.4 */
+ /* 304 */ "Not Modified", /* RFC7232, Section 4.1 */
+ /* 305 */ "Use Proxy", /* RFC7231, Section 6.4.5 */
+ /* 306 */ "Switch Proxy", /* Not used! RFC7231, Section 6.4.6 */
+ /* 307 */ "Temporary Redirect", /* RFC7231, Section 6.4.7 */
/* 308 */ "Permanent Redirect" /* RFC7538 */
};
static const char *const four_hundred[] = {
- /* 400 */ "Bad Request" /* RFC7231, Section 6.5.1 */,
- /* 401 */ "Unauthorized" /* RFC7235, Section 3.1 */,
- /* 402 */ "Payment Required" /* RFC7231, Section 6.5.2 */,
- /* 403 */ "Forbidden" /* RFC7231, Section 6.5.3 */,
- /* 404 */ "Not Found" /* RFC7231, Section 6.5.4 */,
- /* 405 */ "Method Not Allowed" /* RFC7231, Section 6.5.5 */,
- /* 406 */ "Not Acceptable" /* RFC7231, Section 6.5.6 */,
- /* 407 */ "Proxy Authentication Required" /* RFC7235, Section 3.2 */,
- /* 408 */ "Request Timeout" /* RFC7231, Section 6.5.7 */,
- /* 409 */ "Conflict" /* RFC7231, Section 6.5.8 */,
- /* 410 */ "Gone" /* RFC7231, Section 6.5.9 */,
- /* 411 */ "Length Required" /* RFC7231, Section 6.5.10 */,
- /* 412 */ "Precondition Failed" /* RFC7232, Section 4.2; RFC8144, Section
3.2 */,
- /* 413 */ "Payload Too Large" /* RFC7231, Section 6.5.11 */,
- /* 414 */ "URI Too Long" /* RFC7231, Section 6.5.12 */,
- /* 415 */ "Unsupported Media Type" /* RFC7231, Section 6.5.13; RFC7694,
Section 3 */,
- /* 416 */ "Range Not Satisfiable" /* RFC7233, Section 4.4 */,
- /* 417 */ "Expectation Failed" /* RFC7231, Section 6.5.14 */,
- /* 418 */ "Unknown" /* Not used */,
- /* 419 */ "Unknown" /* Not used */,
- /* 420 */ "Unknown" /* Not used */,
- /* 421 */ "Misdirected Request" /* RFC7540, Section 9.1.2 */,
- /* 422 */ "Unprocessable Entity" /* RFC4918 */,
- /* 423 */ "Locked" /* RFC4918 */,
- /* 424 */ "Failed Dependency" /* RFC4918 */,
- /* 425 */ "Too Early" /* RFC8470 */,
- /* 426 */ "Upgrade Required" /* RFC7231, Section 6.5.15 */,
- /* 427 */ "Unknown" /* Not used */,
- /* 428 */ "Precondition Required" /* RFC6585 */,
- /* 429 */ "Too Many Requests" /* RFC6585 */,
- /* 430 */ "Unknown" /* Not used */,
- /* 431 */ "Request Header Fields Too Large" /* RFC6585 */,
- /* 432 */ "Unknown" /* Not used */,
- /* 433 */ "Unknown" /* Not used */,
- /* 434 */ "Unknown" /* Not used */,
- /* 435 */ "Unknown" /* Not used */,
- /* 436 */ "Unknown" /* Not used */,
- /* 437 */ "Unknown" /* Not used */,
- /* 438 */ "Unknown" /* Not used */,
- /* 439 */ "Unknown" /* Not used */,
- /* 440 */ "Unknown" /* Not used */,
- /* 441 */ "Unknown" /* Not used */,
- /* 442 */ "Unknown" /* Not used */,
- /* 443 */ "Unknown" /* Not used */,
- /* 444 */ "Unknown" /* Not used */,
- /* 445 */ "Unknown" /* Not used */,
- /* 446 */ "Unknown" /* Not used */,
- /* 447 */ "Unknown" /* Not used */,
- /* 448 */ "Unknown" /* Not used */,
- /* 449 */ "Reply With" /* MS IIS extension */,
- /* 450 */ "Blocked by Windows Parental Controls" /* MS extension */,
+ /* 400 */ "Bad Request", /* RFC7231, Section 6.5.1 */
+ /* 401 */ "Unauthorized", /* RFC7235, Section 3.1 */
+ /* 402 */ "Payment Required", /* RFC7231, Section 6.5.2 */
+ /* 403 */ "Forbidden", /* RFC7231, Section 6.5.3 */
+ /* 404 */ "Not Found", /* RFC7231, Section 6.5.4 */
+ /* 405 */ "Method Not Allowed", /* RFC7231, Section 6.5.5 */
+ /* 406 */ "Not Acceptable", /* RFC7231, Section 6.5.6 */
+ /* 407 */ "Proxy Authentication Required", /* RFC7235, Section 3.2 */
+ /* 408 */ "Request Timeout", /* RFC7231, Section 6.5.7 */
+ /* 409 */ "Conflict", /* RFC7231, Section 6.5.8 */
+ /* 410 */ "Gone", /* RFC7231, Section 6.5.9 */
+ /* 411 */ "Length Required", /* RFC7231, Section 6.5.10 */
+ /* 412 */ "Precondition Failed", /* RFC7232, Section 4.2; RFC8144, Section
3.2 */
+ /* 413 */ "Payload Too Large", /* RFC7231, Section 6.5.11 */
+ /* 414 */ "URI Too Long", /* RFC7231, Section 6.5.12 */
+ /* 415 */ "Unsupported Media Type", /* RFC7231, Section 6.5.13; RFC7694,
Section 3 */
+ /* 416 */ "Range Not Satisfiable", /* RFC7233, Section 4.4 */
+ /* 417 */ "Expectation Failed", /* RFC7231, Section 6.5.14 */
+ /* 418 */ "Unknown", /* Not used */
+ /* 419 */ "Unknown", /* Not used */
+ /* 420 */ "Unknown", /* Not used */
+ /* 421 */ "Misdirected Request", /* RFC7540, Section 9.1.2 */
+ /* 422 */ "Unprocessable Entity", /* RFC4918 */
+ /* 423 */ "Locked", /* RFC4918 */
+ /* 424 */ "Failed Dependency", /* RFC4918 */
+ /* 425 */ "Too Early", /* RFC8470 */
+ /* 426 */ "Upgrade Required", /* RFC7231, Section 6.5.15 */
+ /* 427 */ "Unknown", /* Not used */
+ /* 428 */ "Precondition Required", /* RFC6585 */
+ /* 429 */ "Too Many Requests", /* RFC6585 */
+ /* 430 */ "Unknown", /* Not used */
+ /* 431 */ "Request Header Fields Too Large", /* RFC6585 */
+ /* 432 */ "Unknown", /* Not used */
+ /* 433 */ "Unknown", /* Not used */
+ /* 434 */ "Unknown", /* Not used */
+ /* 435 */ "Unknown", /* Not used */
+ /* 436 */ "Unknown", /* Not used */
+ /* 437 */ "Unknown", /* Not used */
+ /* 438 */ "Unknown", /* Not used */
+ /* 439 */ "Unknown", /* Not used */
+ /* 440 */ "Unknown", /* Not used */
+ /* 441 */ "Unknown", /* Not used */
+ /* 442 */ "Unknown", /* Not used */
+ /* 443 */ "Unknown", /* Not used */
+ /* 444 */ "Unknown", /* Not used */
+ /* 445 */ "Unknown", /* Not used */
+ /* 446 */ "Unknown", /* Not used */
+ /* 447 */ "Unknown", /* Not used */
+ /* 448 */ "Unknown", /* Not used */
+ /* 449 */ "Reply With", /* MS IIS extension */
+ /* 450 */ "Blocked by Windows Parental Controls", /* MS extension */
/* 451 */ "Unavailable For Legal Reasons" /* RFC7725 */
};
static const char *const five_hundred[] = {
- /* 500 */ "Internal Server Error" /* RFC7231, Section 6.6.1 */,
- /* 501 */ "Not Implemented" /* RFC7231, Section 6.6.2 */,
- /* 502 */ "Bad Gateway" /* RFC7231, Section 6.6.3 */,
- /* 503 */ "Service Unavailable" /* RFC7231, Section 6.6.4 */,
- /* 504 */ "Gateway Timeout" /* RFC7231, Section 6.6.5 */,
- /* 505 */ "HTTP Version Not Supported" /* RFC7231, Section 6.6.6 */,
- /* 506 */ "Variant Also Negotiates" /* RFC2295 */,
- /* 507 */ "Insufficient Storage" /* RFC4918 */,
- /* 508 */ "Loop Detected" /* RFC5842 */,
- /* 509 */ "Bandwidth Limit Exceeded" /* Apache extension */,
- /* 510 */ "Not Extended" /* RFC2774 */,
+ /* 500 */ "Internal Server Error", /* RFC7231, Section 6.6.1 */
+ /* 501 */ "Not Implemented", /* RFC7231, Section 6.6.2 */
+ /* 502 */ "Bad Gateway", /* RFC7231, Section 6.6.3 */
+ /* 503 */ "Service Unavailable", /* RFC7231, Section 6.6.4 */
+ /* 504 */ "Gateway Timeout", /* RFC7231, Section 6.6.5 */
+ /* 505 */ "HTTP Version Not Supported", /* RFC7231, Section 6.6.6 */
+ /* 506 */ "Variant Also Negotiates", /* RFC2295 */
+ /* 507 */ "Insufficient Storage", /* RFC4918 */
+ /* 508 */ "Loop Detected", /* RFC5842 */
+ /* 509 */ "Bandwidth Limit Exceeded", /* Apache extension */
+ /* 510 */ "Not Extended", /* RFC2774 */
/* 511 */ "Network Authentication Required" /* RFC6585 */
};
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libmicrohttpd] branch master updated (41c097c1 -> 7138f352),
gnunet <=