aboutsummaryrefslogtreecommitdiff
path: root/web/apache
diff options
context:
space:
mode:
Diffstat (limited to 'web/apache')
-rw-r--r--web/apache/service20
-rw-r--r--web/apache/service.cxx8
-rw-r--r--web/apache/service.txx2
3 files changed, 15 insertions, 15 deletions
diff --git a/web/apache/service b/web/apache/service
index c663323..b50bc13 100644
--- a/web/apache/service
+++ b/web/apache/service
@@ -35,10 +35,10 @@ namespace web
// It then initializes each of these "context exemplars" with the (merged)
// set of configuration options. Finally, when handling a request, it
// copies the corresponding "context exemplar" to create the "handling
- // instance". Note that the "context exemplars" are create before the
- // provided exemplar is initialized. As a result, it is possible to detect
- // if the module's copy constructor is used to create a "context exemplar"
- // or a "handling instance".
+ // instance". Note that the "context exemplars" are created as a copy of
+ // the provided exemplar, which is never initialized. As a result, it is
+ // possible to detect if the module's copy constructor is used to create a
+ // "context exemplar" or a "handling instance".
//
class service: ::module
{
@@ -86,7 +86,7 @@ namespace web
// contexts options with the ones from the enclosing servers.
//
// 5. Apache calls worker_initializer() which creates module exemplar
- // for each directory configuration context having
+ // for each directory configuration context that have
// 'SetHandler <mod_name>' directive in effect for it.
//
// References:
@@ -172,13 +172,13 @@ namespace web
enum class request_handling
{
// Configuration scope has 'SetHandler <mod_name>' directive
- // specified. The module allowed to handle a request in the scope.
+ // specified. The module is allowed to handle a request in the scope.
//
allowed,
// Configuration scope has 'SetHandler <other_mod_name>|None'
- // directive specified. The module disallowed to handle a request in
- // the scope.
+ // directive specified. The module is disallowed to handle a request
+ // in the scope.
//
disallowed,
@@ -307,13 +307,13 @@ namespace web
module& exemplar_;
option_descriptions option_descriptions_;
- // The context objects pointed by the key can change during the
+ // The context objects pointed to by the key can change during the
// configuration phase.
//
using options = std::map<context*, name_values>;
options options_;
- // The context objects pointed by the key can not change during the
+ // The context objects pointed to by the key can not change during the
// request handling phase.
//
using exemplars = std::map<const context*, std::unique_ptr<module>>;
diff --git a/web/apache/service.cxx b/web/apache/service.cxx
index 6679194..7104731 100644
--- a/web/apache/service.cxx
+++ b/web/apache/service.cxx
@@ -69,9 +69,9 @@ namespace web
};
}
- // Track if the module allowed to handle a request in the specific
+ // Track if the module is allowed to handle a request in the specific
// configuration scope. The module exemplar will be created (and
- // initialized) only for configuration contexts having
+ // initialized) only for configuration contexts that have
// 'SetHandler <mod_name>' in effect for the corresponding scope.
//
*d++ =
@@ -217,8 +217,8 @@ namespace web
auto i (options_.find (enclosing));
// The enclosing context may have no options. It can be the context of a
- // server having no configuration directives in it's immediate scope,
- // but having ones in it's enclosed scope (directory or virtual server).
+ // server that has no configuration directives in it's immediate scope,
+ // but has ones in it's enclosed scope (directory or virtual server).
//
if (i != options_.end ())
{
diff --git a/web/apache/service.txx b/web/apache/service.txx
index 2e8a3e5..e517abe 100644
--- a/web/apache/service.txx
+++ b/web/apache/service.txx
@@ -25,7 +25,7 @@ namespace web
const M* exemplar (dynamic_cast<const M*> (&exemplar_));
assert (exemplar != nullptr);
- // For each directory configuration context, for which the module
+ // For each directory configuration context, for which the module is
// allowed to handle a request, create the module exemplar as a deep
// copy of the exemplar_ member, and initialize it with the
// context-specific option list.