diff options
| -rw-r--r-- | doc/config/conf.d/expire.conf | 2 | ||||
| -rw-r--r-- | doc/config/lighttpd.conf | 2 | ||||
| -rw-r--r-- | doc/outdated/expire.txt | 4 | ||||
| -rw-r--r-- | doc/outdated/magnet.txt | 2 | ||||
| -rw-r--r-- | doc/outdated/skeleton.txt | 2 | ||||
| -rw-r--r-- | doc/outdated/ssi.txt | 2 | ||||
| -rw-r--r-- | src/configfile.c | 6 | ||||
| -rw-r--r-- | src/connections.c | 2 | ||||
| -rw-r--r-- | src/http_header.h | 2 | ||||
| -rw-r--r-- | src/http_range.c | 2 | ||||
| -rw-r--r-- | src/mod_webdav.c | 2 | ||||
| -rw-r--r-- | tests/README | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/doc/config/conf.d/expire.conf b/doc/config/conf.d/expire.conf index a2837818..d50944ae 100644 --- a/doc/config/conf.d/expire.conf +++ b/doc/config/conf.d/expire.conf @@ -8,7 +8,7 @@ server.modules += ( "mod_expire" ) ## -## assignes a expiration to all files below the specified path. The +## assigns an expiration to all files below the specified path. The ## specification of the time is made up of: ## ## <access|modification> <number> <years|months|days|hours|minutes|seconds> diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf index c3004bdd..d45a284d 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -24,7 +24,7 @@ var.conf_dir = "/etc/lighttpd" ## ## This requires root permissions during startup. ## -## If you run Chrooted set the the variables to directories relative to +## If you run chroot'ed, set the variables to directories relative to ## the chroot dir. ## ## example chroot configuration: diff --git a/doc/outdated/expire.txt b/doc/outdated/expire.txt index acc84f53..eeafb9eb 100644 --- a/doc/outdated/expire.txt +++ b/doc/outdated/expire.txt @@ -11,7 +11,7 @@ Module: mod_expire :Revision: $Revision: 1.2 $ :abstract: - mod_expire controls the setting of the the Expire Response header + mod_expire controls the setting of the Expires response header .. meta:: :keywords: lighttpd, expire @@ -21,7 +21,7 @@ Module: mod_expire Description =========== -mod_expire controls the Expire header in the Response Header of HTTP/1.0 +mod_expire controls the Expires header in the Response Header of HTTP/1.0 messages. It is useful to set it for static files which should be cached aggressivly like images, stylesheets or similar. diff --git a/doc/outdated/magnet.txt b/doc/outdated/magnet.txt index c7e24c5b..246d88f2 100644 --- a/doc/outdated/magnet.txt +++ b/doc/outdated/magnet.txt @@ -63,7 +63,7 @@ order. If one of them a returning a status-code, the following scripts will not Tables ====== -Most of the interaction between between mod_magnet and lighty is done through tables. Tables in lua are hashes (Perl), dictionaries (Java), arrays (PHP), ... +Most of the interaction between mod_magnet and lighty is done through tables. Tables in lua are hashes (Perl), dictionaries (Java), arrays (PHP), ... Request-Environment ------------------- diff --git a/doc/outdated/skeleton.txt b/doc/outdated/skeleton.txt index b1b01e6e..68c475c0 100644 --- a/doc/outdated/skeleton.txt +++ b/doc/outdated/skeleton.txt @@ -11,7 +11,7 @@ Module: mod_skeleton :Revision: $Revision: 1.2 $ :abstract: - a nice, short abstrace about the module + a nice, short abstract about the module .. meta:: :keywords: lighttpd, skeleton diff --git a/doc/outdated/ssi.txt b/doc/outdated/ssi.txt index f01e309f..ba2d3354 100644 --- a/doc/outdated/ssi.txt +++ b/doc/outdated/ssi.txt @@ -12,7 +12,7 @@ Module: mod_ssi :abstract: The module for server-side includes provides a compatibility - layer for NSCA/Apache SSI. + layer for NCSA/Apache SSI. .. meta:: :keywords: lighttpd, ssi, Server-Side Includes diff --git a/src/configfile.c b/src/configfile.c index 67b45d93..d41158a5 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -2615,7 +2615,7 @@ int config_set_defaults(server *srv) { if (is_lower && buffer_is_equal(tb, s->document_root)) { /* lower-casing and upper-casing didn't result in - * an other filename, no need to stat(), + * another filename, no need to stat(), * just assume it is case-sensitive. */ s->force_lowercase_filenames = 0; @@ -2623,10 +2623,10 @@ int config_set_defaults(server *srv) { /* upper case exists too, doesn't the FS handle this ? */ - /* upper and lower have the same inode -> case-insensitve FS */ + /* upper and lower have the same inode -> case-insensitive FS */ if (st1.st_ino == st2.st_ino) { - /* upper and lower have the same inode -> case-insensitve FS */ + /* upper and lower have the same inode -> case-insensitive FS */ s->force_lowercase_filenames = 1; } diff --git a/src/connections.c b/src/connections.c index 834be9bc..7aa76d61 100644 --- a/src/connections.c +++ b/src/connections.c @@ -877,7 +877,7 @@ static int connection_read_cq(connection *con, chunkqueue *cq, off_t max_bytes) chunkqueue_use_memory(cq, ckpt, len > 0 ? len : 0); if (len != (ssize_t)mem_len) { - /* we got less then expected, wait for the next fd-event */ + /* we got less than expected, wait for the next fd-event */ con->is_readable = 0; return len > 0 ? 0 : 0 == len ? -2 : connection_read_cq_err(con); } diff --git a/src/http_header.h b/src/http_header.h index ffeeeb12..74d9e7f2 100644 --- a/src/http_header.h +++ b/src/http_header.h @@ -22,7 +22,7 @@ * as extending the bitmap greater than 64-bits may make quick bitmasks * check more expensive, and the cost for looking up unmarked headers * (HTTP_HEADER_OTHER) is not substantially more. In the future, this - * list may be revisitied and reviewed, and less frequent headers removed + * list may be revisited and reviewed, and less frequent headers removed * or replaced. */ enum http_header_h2_e { /* pseudo-headers */ diff --git a/src/http_range.c b/src/http_range.c index 719b8b3a..b241a02c 100644 --- a/src/http_range.c +++ b/src/http_range.c @@ -446,7 +446,7 @@ http_range_rfc7233 (request_st * const r) return http_status; #if 0 /*(questionable utility; not deemed worthwhile)*/ - /* (In a modular server, the following RFC recommentation might be + /* (In a modular server, the following RFC recommendation might be * expensive and invasive to implement perfectly, so only making an * effort here to comply with known headers added within this routine * and within the purview of Range requests) diff --git a/src/mod_webdav.c b/src/mod_webdav.c index ff5b0aa7..64aa542b 100644 --- a/src/mod_webdav.c +++ b/src/mod_webdav.c @@ -3829,7 +3829,7 @@ static xmlDoc * webdav_parse_chunkqueue (request_st * const r, const plugin_config * const pconf) { - /* read the chunks in to the XML document */ + /* parse the XML document */ xmlParserCtxtPtr ctxt = xmlCreatePushParserCtxt(NULL, NULL, NULL, 0, NULL); /* XXX: evaluate adding more xmlParserOptions */ xmlCtxtUseOptions(ctxt, XML_PARSE_NOERROR | XML_PARSE_NOWARNING diff --git a/tests/README b/tests/README index 265afea9..78aae864 100644 --- a/tests/README +++ b/tests/README @@ -4,7 +4,7 @@ Running tests $ make check If run from tests/ dir, tests will fail to run tests if lighttpd not built. -If run from top level, 'make' will build lighttpd exectuable if not yet built, +If run from top level, 'make' will build lighttpd executable if not yet built, and then will run tests. |