diff --git a/docs/manual/bind.html b/docs/manual/bind.html
index d5caf449fa..acbe645e3b 100644
--- a/docs/manual/bind.html
+++ b/docs/manual/bind.html
@@ -12,7 +12,7 @@
ALINK="#FF0000"
>
-Setting which addresses and ports Apache uses
+Setting which addresses and ports Apache uses
@@ -36,7 +36,7 @@ and ports Apache listens to.
to more than one address and/or port.
-
+
Port directive. Only one BindAddress
should be used.
-
+
-How this works with Virtual Hosts
+How this works with Virtual Hosts
BindAddress and Listen do not implement Virtual Hosts. They tell the
main server what addresses and ports to listen to. If no
@@ -116,7 +116,7 @@ and port to set the behavior of this virtual host. Note that if the
<VirtualHost> is set for an address and port that the server is
not listening to, it cannot be accessed.
-See also
+See also
See also the documentation on
Virtual Hosts,
diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en
index d5caf449fa..acbe645e3b 100644
--- a/docs/manual/bind.html.en
+++ b/docs/manual/bind.html.en
@@ -12,7 +12,7 @@
ALINK="#FF0000"
>
-Setting which addresses and ports Apache uses
+Setting which addresses and ports Apache uses
@@ -36,7 +36,7 @@ and ports Apache listens to.
to more than one address and/or port.
-
+
Port directive. Only one BindAddress
should be used.
-
+
-How this works with Virtual Hosts
+How this works with Virtual Hosts
BindAddress and Listen do not implement Virtual Hosts. They tell the
main server what addresses and ports to listen to. If no
@@ -116,7 +116,7 @@ and port to set the behavior of this virtual host. Note that if the
<VirtualHost> is set for an address and port that the server is
not listening to, it cannot be accessed.
-See also
+See also
See also the documentation on
Virtual Hosts,
diff --git a/docs/manual/cgi_path.html b/docs/manual/cgi_path.html
index ed95efcd42..569ddbb343 100644
--- a/docs/manual/cgi_path.html
+++ b/docs/manual/cgi_path.html
@@ -12,11 +12,11 @@
ALINK="#FF0000"
>
-PATH_INFO Changes in the CGI Environment
+PATH_INFO Changes in the CGI Environment
-
+
As implemented in Apache 1.1.1 and earlier versions, the method
Apache used to create PATH_INFO in the CGI environment was
@@ -27,7 +27,7 @@ applications, the Apache 1.2 behavior is still compatible with the
CGI/1.1 specification, and CGI scripts can be easily modified (see below).
-
+
Apache 1.1.1 and earlier implemented the PATH_INFO and SCRIPT_NAME
environment variables by looking at the filename, not the URL. While
@@ -46,7 +46,7 @@ SCRIPT_NAME to "/cgi-". Obviously, the latter is
incorrect. In certain cases, this could even cause the server to
crash.
-
+
Apache 1.2 and later now determine SCRIPT_NAME and PATH_INFO by
looking directly at the URL, and determining how much of the URL is
@@ -67,7 +67,7 @@ sort of information is not a recommended method, and a script making
use of it "deserves" not to work. Apache 1.2b3 and later, however, do
provide a workaround.
-
+
It may be necessary for a script that was designed for earlier
versions of Apache or other servers to need the information that the
diff --git a/docs/manual/cgi_path.html.en b/docs/manual/cgi_path.html.en
index ed95efcd42..569ddbb343 100644
--- a/docs/manual/cgi_path.html.en
+++ b/docs/manual/cgi_path.html.en
@@ -12,11 +12,11 @@
ALINK="#FF0000"
>
-
PATH_INFO Changes in the CGI Environment
+PATH_INFO Changes in the CGI Environment
-
+
As implemented in Apache 1.1.1 and earlier versions, the method
Apache used to create PATH_INFO in the CGI environment was
@@ -27,7 +27,7 @@ applications, the Apache 1.2 behavior is still compatible with the
CGI/1.1 specification, and CGI scripts can be easily modified (see below).
-
+
Apache 1.1.1 and earlier implemented the PATH_INFO and SCRIPT_NAME
environment variables by looking at the filename, not the URL. While
@@ -46,7 +46,7 @@ SCRIPT_NAME to "/cgi-". Obviously, the latter is
incorrect. In certain cases, this could even cause the server to
crash.
-
+
Apache 1.2 and later now determine SCRIPT_NAME and PATH_INFO by
looking directly at the URL, and determining how much of the URL is
@@ -67,7 +67,7 @@ sort of information is not a recommended method, and a script making
use of it "deserves" not to work. Apache 1.2b3 and later, however, do
provide a workaround.
-
+
It may be necessary for a script that was designed for earlier
versions of Apache or other servers to need the information that the
diff --git a/docs/manual/content-negotiation.html b/docs/manual/content-negotiation.html
index 2a0abb5ccd..98e0190677 100644
--- a/docs/manual/content-negotiation.html
+++ b/docs/manual/content-negotiation.html
@@ -13,7 +13,7 @@
ALINK="#FF0000"
>
-
Content Negotiation
+Content Negotiation
Apache's support for content negotiation has been updated to meet the
@@ -29,7 +29,7 @@ which is compiled in by default.
-About Content Negotiation
+About Content Negotiation
A resource may be available in several different representations. For
@@ -77,7 +77,7 @@ available in several formats, these are called representations
or variants. The ways in which the variants for a particular
resource vary are called the dimensions of negotiation.
-
Negotiation in Apache
+Negotiation in Apache
In order to negotiate a resource, the server needs to be given
@@ -91,7 +91,7 @@ ways:
filename pattern match, and chooses from among the results.
-
Using a type-map file
+Using a type-map file
A type map is a document which is associated with the handler
@@ -182,7 +182,7 @@ The full list of headers recognized is:
thresholds without checking the actual file.
-
Multiviews
+Multiviews
This is a per-directory option, meaning it can be set with an
@@ -229,7 +229,7 @@ rating, and generally invoked; otherwise it is given an extremely low
quality rating, which generally causes one of the other views (if any)
to be retrieved.
-
The Negotiation Algorithm
+The Negotiation Algorithm
After Apache has obtained a list of the variants for a given resource,
either from a type-map file or from the filenames in the directory, it
@@ -244,7 +244,7 @@ In some circumstances, Apache can 'fiddle' the quality factor of a
particular dimension to achieve a better result. The ways Apache can
fiddle quality factors is explained in more detail below.
-Dimensions of Negotiation
+Dimensions of Negotiation
| Dimension
@@ -265,7 +265,7 @@ or more languages.
can indicate a charset as a parameter of the media type.
|
|---|
-Apache Negotiation Algorithm
+Apache Negotiation Algorithm
Apache uses an algorithm to select the 'best' variant (if any) to
@@ -330,7 +330,7 @@ and go to stage 3.
-
+
Apache sometimes changes the quality values from what would be
@@ -343,7 +343,7 @@ sends full and correct information these fiddles will not
be applied.
-
Media Types and Wildcards
+Media Types and Wildcards
The Accept: request header indicates preferences for media types. It
@@ -386,7 +386,7 @@ behavior. It also sets the q value of wildcards of the format
these special values are not applied, so requests from browsers
which send the correct information to start with work as expected.
-
Variants with no Language
+Variants with no Language
If some of the variants for a particular resource have a language
@@ -413,7 +413,7 @@ header includes either en or fr (or both) one of foo.en.html
or foo.fr.html will be returned. If the browser does not list
either en or fr as acceptable, foo.html will be returned instead.
-
Note on hyperlinks and naming conventions
+Note on hyperlinks and naming conventions
If you are using language negotiation you can choose between
@@ -500,7 +500,7 @@ if there is one) must be on the right hand side of the mime-type extension
(e.g. foo.html.en).
-
Note on Caching
+Note on Caching
When a cache stores a document, it associates it with the request URL.
diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index 2a0abb5ccd..98e0190677 100644
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -13,7 +13,7 @@
ALINK="#FF0000"
>
-
Content Negotiation
+Content Negotiation
Apache's support for content negotiation has been updated to meet the
@@ -29,7 +29,7 @@ which is compiled in by default.
-About Content Negotiation
+About Content Negotiation
A resource may be available in several different representations. For
@@ -77,7 +77,7 @@ available in several formats, these are called representations
or variants. The ways in which the variants for a particular
resource vary are called the dimensions of negotiation.
-
Negotiation in Apache
+Negotiation in Apache
In order to negotiate a resource, the server needs to be given
@@ -91,7 +91,7 @@ ways:
filename pattern match, and chooses from among the results.
-
Using a type-map file
+Using a type-map file
A type map is a document which is associated with the handler
@@ -182,7 +182,7 @@ The full list of headers recognized is:
thresholds without checking the actual file.
-
Multiviews
+Multiviews
This is a per-directory option, meaning it can be set with an
@@ -229,7 +229,7 @@ rating, and generally invoked; otherwise it is given an extremely low
quality rating, which generally causes one of the other views (if any)
to be retrieved.
-
The Negotiation Algorithm
+The Negotiation Algorithm
After Apache has obtained a list of the variants for a given resource,
either from a type-map file or from the filenames in the directory, it
@@ -244,7 +244,7 @@ In some circumstances, Apache can 'fiddle' the quality factor of a
particular dimension to achieve a better result. The ways Apache can
fiddle quality factors is explained in more detail below.
-Dimensions of Negotiation
+Dimensions of Negotiation
| Dimension
@@ -265,7 +265,7 @@ or more languages.
can indicate a charset as a parameter of the media type.
|
|---|
-Apache Negotiation Algorithm
+Apache Negotiation Algorithm
Apache uses an algorithm to select the 'best' variant (if any) to
@@ -330,7 +330,7 @@ and go to stage 3.
-
+
Apache sometimes changes the quality values from what would be
@@ -343,7 +343,7 @@ sends full and correct information these fiddles will not
be applied.
-
Media Types and Wildcards
+Media Types and Wildcards
The Accept: request header indicates preferences for media types. It
@@ -386,7 +386,7 @@ behavior. It also sets the q value of wildcards of the format
these special values are not applied, so requests from browsers
which send the correct information to start with work as expected.
-
Variants with no Language
+Variants with no Language
If some of the variants for a particular resource have a language
@@ -413,7 +413,7 @@ header includes either en or fr (or both) one of foo.en.html
or foo.fr.html will be returned. If the browser does not list
either en or fr as acceptable, foo.html will be returned instead.
-
Note on hyperlinks and naming conventions
+Note on hyperlinks and naming conventions
If you are using language negotiation you can choose between
@@ -500,7 +500,7 @@ if there is one) must be on the right hand side of the mime-type extension
(e.g. foo.html.en).
-
Note on Caching
+Note on Caching
When a cache stores a document, it associates it with the request URL.
diff --git a/docs/manual/custom-error.html b/docs/manual/custom-error.html
index 802bd5cbe3..5e2a3a9475 100644
--- a/docs/manual/custom-error.html
+++ b/docs/manual/custom-error.html
@@ -114,7 +114,7 @@ ErrorDocument 401 /Subscription/how_to_subscribe.html
-
Custom error responses and redirects
+Custom error responses and redirects
diff --git a/docs/manual/custom-error.html.en b/docs/manual/custom-error.html.en
index 802bd5cbe3..5e2a3a9475 100644
--- a/docs/manual/custom-error.html.en
+++ b/docs/manual/custom-error.html.en
@@ -114,7 +114,7 @@ ErrorDocument 401 /Subscription/how_to_subscribe.html
-
Custom error responses and redirects
+Custom error responses and redirects
diff --git a/docs/manual/developer/API.html b/docs/manual/developer/API.html
index fdcd8737a3..4b47d48791 100644
--- a/docs/manual/developer/API.html
+++ b/docs/manual/developer/API.html
@@ -11,7 +11,7 @@
ALINK="#FF0000"
>
-Apache API notes
+Apache API notes
These are some notes on the Apache API and the data structures you
have to deal with, etc. They are not yet nearly complete, but
@@ -57,12 +57,12 @@ coming up, and in what order:
-
+
We begin with an overview of the basic concepts behind the
API, and how they are manifested in the code.
-
+
Apache breaks down request handling into a series of steps, more or
less the same way the Netscape server API does (although this API has
@@ -116,7 +116,7 @@ The handlers themselves are functions of one argument (a
request_rec structure. vide infra), which returns an
integer, as above.
-
+
At this point, we need to explain the structure of a module. Our
candidate will be one of the messier ones, the CGI module --- this
@@ -215,14 +215,14 @@ module cgi_module = {
};
-
+
The sole argument to handlers is a request_rec structure.
This structure describes a particular request which has been made to
the server, on behalf of a client. In most cases, each connection to
the client generates only one request_rec structure.
-
+
The request_rec contains pointers to a resource pool
which will be cleared when the server is finished handling the
@@ -329,7 +329,7 @@ struct request_rec {
-
+
Most request_rec structures are built by reading an HTTP
request from a client, and filling in the fields. However, there are
@@ -370,7 +370,7 @@ a few exceptions:
function run_sub_request).
-
+
As discussed above, each handler, when invoked to handle a particular
request_rec, has to return an int to
@@ -389,7 +389,7 @@ the module should put a Location in the request's
headers_out, to indicate where the client should be
redirected to.
-
+
Handlers for most phases do their work by simply setting a few fields
in the request_rec structure (or, in the case of access
@@ -463,7 +463,7 @@ internally redirected should always return OK.
(Invoking internal_redirect from handlers which are
not response handlers will lead to serious confusion).
-
+
Stuff that should be discussed here in detail:
@@ -481,7 +481,7 @@ Stuff that should be discussed here in detail:
to be sent back).
-
+
When a request has internally redirected, there is the question of
what to log. Apache handles this by bundling the entire chain of
@@ -493,7 +493,7 @@ initial request from the client; note that the bytes_sent field will
only be correct in the last request in the chain (the one for which a
response was actually sent).
-
+
One of the problems of writing and designing a server-pool server is
that of preventing leakage, that is, allocating resources (memory,
@@ -544,7 +544,7 @@ We begin here by describing how memory is allocated to pools, and then
discuss how other resources are tracked by the resource pool
machinery.
-Allocation of memory in pools
+Allocation of memory in pools
Memory is allocated to pools by calling the function
palloc, which takes two arguments, one being a pointer to
@@ -583,7 +583,7 @@ sub-pools below, and is used in the directory-indexing code, in order
to avoid excessive storage allocation when listing directories with
thousands of files).
-Allocating initialized memory
+Allocating initialized memory
There are functions which allocate initialized memory, and are
frequently useful. The function pcalloc has the same
@@ -604,7 +604,7 @@ of the strings, as a unit; for instance:
returns a pointer to 8 bytes worth of memory, initialized to
"foo/bar".
-
+
As indicated above, resource pools are also used to track other sorts
of resources besides memory. The most common are open files. The
@@ -638,13 +638,13 @@ systems such as Linux, which react badly if the same
file will eventually be closed regardless, but you should consider it
in cases where your module is opening, or could open, a lot of files).
-Other sorts of resources --- cleanup functions
+Other sorts of resources --- cleanup functions
More text goes here. Describe the the cleanup primitives in terms of
which the file stuff is implemented; also, spawn_process.
-Fine control --- creating and dealing with sub-pools, with a note
-on sub-requests
+Fine control --- creating and dealing with sub-pools, with a note
+on sub-requests
On rare occasions, too-free use of palloc() and the
associated primitives may result in undesirably profligate resource
@@ -686,7 +686,7 @@ cleared. It is only when you are allocating many, many sub-requests
for a single main request that you should seriously consider the
destroy... functions).
-
+
One of the design goals for this server was to maintain external
compatibility with the NCSA 1.3 server --- that is, to read the same
@@ -735,7 +735,7 @@ for handling them. That is solved the same way it is solved wherever
else similar problems come up, by tying those structures to the
per-transaction resource pool.
-
+
Let's look out how all of this plays out in mod_mime.c,
which defines the file typing handler which emulates the NCSA server's
@@ -828,7 +828,7 @@ consists solely of the state of the XBITHACK), and for
those modules, you can just not declare one, and leave the
corresponding structure slot in the module itself NULL.
-
+
Now that we have these structures, we need to be able to figure out
how to fill them. That involves processing the actual
@@ -967,7 +967,7 @@ int find_ct(request_rec *r)
-
+
The basic ideas behind per-server module configuration are basically
the same as those for per-directory configuration; there is a creation
diff --git a/docs/manual/dns-caveats.html b/docs/manual/dns-caveats.html
index 4e9719df3b..530573fc79 100644
--- a/docs/manual/dns-caveats.html
+++ b/docs/manual/dns-caveats.html
@@ -12,7 +12,7 @@
ALINK="#FF0000"
>
-Issues Regarding DNS and Apache
+Issues Regarding DNS and Apache
This page could be summarized with the statement: don't require
Apache to use DNS for any parsing of the configuration files.
@@ -21,7 +21,7 @@ server may be subject to reliability problems (it might not boot), or
denial and theft of service attacks (including users able to steal hits
from other users).
-
A Simple Example
+A Simple Example
Consider this configuration snippet:
@@ -71,7 +71,7 @@ which includes the server name then it will fail to generate a valid URL.
</VirtualHost>
-Denial of Service
+Denial of Service
There are (at least) two forms that denial of service can come in.
If you are running a version of Apache prior to version 1.2 then your
@@ -115,7 +115,7 @@ this happens requires a more in-depth discussion of how Apache matches
up incoming requests with the virtual host that will serve it. A rough
document describing this is available.
-
The "main server" Address
+The "main server" Address
The addition of name-based virtual host
support in Apache 1.1 requires Apache to know the IP address(es) of
@@ -141,7 +141,7 @@ CGIs unless you use mod_env
to control the environment. It's best to consult the man pages or FAQs
for your OS.
-
+
- use IP addresses in
<VirtualHost>
@@ -152,7 +152,7 @@ for your OS.
has no pages to serve
-Appendix: Future Directions
+Appendix: Future Directions
The situation regarding DNS is highly undesirable. For Apache
1.2 we've attempted to make the server at least continue booting
diff --git a/docs/manual/env.html b/docs/manual/env.html
index 6fd778adaa..6235076c4c 100644
--- a/docs/manual/env.html
+++ b/docs/manual/env.html
@@ -13,7 +13,7 @@
ALINK="#FF0000"
>
-
Special Purpose Environment Variables
+Special Purpose Environment Variables
Interoperability problems have led to the introduction of
mechanisms to modify the way Apache behaves when talking to particular
clients. To make these mechanisms as flexible as possible, they
diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index 6fd778adaa..6235076c4c 100644
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -13,7 +13,7 @@
ALINK="#FF0000"
>
-
Special Purpose Environment Variables
+Special Purpose Environment Variables
Interoperability problems have led to the introduction of
mechanisms to modify the way Apache behaves when talking to particular
clients. To make these mechanisms as flexible as possible, they
diff --git a/docs/manual/handler.html b/docs/manual/handler.html
index a87b4d319d..d5995da06b 100644
--- a/docs/manual/handler.html
+++ b/docs/manual/handler.html
@@ -13,9 +13,9 @@
ALINK="#FF0000"
>
-
Apache's Handler Use
+Apache's Handler Use
-What is a Handler
+What is a Handler
A "handler" is an internal Apache representation of the action to be
performed when a file is called. Generally, files have implicit
@@ -61,7 +61,7 @@ handlers in the standard distribution are as follows:
-
Directives
+Directives
- AddHandler
- SetHandler
@@ -69,7 +69,7 @@ handlers in the standard distribution are as follows:
-
+
-
+
-Programmer's Note
+Programmer's Note
In order to implement the handler features, an addition has been
made to the Apache API that you may wish to
diff --git a/docs/manual/handler.html.en b/docs/manual/handler.html.en
index a87b4d319d..d5995da06b 100644
--- a/docs/manual/handler.html.en
+++ b/docs/manual/handler.html.en
@@ -13,9 +13,9 @@
ALINK="#FF0000"
>
-
Apache's Handler Use
+Apache's Handler Use
-What is a Handler
+What is a Handler
A "handler" is an internal Apache representation of the action to be
performed when a file is called. Generally, files have implicit
@@ -61,7 +61,7 @@ handlers in the standard distribution are as follows:
-
Directives
+Directives
- AddHandler
- SetHandler
@@ -69,7 +69,7 @@ handlers in the standard distribution are as follows:
-
+
-
+
-Programmer's Note
+Programmer's Note
In order to implement the handler features, an addition has been
made to the Apache API that you may wish to
diff --git a/docs/manual/install.html b/docs/manual/install.html
index e799ad0bac..33878db24d 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -33,7 +33,7 @@ If you downloaded a binary distribution, skip to Installing Apache. Otherwise read the next section
for how to compile the server.
-
Compiling Apache
+Compiling Apache
Compiling Apache consists of three steps: Firstly select which Apache
modules you want to include into the server. Secondly create a
@@ -115,7 +115,7 @@ HREF="http://www.apache.org/dist/contrib/modules/"><URL:http://www.apache.org
There are instructions on that page for linking these modules into the
core Apache code.
-
+
You will have a binary file called httpd in the
src directory. A binary distribution of Apache will
diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index e799ad0bac..33878db24d 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -33,7 +33,7 @@ If you downloaded a binary distribution, skip to Installing Apache. Otherwise read the next section
for how to compile the server.
-Compiling Apache
+Compiling Apache
Compiling Apache consists of three steps: Firstly select which Apache
modules you want to include into the server. Secondly create a
@@ -115,7 +115,7 @@ HREF="http://www.apache.org/dist/contrib/modules/"><URL:http://www.apache.org
There are instructions on that page for linking these modules into the
core Apache code.
-
+
You will have a binary file called httpd in the
src directory. A binary distribution of Apache will
diff --git a/docs/manual/invoking.html b/docs/manual/invoking.html
index d718c2f89c..1eff24f2d1 100644
--- a/docs/manual/invoking.html
+++ b/docs/manual/invoking.html
@@ -13,9 +13,9 @@
ALINK="#FF0000"
>
-Starting Apache
+Starting Apache
-Invoking Apache
+Invoking Apache
The httpd program is usually run as a daemon which executes
continuously, handling requests. It is possible to invoke Apache by
the Internet daemon inetd each time a connection to the HTTP
@@ -23,7 +23,7 @@ service is made (use the
ServerType directive)
but this is not recommended.
-Command line options
+Command line options
The following options are recognized on the httpd command line:
-d serverroot
@@ -63,7 +63,7 @@ places where the directive is valid. (New in Apache 1.2)
- Print a list of the httpd options, and then exit.
-Configuration files
+Configuration files
The server will read three files for configuration directives. Any directive
may appear in any of these files. The the names of these files are taken
to be relative to the server root; this is set by the
@@ -92,15 +92,15 @@ The server also reads a file containing mime document types; the filename
is set by the TypesConfig directive,
and is conf/mime.types by default.
-Log files
-security warning
+Log files
+security warning
Anyone who can write to the directory where Apache is writing a
log file can almost certainly gain access to the uid that the server is
started as, which is normally root. Do NOT give people write
access to the directory the logs are stored in without being aware of
the consequences; see the security tips
document for details.
-pid file
+pid file
On daemon startup, it saves the process id of the parent httpd process to
the file logs/httpd.pid. This filename can be changed with the
PidFile directive. The process-id is for
@@ -112,13 +112,13 @@ see the Stopping and Restarting page.
If the process dies (or is killed) abnormally, then it will be necessary to
kill the children httpd processes.
-Error log
+Error log
The server will log error messages to a log file, logs/error_log
by default. The filename can be set using the
ErrorLog directive; different error logs can
be set for different virtual hosts.
-Transfer log
+Transfer log
The server will typically log each request to a transfer file,
logs/access_log by default. The filename can be set using a
TransferLog directive; different
diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en
index d718c2f89c..1eff24f2d1 100644
--- a/docs/manual/invoking.html.en
+++ b/docs/manual/invoking.html.en
@@ -13,9 +13,9 @@
ALINK="#FF0000"
>
-Starting Apache
+Starting Apache
-Invoking Apache
+Invoking Apache
The httpd program is usually run as a daemon which executes
continuously, handling requests. It is possible to invoke Apache by
the Internet daemon inetd each time a connection to the HTTP
@@ -23,7 +23,7 @@ service is made (use the
ServerType directive)
but this is not recommended.
-Command line options
+Command line options
The following options are recognized on the httpd command line:
-d serverroot
@@ -63,7 +63,7 @@ places where the directive is valid. (New in Apache 1.2)
- Print a list of the httpd options, and then exit.
-Configuration files
+Configuration files
The server will read three files for configuration directives. Any directive
may appear in any of these files. The the names of these files are taken
to be relative to the server root; this is set by the
@@ -92,15 +92,15 @@ The server also reads a file containing mime document types; the filename
is set by the TypesConfig directive,
and is conf/mime.types by default.
-Log files
-security warning
+Log files
+security warning
Anyone who can write to the directory where Apache is writing a
log file can almost certainly gain access to the uid that the server is
started as, which is normally root. Do NOT give people write
access to the directory the logs are stored in without being aware of
the consequences; see the security tips
document for details.
-pid file
+pid file
On daemon startup, it saves the process id of the parent httpd process to
the file logs/httpd.pid. This filename can be changed with the
PidFile directive. The process-id is for
@@ -112,13 +112,13 @@ see the Stopping and Restarting page.
If the process dies (or is killed) abnormally, then it will be necessary to
kill the children httpd processes.
-Error log
+Error log
The server will log error messages to a log file, logs/error_log
by default. The filename can be set using the
ErrorLog directive; different error logs can
be set for different virtual hosts.
-Transfer log
+Transfer log
The server will typically log each request to a transfer file,
logs/access_log by default. The filename can be set using a
TransferLog directive; different
diff --git a/docs/manual/location.html b/docs/manual/location.html
index e8063f12fe..85552c9cfe 100644
--- a/docs/manual/location.html
+++ b/docs/manual/location.html
@@ -15,7 +15,7 @@
Access Control by URL
-
+
-Apache API notes
+Apache API notes
These are some notes on the Apache API and the data structures you
have to deal with, etc. They are not yet nearly complete, but
@@ -57,12 +57,12 @@ coming up, and in what order:
-
+
We begin with an overview of the basic concepts behind the
API, and how they are manifested in the code.
-
+
Apache breaks down request handling into a series of steps, more or
less the same way the Netscape server API does (although this API has
@@ -116,7 +116,7 @@ The handlers themselves are functions of one argument (a
request_rec structure. vide infra), which returns an
integer, as above.
-
+
At this point, we need to explain the structure of a module. Our
candidate will be one of the messier ones, the CGI module --- this
@@ -215,14 +215,14 @@ module cgi_module = {
};
-
+
The sole argument to handlers is a request_rec structure.
This structure describes a particular request which has been made to
the server, on behalf of a client. In most cases, each connection to
the client generates only one request_rec structure.
-
+
The request_rec contains pointers to a resource pool
which will be cleared when the server is finished handling the
@@ -329,7 +329,7 @@ struct request_rec {
-
+
Most request_rec structures are built by reading an HTTP
request from a client, and filling in the fields. However, there are
@@ -370,7 +370,7 @@ a few exceptions:
function run_sub_request).
-
+
As discussed above, each handler, when invoked to handle a particular
request_rec, has to return an int to
@@ -389,7 +389,7 @@ the module should put a Location in the request's
headers_out, to indicate where the client should be
redirected to.
-
+
Handlers for most phases do their work by simply setting a few fields
in the request_rec structure (or, in the case of access
@@ -463,7 +463,7 @@ internally redirected should always return OK.
(Invoking internal_redirect from handlers which are
not response handlers will lead to serious confusion).
-
+
Stuff that should be discussed here in detail:
@@ -481,7 +481,7 @@ Stuff that should be discussed here in detail:
to be sent back).
-
+
When a request has internally redirected, there is the question of
what to log. Apache handles this by bundling the entire chain of
@@ -493,7 +493,7 @@ initial request from the client; note that the bytes_sent field will
only be correct in the last request in the chain (the one for which a
response was actually sent).
-
+
One of the problems of writing and designing a server-pool server is
that of preventing leakage, that is, allocating resources (memory,
@@ -544,7 +544,7 @@ We begin here by describing how memory is allocated to pools, and then
discuss how other resources are tracked by the resource pool
machinery.
-Allocation of memory in pools
+Allocation of memory in pools
Memory is allocated to pools by calling the function
palloc, which takes two arguments, one being a pointer to
@@ -583,7 +583,7 @@ sub-pools below, and is used in the directory-indexing code, in order
to avoid excessive storage allocation when listing directories with
thousands of files).
-Allocating initialized memory
+Allocating initialized memory
There are functions which allocate initialized memory, and are
frequently useful. The function pcalloc has the same
@@ -604,7 +604,7 @@ of the strings, as a unit; for instance:
returns a pointer to 8 bytes worth of memory, initialized to
"foo/bar".
-
+
As indicated above, resource pools are also used to track other sorts
of resources besides memory. The most common are open files. The
@@ -638,13 +638,13 @@ systems such as Linux, which react badly if the same
file will eventually be closed regardless, but you should consider it
in cases where your module is opening, or could open, a lot of files).
-Other sorts of resources --- cleanup functions
+Other sorts of resources --- cleanup functions
More text goes here. Describe the the cleanup primitives in terms of
which the file stuff is implemented; also, spawn_process.
-Fine control --- creating and dealing with sub-pools, with a note
-on sub-requests
+Fine control --- creating and dealing with sub-pools, with a note
+on sub-requests
On rare occasions, too-free use of palloc() and the
associated primitives may result in undesirably profligate resource
@@ -686,7 +686,7 @@ cleared. It is only when you are allocating many, many sub-requests
for a single main request that you should seriously consider the
destroy... functions).
-
+
One of the design goals for this server was to maintain external
compatibility with the NCSA 1.3 server --- that is, to read the same
@@ -735,7 +735,7 @@ for handling them. That is solved the same way it is solved wherever
else similar problems come up, by tying those structures to the
per-transaction resource pool.
-
+
Let's look out how all of this plays out in mod_mime.c,
which defines the file typing handler which emulates the NCSA server's
@@ -828,7 +828,7 @@ consists solely of the state of the XBITHACK), and for
those modules, you can just not declare one, and leave the
corresponding structure slot in the module itself NULL.
-
+
Now that we have these structures, we need to be able to figure out
how to fill them. That involves processing the actual
@@ -967,7 +967,7 @@ int find_ct(request_rec *r)
-
+
The basic ideas behind per-server module configuration are basically
the same as those for per-directory configuration; there is a creation
diff --git a/docs/manual/misc/client_block_api.html b/docs/manual/misc/client_block_api.html
index 4f65341af6..8f89d1ad6e 100644
--- a/docs/manual/misc/client_block_api.html
+++ b/docs/manual/misc/client_block_api.html
@@ -30,7 +30,7 @@ accomplished while remaining backwards-compatible.
-The New API Functions
+The New API Functions
int setup_client_block (request_rec *, int read_policy);
diff --git a/docs/manual/misc/custom_errordocs.html b/docs/manual/misc/custom_errordocs.html
index dfc669dd4f..93b144c32d 100644
--- a/docs/manual/misc/custom_errordocs.html
+++ b/docs/manual/misc/custom_errordocs.html
@@ -1,8 +1,8 @@
-
-
-International Customized Server Error Messages
-
+
+
+International Customized Server Error Messages
+
The AddHandler and
AddType directives are useful
for automatically XSSI-expanding all files with a .shtml
- suffix to text/html.
+ suffix to text/html.
By using the Alias directive,
we keep the error document directory outside of the document tree
because it can be regarded more as a server part than part of
@@ -119,7 +119,7 @@ of as much server support as we can get:
Note that we only define the basename of the document here
because the MultiViews option will select the best candidate
based on the language suffixes and the client's preferences.
- Any error situation with an error code not handled by a
+ Any error situation with an error code not handled by a
custom document will be dealt with by the server in the standard way
(i.e., a plain error message in english).
Finally, the AllowOverride
@@ -128,12 +128,12 @@ of as much server support as we can get:
optimization.
The resulting httpd.conf configuration would the look
-similar to this: (Note that you can defrine your own error
+similar to this: (Note that you can defrine your own error
messages using this method for only part of the document tree,
e.g., a /~user/ subtree. In this case, the configuration could as well
be put into the .htaccess file at the root of the subtree. In this case,
the <Directory> and </Directory> directives -but not
-the contained directives- must be omitted.)
+the contained directives- must be omitted.)
LanguagePriority en fr de
Alias /errordocs /usr/local/apache/errordocs
@@ -176,9 +176,9 @@ the configured error documents):
would be bypassed.
For each language for which we have a translation (note that this need not
be the same set of languages for each error code - you can get by
- with a single language version until you actually have
+ with a single language version until you actually have
translated versions), a document
- errordocs/403.shtml.lang is created and
+ errordocs/403.shtml.lang is created and
filled with the error text in that language (see
below).
One fallback document called errordocs/403.shtml is
@@ -214,9 +214,9 @@ because it contains server-parsed content but no language specific
information. The footer file exists once for each language translation,
plus a symlink for the default language.
Example: for english, french and german versions (default english)
-foot.shtml.en,
-foot.shtml.fr,
-foot.shtml.de,
+foot.shtml.en,
+foot.shtml.fr,
+foot.shtml.de,
foot.shtml symlink to foot.shtml.en
Both files are then simply included into the error document by using the
directives <!--#include virtual="head" -->
@@ -377,13 +377,13 @@ for browser types which support animated GIFs).
More welcome!
-If you have tips to contribute, send mail to Martin.Kraemer@Mch.SNI.De
+If you have tips to contribute, send mail to Martin.Kraemer@Mch.SNI.De
-
+