summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/outdated/authentication.txt2
-rw-r--r--doc/outdated/state.txt2
-rw-r--r--src/h2.c8
-rw-r--r--src/http_header.c2
-rw-r--r--src/http_range.c2
-rw-r--r--src/mod_extforward.c2
-rw-r--r--src/mod_openssl.c2
7 files changed, 10 insertions, 10 deletions
diff --git a/doc/outdated/authentication.txt b/doc/outdated/authentication.txt
index 3e2e7011..8b6b93df 100644
--- a/doc/outdated/authentication.txt
+++ b/doc/outdated/authentication.txt
@@ -29,7 +29,7 @@ https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModAuth
Supported Methods
-----------------
-lighttpd supportes both authentication method described by
+lighttpd supports both authentication method described by
RFC 2617:
basic
diff --git a/doc/outdated/state.txt b/doc/outdated/state.txt
index ce98b74e..c029fd5a 100644
--- a/doc/outdated/state.txt
+++ b/doc/outdated/state.txt
@@ -85,7 +85,7 @@ soon as the header is parsed and we know how much data we expect.
Pipelining
----------
-HTTP/1.1 supportes pipelining (sending multiple requests without waiting
+HTTP/1.1 supports pipelining (sending multiple requests without waiting
for the response of the first request). This is handled transparently by
the 'read' state.
diff --git a/src/h2.c b/src/h2.c
index ec9657cb..83a0f9e1 100644
--- a/src/h2.c
+++ b/src/h2.c
@@ -1286,8 +1286,8 @@ h2_recv_continuation (uint32_t n, uint32_t clen, const off_t cqlen, chunkqueue *
/* set padding to 0 since we will overwrite padding in merge below */
/* (alternatively, could memmove() 9 bytes of frame header over the
* pad length octet, remove PADDED flag, add 1 to c->offset,
- * add 1 to s, subtract 1 from clen and substract 1 from cqlen,
- * substract 1 from n, add 1 to cq->bytes_out) */
+ * add 1 to s, subtract 1 from clen and subtract 1 from cqlen,
+ * subtract 1 from n, add 1 to cq->bytes_out) */
s[9] = 0;
/* set offset to beginning of padding at end of first frame */
m -= plen;
@@ -2050,7 +2050,7 @@ h2_send_hpack (request_st * const r, connection * const con, const char *data, u
/*(approximate space needed for frames (header + payload)
* with slight over-estimate of 16 bytes per frame header (> 9)
* and minimum SETTING_MAX_FRAME_SIZE of 16k (could be larger)
- * (dlen >> 14)+1 is num 16k frames needed, multipled by 16 bytes
+ * (dlen >> 14)+1 is num 16k frames needed, multiplied by 16 bytes
* per frame can be appoximated with (dlen>>10) + 9)*/
buffer * const b =
chunkqueue_append_buffer_open_sz(con->write_queue, dlen + (dlen>>10) + 9);
@@ -2571,7 +2571,7 @@ h2_send_data (request_st * const r, connection * const con, const char *data, ui
/*(approximate space needed for frames (header + payload)
* with slight over-estimate of 16 bytes per frame header (> 9)
* and minimum SETTING_MAX_FRAME_SIZE of 16k (could be larger)
- * (dlen >> 14)+1 is num 16k frames needed, multipled by 16 bytes
+ * (dlen >> 14)+1 is num 16k frames needed, multiplied by 16 bytes
* per frame can be appoximated with (dlen>>10) + 9)*/
buffer * const b =
chunkqueue_append_buffer_open_sz(con->write_queue, dlen + (dlen>>10) + 9);
diff --git a/src/http_header.c b/src/http_header.c
index 2b51e6d0..20d58871 100644
--- a/src/http_header.c
+++ b/src/http_header.c
@@ -115,7 +115,7 @@ enum http_header_e http_header_hkey_get(const char * const s, const size_t slen)
enum http_header_e http_header_hkey_get_lc(const char * const s, const size_t slen) {
/* XXX: might not provide much real performance over http_header_hkey_get()
- * (since the first-char comparision optimization was added)
+ * (since the first-char comparison optimization was added)
* (and since well-known h2 headers are already mapped to hkey) */
if (__builtin_expect( (slen < sizeof(http_headers_off)), 1)) {
const int i = http_headers_off[slen];
diff --git a/src/http_range.c b/src/http_range.c
index 788f3041..719b8b3a 100644
--- a/src/http_range.c
+++ b/src/http_range.c
@@ -81,7 +81,7 @@ static const char *
http_range_parse_next (const char * restrict s, const off_t len,
off_t * const restrict ranges)
{
- /*(caller must check retured ranges[1] != -1, or else range was invalid)*/
+ /*(caller must check returned ranges[1] != -1, or else range was invalid)*/
/*assert(len > 0);*//*(caller must ensure len > 0)*/
char *e;
diff --git a/src/mod_extforward.c b/src/mod_extforward.c
index 8b1fa7e8..9b844bf0 100644
--- a/src/mod_extforward.c
+++ b/src/mod_extforward.c
@@ -1304,7 +1304,7 @@ The following types have already been registered for the <type> field :
#define PP2_TYPE_NETNS 0x30
/*
-For the type PP2_TYPE_SSL, the value is itselv a defined like this :
+For the type PP2_TYPE_SSL, the value is itself defined like this :
*/
struct pp2_tlv_ssl {
diff --git a/src/mod_openssl.c b/src/mod_openssl.c
index 6e814a3b..7698afc5 100644
--- a/src/mod_openssl.c
+++ b/src/mod_openssl.c
@@ -2878,7 +2878,7 @@ SETDEFAULTS_FUNC(mod_openssl_set_defaults)
}
else if (ca_store && (ssl_ca_crl_file || default_ssl_ca_crl_file)) {
/* prior behavior in lighttpd allowed ssl.ca-crl-file only in global
- * scope or $SERVER["socket"], so this inheritence from global scope
+ * scope or $SERVER["socket"], so this inheritance from global scope
* is reasonable. This code does not implement inheritance of
* ssl.ca-crl-file from $SERVER["socket"] into nested $HTTP["host"],
* but the solution is to repeat ssl.ca-crl-file where ssl.ca-file