From: Ken Coar Date: Sun, 6 Jul 1997 17:19:19 +0000 (+0000) Subject: More HTML cleanups, retrofit of intentional tag to a no-op X-Git-Tag: APACHE_1_3a1~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87226ebeb806ec2a617bcb4cad5a8132f61d4288;p=thirdparty%2Fapache%2Fhttpd.git More HTML cleanups, retrofit of intentional tag to a no-op (thanks, Marc). Lots of trailing blanks removed throughout. Small addition to the new_features_1_3 page. Plenty of cleanup still to come.. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@78545 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/content-negotiation.html b/docs/manual/content-negotiation.html index 2aa06eb32fb..dee5e6f30a9 100644 --- a/docs/manual/content-negotiation.html +++ b/docs/manual/content-negotiation.html @@ -22,7 +22,7 @@ languages, character set and encoding. It is also implements a couple of features to give more intelligent handling of requests from browsers which send incomplete negotiation information.

-Content negotiation is provided by the +Content negotiation is provided by the mod_negotiation module, which is compiled in by default. @@ -47,7 +47,7 @@ French representations, the browser would send Note that this preference will only be applied when there is a choice -of representations and they vary by language. +of representations and they vary by language.

As an example of a more complex request, this browser has been @@ -78,12 +78,12 @@ resource vary are called the dimensions of negotiation. In order to negotiate a resource, the server needs to be given information about each of the variants. This is done in one of two -ways: +ways:

  • Using a type map (i.e., a *.var file) which names the files containing the variants explicitly -
  • Or using a 'MultiViews' search, where the server does an implicit +
  • Or using a 'MultiViews' search, where the server does an implicit filename pattern match, and chooses from among the results.
@@ -154,7 +154,7 @@ The full list of headers recognized is: interpreted as URLs relative to the map file; they must be on the same server (!), and they must refer to files to which the client would be granted access if they were to be requested - directly. + directly.
Content-type:
media type --- charset, level and "qs" parameters may be given. These are often referred to as MIME types; typical media types are @@ -244,7 +244,7 @@ fiddle quality factors is explained in more detail below. Dimension Notes Media Type -Browser indicates preferences on Accept: header. Each item +Browser indicates preferences on Accept: header. Each item can have an associated quality factor. Variant description can also have a quality factor. Language @@ -292,7 +292,7 @@ remains, move onto the next test. else the order of languages on the Accept-Language header.
  • Select the variants with the highest 'level' media parameter - (used to give the version of text/html media types). + (used to give the version of text/html media types).
  • Select only unencoded variants, if there is a mix of encoded and non-encoded variants. If either all variants are encoded @@ -366,7 +366,7 @@ as: The explicit types have no quality factor, so they default to a preference of 1.0 (the highest). The wildcard */* is given a low preference of 0.01, so other types will only be returned if -no variant matches an explicitly listed type. +no variant matches an explicitly listed type.

    If the Accept: header contains no q factors at all, Apache sets @@ -386,7 +386,7 @@ are given a very low language quality factor of 0.001.

    The reason for setting this language quality factor for variant with no language to a very low value is to allow for a default variant which can be supplied if none of the -other variants match the browser's language preferences. +other variants match the browser's language preferences. For example, consider the situation with three variants: @@ -409,9 +409,9 @@ The next time that URL is requested, the cache can use the stored document, provided it is still within date. But if the resource is subject to content negotiation at the server, this would result in only the first requested variant being cached, and subsequent cache -hits could return the wrong response. To prevent this, +hits could return the wrong response. To prevent this, Apache normally marks all responses that are returned after content negotiation -as non-cacheable by HTTP/1.0 clients. Apache also supports the HTTP/1.1 +as non-cacheable by HTTP/1.0 clients. Apache also supports the HTTP/1.1 protocol features to allow caching of negotiated responses.

    For requests which come from a HTTP/1.0 compliant client (either a diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en index 2aa06eb32fb..dee5e6f30a9 100644 --- a/docs/manual/content-negotiation.html.en +++ b/docs/manual/content-negotiation.html.en @@ -22,7 +22,7 @@ languages, character set and encoding. It is also implements a couple of features to give more intelligent handling of requests from browsers which send incomplete negotiation information.

    -Content negotiation is provided by the +Content negotiation is provided by the mod_negotiation module, which is compiled in by default. @@ -47,7 +47,7 @@ French representations, the browser would send Note that this preference will only be applied when there is a choice -of representations and they vary by language. +of representations and they vary by language.

    As an example of a more complex request, this browser has been @@ -78,12 +78,12 @@ resource vary are called the dimensions of negotiation. In order to negotiate a resource, the server needs to be given information about each of the variants. This is done in one of two -ways: +ways:

    • Using a type map (i.e., a *.var file) which names the files containing the variants explicitly -
    • Or using a 'MultiViews' search, where the server does an implicit +
    • Or using a 'MultiViews' search, where the server does an implicit filename pattern match, and chooses from among the results.
    @@ -154,7 +154,7 @@ The full list of headers recognized is: interpreted as URLs relative to the map file; they must be on the same server (!), and they must refer to files to which the client would be granted access if they were to be requested - directly. + directly.
    Content-type:
    media type --- charset, level and "qs" parameters may be given. These are often referred to as MIME types; typical media types are @@ -244,7 +244,7 @@ fiddle quality factors is explained in more detail below. Dimension Notes Media Type -Browser indicates preferences on Accept: header. Each item +Browser indicates preferences on Accept: header. Each item can have an associated quality factor. Variant description can also have a quality factor. Language @@ -292,7 +292,7 @@ remains, move onto the next test. else the order of languages on the Accept-Language header.
  • Select the variants with the highest 'level' media parameter - (used to give the version of text/html media types). + (used to give the version of text/html media types).
  • Select only unencoded variants, if there is a mix of encoded and non-encoded variants. If either all variants are encoded @@ -366,7 +366,7 @@ as: The explicit types have no quality factor, so they default to a preference of 1.0 (the highest). The wildcard */* is given a low preference of 0.01, so other types will only be returned if -no variant matches an explicitly listed type. +no variant matches an explicitly listed type.

    If the Accept: header contains no q factors at all, Apache sets @@ -386,7 +386,7 @@ are given a very low language quality factor of 0.001.

    The reason for setting this language quality factor for variant with no language to a very low value is to allow for a default variant which can be supplied if none of the -other variants match the browser's language preferences. +other variants match the browser's language preferences. For example, consider the situation with three variants: @@ -409,9 +409,9 @@ The next time that URL is requested, the cache can use the stored document, provided it is still within date. But if the resource is subject to content negotiation at the server, this would result in only the first requested variant being cached, and subsequent cache -hits could return the wrong response. To prevent this, +hits could return the wrong response. To prevent this, Apache normally marks all responses that are returned after content negotiation -as non-cacheable by HTTP/1.0 clients. Apache also supports the HTTP/1.1 +as non-cacheable by HTTP/1.0 clients. Apache also supports the HTTP/1.1 protocol features to allow caching of negotiated responses.

    For requests which come from a HTTP/1.0 compliant client (either a diff --git a/docs/manual/custom-error.html b/docs/manual/custom-error.html index 3165ec044e6..cdd4ac9b548 100644 --- a/docs/manual/custom-error.html +++ b/docs/manual/custom-error.html @@ -29,13 +29,12 @@ response, then this response can be replaced with either some friendlier text or by a redirection to another URL (local or external). -

    - +

    Old behavior -
    NCSA httpd 1.3 would return some boring old error/problem message - which would often be meaningless to the user, and would provide no +
    NCSA httpd 1.3 would return some boring old error/problem message + which would often be meaningless to the user, and would provide no means of logging the symptoms which caused it.

    @@ -69,7 +68,7 @@ REDIRECT_SERVER_SOFTWARE=Apache/0.8.15
    REDIRECT_URL=/cgi-bin/buggy.pl
    -

    note the REDIRECT_ prefix. +

    note the REDIRECT_ prefix.

    At least REDIRECT_URL and REDIRECT_QUERY_STRING will be passed to the new URL (assuming it's a cgi-script or a cgi-include). The @@ -94,16 +93,16 @@ ErrorDocument 404 /Lame_excuses/not_found.html
    ErrorDocument 401 /Subscription/how_to_subscribe.html -

    The syntax is, +

    The syntax is,

    ErrorDocument -<3-digit-code> action +<3-digit-code> action

    where the action can be,

    1. Text to be displayed. Prefix the text with a quote ("). Whatever - follows the quote is displayed. Note: the (") prefix isn't + follows the quote is displayed. Note: the (") prefix isn't displayed.
    2. An external URL to redirect to. diff --git a/docs/manual/custom-error.html.en b/docs/manual/custom-error.html.en index 3165ec044e6..cdd4ac9b548 100644 --- a/docs/manual/custom-error.html.en +++ b/docs/manual/custom-error.html.en @@ -29,13 +29,12 @@ response, then this response can be replaced with either some friendlier text or by a redirection to another URL (local or external). -

      - +

      Old behavior -
      NCSA httpd 1.3 would return some boring old error/problem message - which would often be meaningless to the user, and would provide no +
      NCSA httpd 1.3 would return some boring old error/problem message + which would often be meaningless to the user, and would provide no means of logging the symptoms which caused it.

      @@ -69,7 +68,7 @@ REDIRECT_SERVER_SOFTWARE=Apache/0.8.15
      REDIRECT_URL=/cgi-bin/buggy.pl
      -

      note the REDIRECT_ prefix. +

      note the REDIRECT_ prefix.

      At least REDIRECT_URL and REDIRECT_QUERY_STRING will be passed to the new URL (assuming it's a cgi-script or a cgi-include). The @@ -94,16 +93,16 @@ ErrorDocument 404 /Lame_excuses/not_found.html
      ErrorDocument 401 /Subscription/how_to_subscribe.html -

      The syntax is, +

      The syntax is,

      ErrorDocument -<3-digit-code> action +<3-digit-code> action

      where the action can be,

      1. Text to be displayed. Prefix the text with a quote ("). Whatever - follows the quote is displayed. Note: the (") prefix isn't + follows the quote is displayed. Note: the (") prefix isn't displayed.
      2. An external URL to redirect to. diff --git a/docs/manual/developer/API.html b/docs/manual/developer/API.html index b81c20ec7a7..dba84c18d52 100644 --- a/docs/manual/developer/API.html +++ b/docs/manual/developer/API.html @@ -59,7 +59,7 @@ coming up, and in what order:

        Basic concepts.

        -We begin with an overview of the basic concepts behind the +We begin with an overview of the basic concepts behind the API, and how they are manifested in the code.

        Handlers, Modules, and Requests

        @@ -78,7 +78,7 @@ might be useful in the future). These are:
      3. `Fixups' --- there aren't any of these yet, but the phase is intended as a hook for possible extensions like SetEnv, which don't really fit well elsewhere. -
      4. Actually sending a response back to the client. +
      5. Actually sending a response back to the client.
      6. Logging the request @@ -89,7 +89,7 @@ one of three things:
        • Handle the request, and indicate that it has done so - by returning the magic constant OK. + by returning the magic constant OK.
        • Decline to handle the request, by returning the magic integer constant DECLINED. In this case, the server behaves in all respects as if the handler simply hadn't @@ -160,7 +160,7 @@ sometimes of use to the function which processes a config-file command (such as ScriptAlias). With no further ado, the module itself: - + 
           /* Declarations of handlers. */
 
@@ -273,17 +273,17 @@ struct request_rec {
   server_rec *server;
 
   /* What object is being requested */
-  
+
   char *uri;
   char *filename;
   char *path_info;
   char *args;           /* QUERY_ARGS, if any */
   struct stat finfo;    /* Set by server core;
                          * st_mode set to zero if no such file */
-  
+
   char *content_type;
   char *content_encoding;
-  
+
   /* MIME header environments, in and out.  Also, an array containing
    * environment variables to be passed to subprocesses, so people can
    * write modules to add to that environment.
@@ -293,14 +293,14 @@ struct request_rec {
    * redirects (so the headers printed for ErrorDocument handlers will
    * have them).
    */
-  
+
   table *headers_in;
   table *headers_out;
   table *err_headers_out;
   table *subprocess_env;
 
   /* Info about the request itself... */
-  
+
   int header_only;     /* HEAD request, as opposed to GET */
   char *protocol;      /* Protocol, as given to us, or HTTP/0.9 */
   char *method;        /* GET, HEAD, POST, etc. */
@@ -321,10 +321,10 @@ struct request_rec {
    * These are config vectors, with one void* pointer for each module
    * (the thing pointed to being the module's business).
    */
-  
+
   void *per_dir_config;   /* Options set in config files, etc. */
   void *request_config;   /* Notes on *this* request */
-  
+
 };
          @@ -426,14 +426,14 @@ int default_handler (request_rec *r) { int errstatus; FILE *f; - + if (r->method_number != M_GET) return DECLINED; if (r->finfo.st_mode == 0) return NOT_FOUND; if ((errstatus = set_content_length (r, r->finfo.st_size)) || (errstatus = set_last_modified (r, r->finfo.st_mtime))) return errstatus; - + f = fopen (r->filename, "r"); if (f == NULL) { @@ -441,7 +441,7 @@ int default_handler (request_rec *r) r->filename, r); return FORBIDDEN; } - + register_timeout ("send", r); send_http_header (r); @@ -491,7 +491,7 @@ pointers. The request_rec which is passed to the logging handlers in such cases is the one which was originally built for the 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). +response was actually sent).

          Resource allocation and resource pools

          @@ -641,7 +641,7 @@ in cases where your module is opening, or could open, a lot of files).

          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. +which the file stuff is implemented; also, spawn_process.

          Fine control --- creating and dealing with sub-pools, with a note on sub-requests

          @@ -783,7 +783,7 @@ void *create_mime_dir_config (pool *p, char *dummy) new->forced_types = make_table (p, 4); new->encoding_types = make_table (p, 4); - + return new; } @@ -876,9 +876,9 @@ look like this: 
           command_rec mime_cmds[] = {
-{ "AddType", add_type, NULL, OR_FILEINFO, TAKE2, 
+{ "AddType", add_type, NULL, OR_FILEINFO, TAKE2,
     "a mime type followed by a file extension" },
-{ "AddEncoding", add_encoding, NULL, OR_FILEINFO, TAKE2, 
+{ "AddEncoding", add_encoding, NULL, OR_FILEINFO, TAKE2,
     "an encoding (e.g., gzip), followed by a file extension" },
 { NULL }
 };
@@ -919,7 +919,7 @@ The entries in these tables are:
        should be present.  If the arguments in the actual config file
        are not as required, this string will be used to help give a
        more specific error message.  (You can safely leave this
-       NULL). 
+       NULL).
        Finally, having set this all up, we have to use it. This is @@ -942,7 +942,7 @@ int find_ct(request_rec *r) r->content_type = DIR_MAGIC_TYPE; return OK; } - + if((i=rind(fn,'.')) < 0) return DECLINED; ++i; @@ -961,7 +961,7 @@ int find_ct(request_rec *r) { r->content_type = type; } - + return OK; } @@ -995,7 +995,7 @@ char *add_redirect(cmd_parms *cmd, void *dummy, char *f, char *url) alias_entry *new = push_array (conf->redirects); if (!is_url (url)) return "Redirect to non-URL"; - + new->fake = f; new->real = url; return NULL; } diff --git a/docs/manual/dns-caveats.html b/docs/manual/dns-caveats.html index 50a9bcfe8fe..823631147e6 100644 --- a/docs/manual/dns-caveats.html +++ b/docs/manual/dns-caveats.html @@ -188,7 +188,7 @@ solutions such as disabling portions of the configuration might be worse than not booting at all depending on what the webserver is supposed to accomplish. -

        As HTTP/1.1 is deployed and browsers and proxies start issuing the +

        As HTTP/1.1 is deployed and browsers and proxies start issuing the Host header it will become possible to avoid the use of IP-based virtual hosts entirely. In this event a webserver has no requirement to do DNS lookups during configuration. But as of March 1997 these diff --git a/docs/manual/env.html b/docs/manual/env.html index 9ef4f28ff0d..2a689337756 100644 --- a/docs/manual/env.html +++ b/docs/manual/env.html @@ -17,9 +17,9 @@

        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 -are invoked by defining environment variables, typically with -BrowserMatch, though -SetEnv and +are invoked by defining environment variables, typically with +BrowserMatch, though +SetEnv and PassEnv could also be used, for example.

        diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en index 9ef4f28ff0d..2a689337756 100644 --- a/docs/manual/env.html.en +++ b/docs/manual/env.html.en @@ -17,9 +17,9 @@

        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 -are invoked by defining environment variables, typically with -BrowserMatch, though -SetEnv and +are invoked by defining environment variables, typically with +BrowserMatch, though +SetEnv and PassEnv could also be used, for example.

        diff --git a/docs/manual/install.html b/docs/manual/install.html index 7708168443b..4fd47288f06 100644 --- a/docs/manual/install.html +++ b/docs/manual/install.html @@ -28,7 +28,7 @@ Information on the latest version of Apache can be found on the Apache web server at http://www.apache.org/. This will list the current release, any more recent beta-test release, together -with details of mirror web and anonymous ftp sites. +with details of mirror web and anonymous ftp sites.

        @@ -153,7 +153,7 @@ file to at least set the base cases of access. In addition to these three files, the server behavior can be configured on a directory-by-directory basis by using .htaccess -files in directories accessed by the server. +files in directories accessed by the server.

        Starting and Stopping the Server

        @@ -170,7 +170,7 @@ location with the -f argument. For example: If all goes well this will return to the command prompt almost immediately. This indicates that the server is now up and running. If anything goes wrong during the initialization of the server you will -see an error message on the screen. +see an error message on the screen. If the server started ok, you can now use your browser to connect to the server and read the documentation. If you are running @@ -187,7 +187,7 @@ Note that when the server starts it will create a number of child processes to handle the requests. If you started Apache as the root user, the parent process will continue to run as root while the children will change to the user as given in the httpd.conf -file. +file.

        diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en index 7708168443b..4fd47288f06 100644 --- a/docs/manual/install.html.en +++ b/docs/manual/install.html.en @@ -28,7 +28,7 @@ Information on the latest version of Apache can be found on the Apache web server at http://www.apache.org/. This will list the current release, any more recent beta-test release, together -with details of mirror web and anonymous ftp sites. +with details of mirror web and anonymous ftp sites.

        @@ -153,7 +153,7 @@ file to at least set the base cases of access. In addition to these three files, the server behavior can be configured on a directory-by-directory basis by using .htaccess -files in directories accessed by the server. +files in directories accessed by the server.

        Starting and Stopping the Server

        @@ -170,7 +170,7 @@ location with the -f argument. For example: If all goes well this will return to the command prompt almost immediately. This indicates that the server is now up and running. If anything goes wrong during the initialization of the server you will -see an error message on the screen. +see an error message on the screen. If the server started ok, you can now use your browser to connect to the server and read the documentation. If you are running @@ -187,7 +187,7 @@ Note that when the server starts it will create a number of child processes to handle the requests. If you started Apache as the root user, the parent process will continue to run as root while the children will change to the user as given in the httpd.conf -file. +file.

        diff --git a/docs/manual/invoking.html b/docs/manual/invoking.html index 62e6a41af9a..48e08f782a5 100644 --- a/docs/manual/invoking.html +++ b/docs/manual/invoking.html @@ -18,10 +18,10 @@

        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 -service is made (use the +the Internet daemon inetd each time a connection to the HTTP +service is made (use the ServerType directive) -but this is not recommended. +but this is not recommended.

        Command line options

        The following options are recognized on the httpd command line: diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en index 62e6a41af9a..48e08f782a5 100644 --- a/docs/manual/invoking.html.en +++ b/docs/manual/invoking.html.en @@ -18,10 +18,10 @@

        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 -service is made (use the +the Internet daemon inetd each time a connection to the HTTP +service is made (use the ServerType directive) -but this is not recommended. +but this is not recommended.

        Command line options

        The following options are recognized on the httpd command line: diff --git a/docs/manual/misc/API.html b/docs/manual/misc/API.html index b81c20ec7a7..dba84c18d52 100644 --- a/docs/manual/misc/API.html +++ b/docs/manual/misc/API.html @@ -59,7 +59,7 @@ coming up, and in what order:

        Basic concepts.

        -We begin with an overview of the basic concepts behind the +We begin with an overview of the basic concepts behind the API, and how they are manifested in the code.

        Handlers, Modules, and Requests

        @@ -78,7 +78,7 @@ might be useful in the future). These are:
      7. `Fixups' --- there aren't any of these yet, but the phase is intended as a hook for possible extensions like SetEnv, which don't really fit well elsewhere. -
      8. Actually sending a response back to the client. +
      9. Actually sending a response back to the client.
      10. Logging the request @@ -89,7 +89,7 @@ one of three things:
        • Handle the request, and indicate that it has done so - by returning the magic constant OK. + by returning the magic constant OK.
        • Decline to handle the request, by returning the magic integer constant DECLINED. In this case, the server behaves in all respects as if the handler simply hadn't @@ -160,7 +160,7 @@ sometimes of use to the function which processes a config-file command (such as ScriptAlias). With no further ado, the module itself: - + 
           /* Declarations of handlers. */
 
@@ -273,17 +273,17 @@ struct request_rec {
   server_rec *server;
 
   /* What object is being requested */
-  
+
   char *uri;
   char *filename;
   char *path_info;
   char *args;           /* QUERY_ARGS, if any */
   struct stat finfo;    /* Set by server core;
                          * st_mode set to zero if no such file */
-  
+
   char *content_type;
   char *content_encoding;
-  
+
   /* MIME header environments, in and out.  Also, an array containing
    * environment variables to be passed to subprocesses, so people can
    * write modules to add to that environment.
@@ -293,14 +293,14 @@ struct request_rec {
    * redirects (so the headers printed for ErrorDocument handlers will
    * have them).
    */
-  
+
   table *headers_in;
   table *headers_out;
   table *err_headers_out;
   table *subprocess_env;
 
   /* Info about the request itself... */
-  
+
   int header_only;     /* HEAD request, as opposed to GET */
   char *protocol;      /* Protocol, as given to us, or HTTP/0.9 */
   char *method;        /* GET, HEAD, POST, etc. */
@@ -321,10 +321,10 @@ struct request_rec {
    * These are config vectors, with one void* pointer for each module
    * (the thing pointed to being the module's business).
    */
-  
+
   void *per_dir_config;   /* Options set in config files, etc. */
   void *request_config;   /* Notes on *this* request */
-  
+
 };
          @@ -426,14 +426,14 @@ int default_handler (request_rec *r) { int errstatus; FILE *f; - + if (r->method_number != M_GET) return DECLINED; if (r->finfo.st_mode == 0) return NOT_FOUND; if ((errstatus = set_content_length (r, r->finfo.st_size)) || (errstatus = set_last_modified (r, r->finfo.st_mtime))) return errstatus; - + f = fopen (r->filename, "r"); if (f == NULL) { @@ -441,7 +441,7 @@ int default_handler (request_rec *r) r->filename, r); return FORBIDDEN; } - + register_timeout ("send", r); send_http_header (r); @@ -491,7 +491,7 @@ pointers. The request_rec which is passed to the logging handlers in such cases is the one which was originally built for the 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). +response was actually sent).

          Resource allocation and resource pools

          @@ -641,7 +641,7 @@ in cases where your module is opening, or could open, a lot of files).

          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. +which the file stuff is implemented; also, spawn_process.

          Fine control --- creating and dealing with sub-pools, with a note on sub-requests

          @@ -783,7 +783,7 @@ void *create_mime_dir_config (pool *p, char *dummy) new->forced_types = make_table (p, 4); new->encoding_types = make_table (p, 4); - + return new; } @@ -876,9 +876,9 @@ look like this: 
           command_rec mime_cmds[] = {
-{ "AddType", add_type, NULL, OR_FILEINFO, TAKE2, 
+{ "AddType", add_type, NULL, OR_FILEINFO, TAKE2,
     "a mime type followed by a file extension" },
-{ "AddEncoding", add_encoding, NULL, OR_FILEINFO, TAKE2, 
+{ "AddEncoding", add_encoding, NULL, OR_FILEINFO, TAKE2,
     "an encoding (e.g., gzip), followed by a file extension" },
 { NULL }
 };
@@ -919,7 +919,7 @@ The entries in these tables are:
        should be present.  If the arguments in the actual config file
        are not as required, this string will be used to help give a
        more specific error message.  (You can safely leave this
-       NULL). 
+       NULL).
        Finally, having set this all up, we have to use it. This is @@ -942,7 +942,7 @@ int find_ct(request_rec *r) r->content_type = DIR_MAGIC_TYPE; return OK; } - + if((i=rind(fn,'.')) < 0) return DECLINED; ++i; @@ -961,7 +961,7 @@ int find_ct(request_rec *r) { r->content_type = type; } - + return OK; } @@ -995,7 +995,7 @@ char *add_redirect(cmd_parms *cmd, void *dummy, char *f, char *url) alias_entry *new = push_array (conf->redirects); if (!is_url (url)) return "Redirect to non-URL"; - + new->fake = f; new->real = url; return NULL; } diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html index 070ab0d1ac4..188bc809545 100644 --- a/docs/manual/misc/FAQ.html +++ b/docs/manual/misc/FAQ.html @@ -15,7 +15,7 @@

        Apache Server Frequently Asked Questions

        - $Revision: 1.81 $ ($Date: 1997/07/06 14:54:47 $) + $Revision: 1.82 $ ($Date: 1997/07/06 17:19:04 $)

        The latest version of this FAQ is always available from the main @@ -85,7 +85,7 @@

      11. Why was Apache created?
      12. How does The Apache Group's work relate to - other servers? + other servers?
      13. Why the name "Apache"?
        14. @@ -116,7 +116,7 @@
      14. What does it mean when my CGIs fail with "Premature end of script - headers"? + headers"?
      15. How do I enable SSI (parsed HTML)?
        16. @@ -147,7 +147,7 @@
      16. Why does Apache send a cookie on every response?
        17. -
      17. Why don't my cookies work, I even compiled in +
      18. Why don't my cookies work, I even compiled in mod_cookies?
      19. Why do my Java app[let]s give me plain text @@ -191,7 +191,7 @@
      20. How do I add browsers and referrers to my logs?
        21. -
      21. Why do I get an error about an undefined +
      22. Why do I get an error about an undefined reference to "__inet_ntoa" or other __inet_* symbols?
        23. @@ -257,7 +257,7 @@

        To address the concerns of a group of WWW providers and part-time httpd programmers that httpd didn't behave as they wanted it to behave. - Apache is an entirely volunteer effort, completely funded by its + Apache is an entirely volunteer effort, completely funded by its members, not by commercial sales.

        @@ -291,7 +291,7 @@ For an independent assessment, see Web Compare's + >Web Compare's comparison chart.

        @@ -417,10 +417,10 @@

        Apache tries to be helpful when it encounters a problem. In many cases, it will provide some details by writing one or messages to - the server error log. Sometimes this is enough for you to diagnose + the server error log. Sometimes this is enough for you to diagnose & fix the problem yourself (such as file permissions or the like). - The default location of the error log is - /usr/local/etc/httpd/logs/error_log, but see the + The default location of the error log is + /usr/local/etc/httpd/logs/error_log, but see the ErrorLog @@ -510,7 +510,7 @@ NCSA httpd 1.4 and NCSA httpd 1.5.

        - NCSA httpd appears to be moving toward adding experimental features + NCSA httpd appears to be moving toward adding experimental features which are not generally required at the moment. Some of the experiments will succeed while others will inevitably be dropped. The Apache philosophy is to add what's needed as and when it is needed. @@ -577,7 +577,7 @@

      23. What does it mean when my CGIs fail with "Premature end of script headers"? - +

        It means just what it says: the server was expecting a complete set of HTTP headers (one or more followed by a blank line), and didn't get @@ -594,7 +594,7 @@

        The second most common cause of this (aside from people not outputting the required headers at all) is a result of an interaction - with Perl's output buffering. To make Perl flush its buffers + with Perl's output buffering. To make Perl flush its buffers after each output statement, insert the following statements around the print or write statements that send your HTTP headers: @@ -615,7 +615,7 @@

        - This is generally only necessary when you are calling external + This is generally only necessary when you are calling external programs from your script that send output to stdout, or if there will be a long delay between the time the headers are sent and the actual content starts being emitted. To maximise performance, you should @@ -625,7 +625,7 @@

        If your script isn't written in Perl, do the equivalent thing for - whatever language you are using (e.g., for C, call + whatever language you are using (e.g., for C, call fflush() after writing the headers).

        @@ -637,7 +637,7 @@ SSI (an acronym for Server-Side Include) directives allow static HTML documents to be enhanced at run-time (e.g., when delivered to a client by Apache). The format of SSI directives is covered - in the mod_include manual; + in the mod_include manual; suffice it to say that Apache supports not only SSI but xSSI (eXtended SSI) directives.

        @@ -764,7 +764,7 @@ HREF="../mod/mod_proxy.html" >proxy module. If compiled - in, this will make Apache act as a caching-proxy server. + in, this will make Apache act as a caching-proxy server.

        24. @@ -774,7 +774,7 @@

        "Multiviews" is the general name given to the Apache server's ability to provide language-specific document variants in - response to a request. This is documented quite thoroughly in the + response to a request. This is documented quite thoroughly in the

        - You are probably running into resource limitations in your - operating system. The most common limitation is the - per-process limit on file descriptors, - which is almost always the cause of problems seen when adding - virtual hosts. Apache often does not give an intuitive error - message because it is normally some library routine (such as - gethostbyname()) which needs file descriptors and - doesn't complain intelligibly when it can't get them. + You are probably running into resource limitations in your + operating system. The most common limitation is the + per-process limit on file descriptors, + which is almost always the cause of problems seen when adding + virtual hosts. Apache often does not give an intuitive error + message because it is normally some library routine (such as + gethostbyname()) which needs file descriptors and + doesn't complain intelligibly when it can't get them.

        Each log file requires a file descriptor, which means that if you are using separate access and error logs for each virtual host, each - virtual host needs two file descriptors. Each + virtual host needs two file descriptors. Each Listen - directive also needs a file descriptor. + directive also needs a file descriptor.

        Typical values for <n> that we've seen are in @@ -828,17 +828,17 @@ Listen - directives. If there are no other servers running on the machine + directives. If there are no other servers running on the machine on the same port then you normally don't need any Listen directives at all. By default Apache listens to all addresses on port 80. -

      24. Reduce the number of log files. You can use +
      25. Reduce the number of log files. You can use mod_log_config to log all requests to a single log file while including the name - of the virtual host in the log file. You can then write a + of the virtual host in the log file. You can then write a script to split the logfile into separate files later if necessary.
        26. @@ -877,7 +877,7 @@

        On FreeBSD 2.2 and older FD_SETSIZE, which limits the - number of open + number of open files on the system, is limited to 256. This can restrict the number of virtual hosts you can use; especially if they all use different log files. Increasing this limit (and recompiling Apache) is not enough, @@ -972,7 +972,7 @@

        You need to use it with a URL in the form "/foo/bar" and not one with a method and - hostname such as "http://host/foo/bar". See the + hostname such as "http://host/foo/bar". See the ErrorDocument @@ -1000,7 +1000,7 @@

        Apache does not send automatically send a cookie on every - response, unless you have re-compiled it with the + response, unless you have re-compiled it with the mod_cookies @@ -1009,11 +1009,11 @@ This module may help track users, and uses cookies to do this. If you are not using the data generated by mod_cookies, do not compile it into Apache. Note that in 1.2 this module was renamed - to the more correct name + to the more correct name mod_usertrack, - and cookies + and cookies have to be specifically enabled with the Why am I getting "httpd: could not set socket option TCP_NODELAY" in my error log? - +

        This message almost always indicates that the client disconnected before Apache reached the point of calling setsockopt() @@ -1140,7 +1140,7 @@

      26. Why am I getting "connection reset by peer" in my error log? - +

        This is a normal message and nothing about which to be alarmed. It simply means that the client cancelled the connection before it had been @@ -1222,7 +1222,7 @@

        • Remove the definition of struct iovec from your C - library includes. It is located in /usr/include/sys/uio.h. + library includes. It is located in /usr/include/sys/uio.h. Or,
        • Add -DNO_WRITEV to the EXTRA_CFLAGS @@ -1241,9 +1241,9 @@ In Apache version 1.2, the error log message about dumped core includes the directory where the dump file should be located. However, many Unixes do not allow a process that has - called setuid() to dump core for security reasons; - the typical Apache setup has the server started as root to bind to - port 80, after which it changes UIDs to a non-privileged user to + called setuid() to dump core for security reasons; + the typical Apache setup has the server started as root to bind to + port 80, after which it changes UIDs to a non-privileged user to serve requests.

          @@ -1318,8 +1318,8 @@ encryption technology. If Apache included SSL in the base package, its distribution would involve all sorts of legal and bureaucratic issues, and it would no longer be freely available. Also, some of - the technology required to talk to current clients using SSL is - patented by RSA Data Security, + the technology required to talk to current clients using SSL is + patented by RSA Data Security, who restricts its use without a license.

          @@ -1340,7 +1340,7 @@

        • - Why do I get core dumps under HPUX using HP's ANSI + Why do I get core dumps under HPUX using HP's ANSI C compiler?

          @@ -1417,7 +1417,7 @@ the operating system.

        • Your operating system or compiler may be out of - revision. + revision.
          Software vendors (including those that develop operating systems) issue new releases for a reason; sometimes to add functionality, but @@ -1482,26 +1482,26 @@
        • - Why do I get an error about an undefined reference to + Why do I get an error about an undefined reference to "__inet_ntoa" or other __inet_* symbols?

          If you have installed BIND-8 then this is normally due to a conflict between your include files - and your libraries. BIND-8 installs its include files and libraries + and your libraries. BIND-8 installs its include files and libraries /usr/local/include/ and /usr/local/lib/, while the resolver that comes with your system is probably installed in /usr/include/ and /usr/lib/. If your system uses the header files in /usr/local/include/ before those in /usr/include/ but you do not use the new - resolver library, then the two versions will conflict. + resolver library, then the two versions will conflict.

          To resolve this, you can either make sure you use the include files and libraries that came with your system or make sure to use the new include files and libraries. Adding -lbind to the - EXTRA_LDFLAGS line in your Configuration + EXTRA_LDFLAGS line in your Configuration file, then re-running Configure, should resolve the problem. (Apache versions 1.2.* and earlier use EXTRA_LFLAGS instead.) @@ -1525,35 +1525,35 @@

        • - Why does accessing directories only work when I include + Why does accessing directories only work when I include the trailing "/" (e.g., http://foo.domain.com/~user/) - but not when I omit it + but not when I omit it (e.g., http://foo.domain.com/~user)?

          When you access a directory without a trailing "/", Apache needs to send what is called a redirect to the client to tell it to add the trailing slash. If it did not do so, relative URLs would - not work properly. When it sends the redirect, it needs to know + not work properly. When it sends the redirect, it needs to know the name of the server so that it can include it in the redirect. There are two ways for Apache to find this out; either it can guess, or you can tell it. If your DNS is configured correctly, it can normally guess without any problems. If it is not, however, then - you need to tell it. + you need to tell it.

          - Add a ServerName directive + Add a ServerName directive to the config file to tell it what the domain name of the server is.

        • - How do I set up Apache to require a username and + How do I set up Apache to require a username and password to access certain documents?

          - There are several ways to do this; some of the more popular + There are several ways to do this; some of the more popular ones are to use the mod_auth, mod_auth_db, or mod_auth_dbm modules. @@ -1567,7 +1567,7 @@ Using User Authentication - or + or DBM User Authentication. @@ -1575,7 +1575,7 @@

        • - How do I set up Apache to allow access to certain + How do I set up Apache to allow access to certain documents only if a site is either a local site or the user supplies a password and username? @@ -1747,7 +1747,7 @@ the database, rather than a fast internal device. The libmsql, the mSQL FAQ, and the mod_auth_msql documentation warn you about this. If you have to use different - hosts, check out the mod_auth_msql code for + hosts, check out the mod_auth_msql code for some compile time flags which might - or might not - suit you.

          diff --git a/docs/manual/misc/client_block_api.html b/docs/manual/misc/client_block_api.html index 2458e0ec7fe..ea7896b46ab 100644 --- a/docs/manual/misc/client_block_api.html +++ b/docs/manual/misc/client_block_api.html @@ -69,7 +69,7 @@ accomplished while remaining backwards-compatible.

          100 response is defeated). Never call this function more than once.
        • Finally, call get_client_block in a loop. Pass it a - buffer and its + buffer and its size. It will put data into the buffer (not necessarily the full buffer, in the case of chunked inputs), and return the length of the input block. When it is done reading, it will diff --git a/docs/manual/misc/compat_notes.html b/docs/manual/misc/compat_notes.html index 459997ccd4f..d12ac75f79a 100644 --- a/docs/manual/misc/compat_notes.html +++ b/docs/manual/misc/compat_notes.html @@ -30,7 +30,7 @@ href="http://www.apache.org/bugdb.cgi">let us know.
            -
          1. The basic mod_auth AuthGroupFile-specified group file +
          2. The basic mod_auth AuthGroupFile-specified group file format allows commas between user names - Apache does not.
            - added 12/1/96
            3. @@ -51,7 +51,7 @@ href="http://www.apache.org/bugdb.cgi">let us know.
          3. AuthUserFile requires a full pathname. In earlier versions of NCSA httpd and Apache, you could use a filename relative to the .htaccess file. This could be a major security hole, - as it made it trivially easy to make a ".htpass" file in the a + as it made it trivially easy to make a ".htpass" file in the a directory easily accessible by the world. We recommend you store your passwords outside your document tree. @@ -78,18 +78,32 @@ href="http://www.apache.org/bugdb.cgi">let us know.

            -

          4. Icons for FancyIndexing broken - well, no, they're not broken, we've just upgraded the - icons from flat .xbm files to pretty and much smaller .gif files, courtesy of +
          5. Icons for FancyIndexing broken - well, no, they're not broken, + we've just upgraded the + icons from flat .xbm files to pretty and much smaller .gif files, courtesy of Kevin Hughes at -EIT. - If you are using the same srm.conf from an old distribution, make sure you add the new - AddIcon, AddIconByType, and DefaultIcon commands. +EIT. + If you are using the same srm.conf from an old distribution, make sure + you add the new + AddIcon, + AddIconByType, + and + DefaultIcon + directives.

            -

          6. Under IRIX, the "Group" directive in httpd.conf needs to be a valid group name - (i.e. "nogroup") not the numeric group ID. The distribution httpd.conf, and earlier - ones, had the default Group be "#-1", which was causing silent exits at startup.

            +

          7. Under IRIX, the "Group" directive in httpd.conf needs to be a + valid group name + (i.e., "nogroup") not the numeric group ID. The distribution + httpd.conf, and earlier ones, had the default Group be "#-1", which + was causing silent exits at startup.

          8. .asis files: Apache 0.6.5 did not require a Status header; it added one automatically if the .asis file contained a Location header. @@ -103,7 +117,7 @@ it added one automatically if the .asis file contained a Location header.
          9. Apache does not permit commas delimiting the methods in <Limit>. - +
          More to come when we notice them.... diff --git a/docs/manual/misc/descriptors.html b/docs/manual/misc/descriptors.html index e5c97f3d21b..ba1247db241 100644 --- a/docs/manual/misc/descriptors.html +++ b/docs/manual/misc/descriptors.html @@ -15,7 +15,7 @@

          Descriptors and Apache

          -

          A descriptor, also commonly called a file handle is +

          A descriptor, also commonly called a file handle is an object that a program uses to read or write an open file, or open network socket, or a variety of other devices. It is represented by an integer, and you may be familiar with stdin, @@ -32,12 +32,12 @@ descriptors (i.e. with many virtual hosts). that a program can have open at a time. There are typically three limits involved here. One is a kernel limitation, depending on your operating system you will either be able to tune the number of descriptors available -to higher numbers (this is frequently called FD_SETSIZE). Or you +to higher numbers (this is frequently called FD_SETSIZE). Or you may be stuck with a (relatively) low amount. The second limit is called -the hard resource limit, and it is sometimes set by root in an +the hard resource limit, and it is sometimes set by root in an obscure operating system file, but frequently is the same as the kernel -limit. The third limit is called the soft -resource limit. The soft limit is always less than or equal to +limit. The third limit is called the soft +resource limit. The soft limit is always less than or equal to the hard limit. For example, the hard limit may be 1024, but the soft limit only 64. Any user can raise their soft limit up to the hard limit. Root can raise the hard limit up to the system maximum limit. The soft @@ -65,59 +65,59 @@ situation somewhat. Here is a partial list of systems and workarounds

          -
          BSDI 2.0 -
          Under BSDI 2.0 you can build Apache to support more descriptors - by adding -DFD_SETSIZE=nnn to - EXTRA_CFLAGS (where nnn is the number of descriptors - you wish to support, keep it less than the hard limit). But it - will run into trouble if more than approximately 240 Listen - directives are used. This may be cured by rebuilding your kernel - with a higher FD_SETSIZE. +
          BSDI 2.0 +
          Under BSDI 2.0 you can build Apache to support more descriptors + by adding -DFD_SETSIZE=nnn to + EXTRA_CFLAGS (where nnn is the number of descriptors + you wish to support, keep it less than the hard limit). But it + will run into trouble if more than approximately 240 Listen + directives are used. This may be cured by rebuilding your kernel + with a higher FD_SETSIZE.

          -

          FreeBSD 2.2, BSDI 2.1+ -
          Similar to the BSDI 2.0 case, you should define - FD_SETSIZE and rebuild. But the extra - Listen limitation doesn't exist. +
          FreeBSD 2.2, BSDI 2.1+ +
          Similar to the BSDI 2.0 case, you should define + FD_SETSIZE and rebuild. But the extra + Listen limitation doesn't exist.

          -

          Linux -
          By default Linux has a kernel maximum of 256 open descriptors - per process. There are several patches available for the - 2.0.x series which raise this to 1024 and beyond, and you - can find them in the "unofficial patches" section of the Linux Information HQ. - None of these patches are perfect, and an entirely different - approach is likely to be taken during the 2.1.x development. - Applying these patches will raise the FD_SETSIZE used to compile - all programs, and unless you rebuild all your libraries you should - avoid running any other program with a soft descriptor limit above - 256. As of this writing the patches available for increasing - the number of descriptors do not take this into account. On a - dedicated webserver you probably won't run into trouble. +
          Linux +
          By default Linux has a kernel maximum of 256 open descriptors + per process. There are several patches available for the + 2.0.x series which raise this to 1024 and beyond, and you + can find them in the "unofficial patches" section of the Linux Information HQ. + None of these patches are perfect, and an entirely different + approach is likely to be taken during the 2.1.x development. + Applying these patches will raise the FD_SETSIZE used to compile + all programs, and unless you rebuild all your libraries you should + avoid running any other program with a soft descriptor limit above + 256. As of this writing the patches available for increasing + the number of descriptors do not take this into account. On a + dedicated webserver you probably won't run into trouble.

          -

          Solaris through 2.5.1 -
          Solaris has a kernel hard limit of 1024 (may be lower in earlier - versions). But it has a limitation that files using - the stdio library cannot have a descriptor above 255. - Apache uses the stdio library for the ErrorLog directive. - When you have more than approximately 110 virtual hosts - (with an error log and an access log each) you will need to - build Apache with -DHIGH_SLACK_LINE=256 added to - EXTRA_CFLAGS. You will be limited to approximately - 240 error logs if you do this. +
          Solaris through 2.5.1 +
          Solaris has a kernel hard limit of 1024 (may be lower in earlier + versions). But it has a limitation that files using + the stdio library cannot have a descriptor above 255. + Apache uses the stdio library for the ErrorLog directive. + When you have more than approximately 110 virtual hosts + (with an error log and an access log each) you will need to + build Apache with -DHIGH_SLACK_LINE=256 added to + EXTRA_CFLAGS. You will be limited to approximately + 240 error logs if you do this.

          -

          AIX version ?? -
          AIX appears to have a hard limit of 128 descriptors. End of - story. +
          AIX version ?? +
          AIX appears to have a hard limit of 128 descriptors. End of + story.

          -

          Others -
          If you have details on another operating system, please submit - it through our Bug - Report Page. +
          Others +
          If you have details on another operating system, please submit + it through our Bug + Report Page.

          @@ -128,8 +128,8 @@ DNS resolver library that is used by pretty much every unix, which fails if it ends up with a descriptor above 256. We suspect there are other libraries that similar limitations. So the code as of 1.2.1 takes a defensive stance and tries to save descriptors less than 16 -for use while processing each request. This is called the low -slack line. +for use while processing each request. This is called the low +slack line.

          Note that this shouldn't waste descriptors. If you really are pushing the limits and Apache can't get a descriptor above 16 when it wants diff --git a/docs/manual/misc/fin_wait_2.html b/docs/manual/misc/fin_wait_2.html index 4b9d60ad3aa..025ad0a28c9 100644 --- a/docs/manual/misc/fin_wait_2.html +++ b/docs/manual/misc/fin_wait_2.html @@ -29,10 +29,10 @@ server, which responds with an ACK and the connection is closed. The state that the connection is in during the period between when the server gets the ACK from the client and the server gets the FIN from the client is known as FIN_WAIT_2. See the TCP RFC for the +HREF="ftp://ds.internic.net/rfc/rfc793.txt">TCP RFC for the technical details of the state transitions.

          -The FIN_WAIT_2 state is somewhat unusual in that there is no timeout +The FIN_WAIT_2 state is somewhat unusual in that there is no timeout defined in the standard for it. This means that on many operating systems, a connection in the FIN_WAIT_2 state will stay around until the system is rebooted. If the system does not have a timeout and @@ -158,39 +158,39 @@ The following systems are known to have a timeout:

        • FreeBSD versions starting at 2.0 or possibly earlier.
        • NetBSD version 1.2(?)
        • OpenBSD all versions(?) -
        • BSD/OS 2.1, with the +
        • BSD/OS 2.1, with the - K210-027 patch installed. + K210-027 patch installed.
        • Solaris as of around version - 2.2. The timeout can be tuned by using ndd to + 2.2. The timeout can be tuned by using ndd to modify tcp_fin_wait_2_flush_interval, but the - default should be appropriate for most servers and improper + default should be appropriate for most servers and improper tuning can have negative impacts.
        • SCO TCP/IP Release 1.2.1 can be modified to have a timeout by following SCO's instructions.
        • Linux 2.0.x and earlier(?) -
        • HP-UX 10.x defaults to - terminating connections in the FIN_WAIT_2 state after the +
        • HP-UX 10.x defaults to + terminating connections in the FIN_WAIT_2 state after the normal keepalive timeouts. This does not refer to the persistent connection or HTTP keepalive - timeouts, but the SO_LINGER socket option - which is enabled by Apache. This parameter can be adjusted + timeouts, but the SO_LINGER socket option + which is enabled by Apache. This parameter can be adjusted by using nettune to modify parameters such as tcp_keepstart and tcp_keepstop. In later revisions, there is an explicit timer for connections in FIN_WAIT_2 that can be modified; contact HP support for details.
        • SGI IRIX can be patched to - support a timeout. For IRIX 5.3, 6.2, and 6.3, + support a timeout. For IRIX 5.3, 6.2, and 6.3, use patches 1654, 1703 and 1778 respectively. If you have trouble locating these patches, please contact your SGI support channel for help.
        • NCR's MP RAS Unix 2.xx and 3.xx both have FIN_WAIT_2 timeouts. In 2.xx it is non-tunable at 600 seconds, while in 3.xx it defaults to 600 seconds and - is calculated based on the tunable "max keep alive probes" + is calculated based on the tunable "max keep alive probes" (default of 8) multiplied by the "keep alive interval" (default 75 seconds).
        • Squent's ptx/TCP/IP for @@ -207,7 +207,7 @@ The following systems are known to not have a timeout: source should be easy to patch.

        -There is a +There is a patch available for adding a timeout to the FIN_WAIT_2 state; it was originally intended for BSD/OS, but should be adaptable to most @@ -221,8 +221,8 @@ It is possible to compile Apache 1.2 without using the lingering_close() function. This will result in that section of code being similar to that which was in 1.1. If you do this, be aware that it can cause problems with PUTs, POSTs and -persistent connections, especially if the client uses pipelining. -That said, it is no worse than on 1.1, and we understand that keeping your +persistent connections, especially if the client uses pipelining. +That said, it is no worse than on 1.1, and we understand that keeping your server running is quite important.

        To compile without the lingering_close() function, add @@ -261,9 +261,9 @@ crashing.

        The exact way to increase them may depend on your OS; look for some reference to the number of "mbufs" or "mbuf clusters". On -many systems, this can be done by adding the line -NMBCLUSTERS="n", where n is the number of -mbuf clusters you want to your kernel config file and rebuilding your +many systems, this can be done by adding the line +NMBCLUSTERS="n", where n is the number of +mbuf clusters you want to your kernel config file and rebuilding your kernel.

        @@ -305,7 +305,7 @@ apparent reason.

        There are two conditions under which this is likely to occur:

        1. sending POST or PUT data without proper authorization -
        2. sending multiple requests before each response (pipelining) +
        3. sending multiple requests before each response (pipelining) and one of the middle requests resulting in an error or other break-the-connection result.
        diff --git a/docs/manual/misc/security_tips.html b/docs/manual/misc/security_tips.html index dc08450aeda..9c36f85e43a 100644 --- a/docs/manual/misc/security_tips.html +++ b/docs/manual/misc/security_tips.html @@ -24,14 +24,14 @@ the suggestions will be general, others specific to Apache.

        Permissions on Log File Directories

        When Apache starts, it opens the log files as the user who started the -server before switching to the user defined in the +server before switching to the user defined in the User directive. Anyone who has write permission for the directory where any log files are being written to can append pseudo-arbitrary data to any file on the system which is writable by the user who starts Apache. Since the server is normally started by root, you should NOT give anyone write permission to the directory where logs are stored unless you -want them to have root access. +want them to have root access.

        Server Side Includes

        diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html index 34e49f476e1..e8639be007c 100644 --- a/docs/manual/mod/core.html +++ b/docs/manual/mod/core.html @@ -397,14 +397,14 @@ one of four things,
      27. redirect to an external URL to handle the problem/error
      -

      The first option is the default, while options 2-4 are configured -using the ErrorDocument directive, which is followed by +

      The first option is the default, while options 2-4 are configured +using the ErrorDocument directive, which is followed by the HTTP response code and a message or URL.

      Messages in this context begin with a single quote -("), which does not form part of the message itself. -Apache will sometimes offer additional information regarding the -problem/error. +("), which does not form part of the message itself. +Apache will sometimes offer additional information regarding the +problem/error.

      URLs can begin with a slash (/) for local URLs, or be a full URL which the client can resolve. Examples: @@ -415,10 +415,10 @@ ErrorDocument 401 /subscription_info.html
      ErrorDocument 403 "Sorry can't allow you access today -

      Note that when you specify an ErrorDocument that -points to a remote URL (ie. anything with a method such as "http" in +

      Note that when you specify an ErrorDocument that +points to a remote URL (ie. anything with a method such as "http" in front of it) Apache will send a redirect to the client to tell it -where to find the document, even if the document ends up being +where to find the document, even if the document ends up being on the same server.. This has several implications, the most important being that if you use an "ErrorDocument 401" directive then it must refer to a local document. This results @@ -441,7 +441,7 @@ Example:

      ErrorLog /dev/null
      This effectively turns off error logging.

      -SECURITY: See the security tips +SECURITY: See the security tips document for details on why your security could be compromised if the directory where logfiles are stored is writable by anyone other than the user that starts the server. @@ -467,9 +467,10 @@ order they appear in the configuration file, after the <Directory> sections and .htaccess files are read, but before <Location> sections.

      -

      The filename argument should include a filename, or a +

      The filename argument should include a filename, or a wild-card string, where `?' matches any single character, and `*' matches any -sequences of characters. Extended regular expressions can also be used, with the addition of +sequences of characters. Extended regular expressions can also be used, +with the addition of the ~ character. For example:

      @@ -670,7 +671,7 @@ versions after 1.2.0.
      
 
 The maximum length of the queue of pending connections.  Generally no
 tuning is needed or desired, however on some systems it is desirable
-to increase this when under a TCP SYN flood attack.  See 
+to increase this when under a TCP SYN flood attack.  See
 the backlog parameter to the listen(2) system call.
 
 
      <Limit> directive
      
@@ -852,7 +853,7 @@ See also MaxSpareServers and
 Status: core
      
 
 The Options directive controls which server features are available in
-a particular directory. 
+a particular directory.
 
      
 option can be set to None, in which case none of
 the extra features are enabled, or one or more of the following:
@@ -982,7 +983,7 @@ listens at.
 sets the SERVER_PORT environment variable (for
 CGI and SSI),
 and is used when the server must generate a URL that refers to itself
-(for example when creating an external redirect to itself).  
+(for example when creating an external redirect to itself).
 
 
 In no event does a Port setting affect
@@ -1065,7 +1066,7 @@ sections; in fact it can now contain any server directive allowed in the
 
 See also AccessConfig.
      
 
-
      RLimitCPU directive
      
+
      RLimitCPU directive
      
 
 Syntax: RLimitCPU # or 'max' [# or 'max']
      
 Default: Unset uses operating system defaults
      
@@ -1335,7 +1336,7 @@ wait for three things:
   
    3. The total amount of time it takes to receive a GET request.
   
    4. The amount of time between receipt of TCP packets on a POST or
       PUT request.
-  
    5. The amount of time between ACKs on transmissions of TCP packets 
+  
    6. The amount of time between ACKs on transmissions of TCP packets
       in responses.
    @@ -1400,7 +1401,7 @@ Apache 1.2 and later.

    <VirtualHost> and </VirtualHost> are used to enclose a group of directives which will apply only to a particular virtual host. -Any directive which is allowed in a virtual host context may be used. +Any directive which is allowed in a virtual host context may be used. When the server receives a request for a document on a particular virtual host, it uses the configuration directives enclosed in the <VirtualHost> section. Addr can be @@ -1440,7 +1441,7 @@ may also specify :* to match all ports on that address. (This is recommended when used with _default_.)

    SECURITY: See the -security tips +security tips document for details on why your security could be compromised if the directory where logfiles are stored is writable by anyone other than the user that starts the server. diff --git a/docs/manual/mod/directives.html b/docs/manual/mod/directives.html index 1c31c7b1a27..8ce065e1315 100644 --- a/docs/manual/mod/directives.html +++ b/docs/manual/mod/directives.html @@ -13,7 +13,7 @@ ALINK="#FF0000" > -

    Apache directives

    +

    Apache Directives

    • AccessConfig diff --git a/docs/manual/mod/index.html b/docs/manual/mod/index.html index 347393f4744..4bacd90aab3 100644 --- a/docs/manual/mod/index.html +++ b/docs/manual/mod/index.html @@ -76,7 +76,7 @@ mod_usertrack
      mod_log_agent
      Logging of User Agents.
      mod_log_common up to Apache 1.1.1 -
      Standard logging in the Common Logfile Format. Replaced by the +
      Standard logging in the Common Logfile Format. Replaced by the mod_log_config module in Apache 1.2 and up
      mod_log_config
      User-configurable logging replacement for mod_log_common. @@ -95,7 +95,7 @@ mod_log_config module in Apache 1.2 and up
      mod_userdir
      User home directories.
      mod_usertrack Apache 1.2 and up -
      User tracking using Cookies (replacement for mod_cookies.c) +
      User tracking using Cookies (replacement for mod_cookies.c) diff --git a/docs/manual/mod/mod_access.html b/docs/manual/mod/mod_access.html index 80c99831055..92bb6407d2b 100644 --- a/docs/manual/mod/mod_access.html +++ b/docs/manual/mod/mod_access.html @@ -15,63 +15,77 @@

      Module mod_access

      - +

      This module is contained in the mod_access.c file, and is compiled in by default. It provides access control based on client hostname or IP address. +

      - - + +
    -

    allow

     +

    allow directive

    +

    Syntax: allow from host host ...
    Context: directory, .htaccess
    Override: Limit
    Status: Base
    -Module: mod_access

    - +Module: mod_access +

    +

    The allow directive affects which hosts can access a given directory. Host is one of the following: +

    all -
    all hosts are allowed access +
    All hosts are allowed access
    A (partial) domain-name -
    host whose name is, or ends in, this string are allowed access. +
    Hosts whose names match, or end in, this string are allowed access.
    A full IP address
    An IP address of a host allowed access
    A partial IP address
    The first 1 to 3 bytes of an IP address, for subnet restriction.
    - -Example:
    allow from .ncsa.uiuc.edu
    -All hosts in the specified domain are allowed access.

    - +

    +Example: +

    +
    allow from .ncsa.uiuc.edu
    +

    +All hosts in the specified domain are allowed access. +

    +

    Note that this compares whole components; bar.edu -would not match foobar.edu.

    - +would not match foobar.edu. +

    +

    See also deny, order, and -BrowserMatch.

    +BrowserMatch. +

    +

    Syntax: allow from env=variablename
    Context: directory, .htaccess
    Override: Limit
    Status: Base
    Module: mod_access
    -Compatibility: Apache 1.2 and above

    - +Compatibility: Apache 1.2 and above +

    +

    The allow from env directive controls access to a directory by the existence (or non-existence) of an environment variable. - -Example:

    +
    
+
    
+Example:
+
    
+
     BrowserMatch ^KnockKnock/2.0 let_me_in
 <Directory /docroot>
 order allow,deny
@@ -79,20 +93,25 @@ allow from env=let_me_in
 deny from all
 </Directory>
 
    
-
+
    
 See also deny from env
-and order.
    
+and order.
+
    
+
    
 
-
    deny
    
+
    deny directive
    
+
    
 
 Syntax: deny from host host ...
    
 Context: directory, .htaccess
    
 Override: Limit
    
 Status: Base
    
-Module: mod_access
    
-
+Module: mod_access
+
    
+
    
 The deny directive affects which hosts can access a given directory.
 Host is one of the following:
+
    
 
    
 
    all
 
    all hosts are denied access
@@ -103,26 +122,37 @@ The deny directive affects which hosts can access a given directory.
 
    A partial IP address
 
    The first 1 to 3 bytes of an IP address, for subnet restriction.
 
    
-
-Example:
    deny from 16
    
-All hosts in the specified network are denied access.
    
-
+
    
+Example:
+
    
+
    deny from 16
    
+
    
+All hosts in the specified network are denied access.
+
    
+
    
 Note that this compares whole components; bar.edu
-would not match foobar.edu.
    
-
-See also allow and order.
    
+would not match foobar.edu.
+
    
+
    
+See also allow and order.
+
    
 
+
    
 Syntax: deny from env=variablename
    
 Context: directory, .htaccess
    
 Override: Limit
    
 Status: Base
    
 Module: mod_access
    
-Compatibility: Apache 1.2 and above
    
-
+Compatibility: Apache 1.2 and above
+
    
+
    
 The deny from env directive controls access to a directory by the
 existence (or non-existence) of an environment variable.
-
-Example:
    +
    
+
    
+Example:
+
    
+
     BrowserMatch ^BadRobot/0.9 go_away
 <Directory /docroot>
 order deny,allow
@@ -131,21 +161,27 @@ allow from all
 </Directory>
 
    
 
+
    
 See also allow from env
-and order.
    
+and order.
+
    
+
    
 
-
    order
    
+
    order directive
    
+
    
 
 Syntax: order ordering
    
 Default: order deny,allow
    
 Context: directory, .htaccess
    
 Override: Limit
    
 Status: Base
    
-Module: mod_access
    
-
+Module: mod_access
+
    
+
    
 The order directive controls the order in which allow and
 deny directives are evaluated. Ordering is one
 of
+
    
 
    
 
    deny,allow
 
    the deny directives are evaluated before the allow directives.  (The
@@ -157,20 +193,22 @@ initial state is FORBIDDEN.)
 
    Only those hosts which appear on the allow list and do not appear
 on the deny list are granted access.  (The initial state is irrelevant.)
 
    
-
+
    
 Note that in all cases every allow and deny
 statement is evaluated, there is no "short-circuiting".
-
-
    Example:
+
    
+
    
+Example:
+
    
 
    
 order deny,allow
    
 deny from all
    
 allow from .ncsa.uiuc.edu
    
 
    
+
    
 Hosts in the ncsa.uiuc.edu domain are allowed access; all other hosts are
 denied access.
-
+
    
 
 
 
-
diff --git a/docs/manual/mod/mod_actions.html b/docs/manual/mod/mod_actions.html
index 03709d5a90a..07823cbc82c 100644
--- a/docs/manual/mod/mod_actions.html
+++ b/docs/manual/mod/mod_actions.html
@@ -14,18 +14,18 @@
 >
 
 
    Module mod_actions
    
-
+
    
 This module is contained in the mod_actions.c file, and
 is compiled in by default. It provides for
 executing CGI scripts based on media type or request method. It is not
 present in versions prior to Apache 1.1.
-
+
    
 
    Summary
    
-
+
    
 This module lets you run CGI scripts whenever a file of a certain type
 is requested. This makes it much easier to execute scripts that
 process files.
-
+
    
 
    Directives
    
 
      
 
    • Action
@@ -34,52 +34,58 @@ process files.
 
 
      
 
-
      Action
      
+
      Action directive
      
+
      
 Syntax: Action mime-type cgi-script
      
 Context: server config, virtual host, directory, .htaccess
      
 Override: FileInfo
      
 Status: Base
      
 Module: mod_actions
      
 Compatibility: Action is only available in Apache 1.1
-and later
      
-
+and later
+
      
+
      
 This directive adds an action, which will activate cgi-script when
 a file of content type mime-type is requested. It sends the
 URL and file path of the requested document using the standard
 CGI PATH_INFO and PATH_TRANSLATED environment variables.
-
+
      
 
      
 
-
      Script
      
+
      Script directive
      
+
      
 Syntax: Script method cgi-script
      
 Context: server config, virtual host, directory
      
 Status: Base
      
 Module: mod_actions
      
 Compatibility: Script is only available in Apache 1.1
-and later
      
+and later
+
      
 
-
      This directive adds an action, which will activate cgi-script when
+
      
+This directive adds an action, which will activate cgi-script when
 a file is requested using the method of method, which can be
 one of GET, POST, PUT or
 DELETE. It sends the
 URL and file path of the requested document using the standard
-CGI PATH_INFO and PATH_TRANSLATED environment variables. 
-
-
      Note that the Script command defines default actions only. If a CGI
+CGI PATH_INFO and PATH_TRANSLATED environment variables.
+
      
+
      
+Note that the Script command defines default actions only. If a CGI
 script is called, or some other resource that is capable of handling
-the requested method internally, it will do so. Also note that script
+the requested method internally, it will do so. Also note that Script
 with a method of GET will only be called if there are
 query arguments present (e.g. foo.html?hi). Otherwise, the request
 will proceed normally.
-
-
      Examples:
+
      
+
      
+Examples:
+
      
 
           Script GET /cgi-bin/search     #e.g. for <ISINDEX>-style searching
     Script PUT /~bob/put.cgi
-
 
      
 
 
 
 
-
diff --git a/docs/manual/mod/mod_alias.html b/docs/manual/mod/mod_alias.html
index c5c89250e30..445c5942f04 100644
--- a/docs/manual/mod/mod_alias.html
+++ b/docs/manual/mod/mod_alias.html
@@ -15,132 +15,173 @@
 
 
 
      Module mod_alias
      
-
+
      
 This module is contained in the mod_alias.c file, and
 is compiled in by default. It provides for mapping different parts of the
 host filesystem in the the document tree, and for URL redirection.
+
      
 
-
-
+
      Directives
      
+      
+
    
 
    
 
 
-
    Alias
    
+
    Alias directive
    
+
    
 
 Syntax: Alias url-path directory-filename
    
 Context: server config, virtual host
    
 Status: Base
    
-Module: mod_alias
    
-
+Module: mod_alias
+
    
+
    
 The Alias directive allows documents to be stored in the local filesystem
 other than under the DocumentRoot.
 URLs with a (%-decoded) path beginning with url-path will be
 mapped to local files beginning with directory-filename.
+
    
 Example:
+
    
 
    Alias /image /ftp/pub/image
    
+
    
 A request for http://myserver/image/foo.gif would cause the server to
-return the file /ftp/pub/image/foo.gif.
    
-
+return the file /ftp/pub/image/foo.gif.
+
    
+
    
 Note that if you include a trailing / on the url-path then the
 server will require a trailing / in order to expand the alias.  That is,
 if you use Alias /icons/ /usr/local/etc/httpd/icons/ then
-the url /icons will not be aliased.
    
-
-See also ScriptAlias.
    
+the url /icons will not be aliased.
+
    
+
    
+See also ScriptAlias.
+
    
+
    
 
-
    Redirect
    
+
    Redirect directive
    
+
    
 
 Syntax: Redirect [ status ] url-path url
    
 Context: server config, virtual host, directory, .htaccess
    
 Status: Base
    
 Module: mod_alias
    
 Compatibility: The directory and .htaccess context's
-are only available in versions 1.1 and later. The status argument is only available in Apache 1.2 or later.
    
-
+are only available in versions 1.1 and later. The status
+argument is only available in Apache 1.2 or later.
+
    
+
    
 The Redirect directive maps an old URL into a new one. The new URL is returned
 to the client which attempts to fetch it again with the new address.
 Url-path a (%-decoded) path; any requests for documents beginning with
 this path will be returned a redirect error to a new (%-encoded) url
-beginning with url. Example:
+beginning with url.
+
    
+
    
+Example:
+
    
 
    Redirect /service
 http://foo2.bar.com/service
    
+
    
 If the client requests http://myserver/service/foo.txt, it will be told to
-access http://foo2.bar.com/service/foo.txt instead.
    
-
-Note: Redirect directives take precedence over Alias and ScriptAlias
+access http://foo2.bar.com/service/foo.txt instead.
+
    
+
    
+Note: Redirect directives take precedence over Alias
+and ScriptAlias
 directives, irrespective of their ordering in the configuration file.  Also,
-Url-path must be an absolute path, not a relative path, even when used with
-.htaccess files or inside of <Directory> sections.
    
-
+Url-path must be an absolute path, not a relative path, even
+when used with .htaccess files or inside of <Directory> sections.
+
    
+
    
 If no status argument is given, the redirect will be
-"temporary" (HTTP status 302). This indicates to the client that the
+"temporary" (HTTP status 302). This indicates to the client that the
 resources is has moved temporarily. The status
 argument can be used to return other HTTP status codes:
+
    
 
    
-
    permanent
    Returns a permanent redirect status (301) indicating that
+
    permanent
+
    Returns a permanent redirect status (301) indicating that
 the resource has moved permanently.
-
    temp
    Returns a temporary redirect status (302). This is the
+
    temp
+
    Returns a temporary redirect status (302). This is the
 default.
-
    seeother
    Returns a "See Other" status (303) indicating that
+
    seeother
+
    Returns a "See Other" status (303) indicating that
 the resource has been replaced.
-
    gone
    Returns a "Gone" status (410) indicating that the resource
+
    gone
+
    Returns a "Gone" status (410) indicating that the resource
 has been permanently removed. When this status is used the url
 argument should be omitted.
 
    
-
+
    
 Other status codes can be returned by giving the numeric status code
 as the value of status. If the status is between 300 and 399,
 the url argument must be present, otherwise it must be
 omitted. Note that the status must be known to the Apache code (see
 the function send_error_response in http_protocol.c).
+
    
+
    
 
-
    RedirectTemp
    
+
    RedirectTemp directive
    
+
    
 
 Syntax: RedirectTemp url-path url
    
 Context: server config, virtual host, directory, .htaccess
    
 Status: Base
    
 Module: mod_alias
    
-Compatibility: This directive is only available in 1.2
    
-
+Compatibility: This directive is only available in 1.2
+
    
+
    
 This directive makes the client know that the Redirect is only
-temporary. (Status 302). Exactly equivalent to Redirect temporary 
    
+temporary (status 302). Exactly equivalent to Redirect
+temporary.
+
    
+
    
 
-
    RedirectPermanent
    
+
    RedirectPermanent directive
    
+
    
 
 Syntax: RedirectPermanent url-path url
    
 Context: server config, virtual host, directory, .htaccess
    
 Status: Base
    
 Module: mod_alias
    
-Compatibility: This directive is only available in 1.2
    
-
-This directive makes the client know that the Redirect is permanent.
-(Status 301). Exactly equivalent to Redirect permanent
    
-
+Compatibility: This directive is only available in 1.2
+
    
+
    
+This directive makes the client know that the Redirect is permanent
+(status 301). Exactly equivalent to Redirect permanent.
+
    
 
    
-
    ScriptAlias
    
+
+
    ScriptAlias directive
    
+
    
 
 Syntax: ScriptAlias url-path directory-filename
    
 Context: server config, virtual host
    
 Status: Base
    
-Module: mod_alias
    
-
+Module: mod_alias
+
    
+
    
 The ScriptAlias directive has the same behavior as the
 Alias directive, except that in addition it
 marks the target directory as containing CGI scripts.
 URLs with a (%-decoded) path beginning with url-path will be
 mapped to scripts beginning with directory-filename.
+
    
 Example:
+
    
 
    ScriptAlias /cgi-bin/ /web/cgi-bin/
    
+
    
 A request for http://myserver/cgi-bin/foo would cause the server to
-run the script /web/cgi-bin/foo.
    
+run the script /web/cgi-bin/foo.
+
    
 
 
 
 
-
diff --git a/docs/manual/mod/mod_auth_anon.html b/docs/manual/mod/mod_auth_anon.html
index c1b6933053a..8c64ae85247 100644
--- a/docs/manual/mod/mod_auth_anon.html
+++ b/docs/manual/mod/mod_auth_anon.html
@@ -52,7 +52,7 @@ allows users to share URLs.
 
 
    
 
-
    Anonymous
    
+
    Anonymous directive
    
 
 Syntax: Anonymous user user ...
    
 Default: none
    
@@ -80,7 +80,7 @@ allows users to share URLs.
         'I Don't Know'.
 
    
 
-
    Anonymous_Authoritative
    
+
    Anonymous_Authoritative directive
    
 Syntax: Anonymous_Authoritative on | off
    
 Default: Anonymous_Authoritative off
    
 Context: directory, .htaccess
    
@@ -93,13 +93,13 @@ allows users to share URLs.
         userID does not match the values specified in the
         Anonymous directive, access is denied.
         
    
-        Be sure you know what you are doing when you decide to switch 
+        Be sure you know what you are doing when you decide to switch
         it on. And remember that it is the linking order of the modules
         (in the Configuration / Make file) which details the order
         in which the Authorization modules are queried.
 
    
 
-
    Anonymous_LogEmail
    
+
    Anonymous_LogEmail directive
    
 Syntax: Anonymous_LogEmail on | off
    
 Default: off
    
 Context: directory, .htaccess
    
@@ -111,7 +111,7 @@ allows users to share URLs.
         contains a sensible email address) is logged in the httpd-log file.
 
    
 
-
    Anonymous_MustGiveEmail
    
+
    Anonymous_MustGiveEmail directive
    
 
 Syntax: Anonymous_MustGiveEmail on | off
    
 Default: off
    
@@ -124,7 +124,7 @@ allows users to share URLs.
         address as the password.  This prohibits blank passwords.
 
    
 
-
    Anonymous_NoUserID
    
+
    Anonymous_NoUserID directive
    
 Syntax: Anonymous_NoUserID on | off
    
 Default: Anonymous_NoUserID off
    
 Context: directory, .htaccess
    
@@ -140,7 +140,7 @@ allows users to share URLs.
 
 
    
 
-
    Anonymous_VerifyEmail
    
+
    Anonymous_VerifyEmail directive
    
 Syntax: Anonymous on | off
    
 Default: Anonymous_VerifyEmail off
    
 Context: directory, .htaccess
    
@@ -152,7 +152,8 @@ allows users to share URLs.
         checked for at least one '@' and a '.' to encourage users to enter
         valid email addresses (see the above Auth_LogEmail).
 
-
    Example
    
+
    
+
    Example
    
 
 The example below (when combined with the Auth directives
 of a htpasswd-file based (or GDM, mSQL etc) base access
@@ -202,11 +203,13 @@ AuthType                basic
    
 
 
 
-
    Compile Time Options
    
+
    
+
    Compile Time Options
    
 
 Currently there are no Compile options.
 
-
    Revision History
    
+
    
+
    Revision History
    
 
 This version: 23 Nov 1995, 24 Feb 1996, 16 May 1996.
 
@@ -223,7 +226,8 @@ This version: 23 Nov 1995, 24 Feb 1996, 16 May 1996.
 
 
 
-
    Contact/person to blame
    
+
    
+
    Contact/person to blame
    
 
 This module was written for the
 European Wide Service Exchange by
@@ -234,7 +238,8 @@ documentation, courtesy of Nick Himba, 
 
    
 
 
-
    Sourcecode
    
+
    
+
    Sourcecode
    
 
 The source code can be found at 
 http://www.apache.org. A snapshot of a development version
diff --git a/docs/manual/mod/mod_auth_dbm.html b/docs/manual/mod/mod_auth_dbm.html
index 42e0b649853..a8fabb2b80f 100644
--- a/docs/manual/mod/mod_auth_dbm.html
+++ b/docs/manual/mod/mod_auth_dbm.html
@@ -18,7 +18,7 @@
 
 This module is contained in the mod_auth_dbm.c file, and
 is not compiled in by default. It provides for user authentication using
-DBM files. 
+DBM files.
 
 
 
diff --git a/docs/manual/mod/mod_autoindex.html b/docs/manual/mod/mod_autoindex.html
index a6cccca6100..bd255fb6c55 100644
--- a/docs/manual/mod/mod_autoindex.html
+++ b/docs/manual/mod/mod_autoindex.html
@@ -160,7 +160,7 @@ This sets the icon to display next to files with
 format (alttext,url) where alttext is the text tag
 given for an icon for non-graphical browsers.
    
 
-Mime-encoding is a wildcard expression matching required the 
+Mime-encoding is a wildcard expression matching required the
 content-encoding. Examples:
 
    
 AddIconByEncoding /icons/compress.xbm x-compress
diff --git a/docs/manual/mod/mod_cern_meta.html b/docs/manual/mod/mod_cern_meta.html
index 98a7410f401..0aaa25662ab 100644
--- a/docs/manual/mod/mod_cern_meta.html
+++ b/docs/manual/mod/mod_cern_meta.html
@@ -21,14 +21,14 @@ semantics. It is only available in Apache 1.1 and later.
 
 
    Summary
    
 
-Emulate the CERN HTTPD Meta file semantics.  Meta files are HTTP 
+Emulate the CERN HTTPD Meta file semantics.  Meta files are HTTP
 headers that can be output in addition to the normal range of headers
 for each file accessed.  They appear rather like the Apache
 .asis files, and are able to provide a crude way of influencing
 the Expires: header, as well as providing other curiosities.
 There are many ways to manage meta information, this one was
 chosen because there is already a large number of CERN users
-who can exploit this module. 
+who can exploit this module.
 
 
    More information on the
 PassEnv
diff --git a/docs/manual/mod/mod_imap.html b/docs/manual/mod/mod_imap.html
index 718f3fb683b..40bac8da801 100644
--- a/docs/manual/mod/mod_imap.html
+++ b/docs/manual/mod/mod_imap.html
@@ -77,7 +77,7 @@ is called without valid coordinates.
   
    none
   
    If ImapMenu is
        none, no menu is generated, and the default
-       action is performed.  
+       action is performed.
   
    formatted
   
    A formatted menu is the simplest menu.  Comments
        in the imagemap file are ignored.  A level one header is
@@ -153,8 +153,8 @@ beginning with '#' are comments.
 
    Imagemap File Directives
    
 There are six directives allowed in the imagemap file.  The directives
 can come in any order, but are processed in the order they are found
-in the imagemap file.  
-
      
+in the imagemap file.
+
    
 
    base Directive
 
    Has the effect of <BASE href="value">.  The
      non-absolute URLs of the map-file are taken relative to this value.
@@ -217,7 +217,7 @@ The values for each of the directives can any of the following:
   
    referer
   
    Equivalent to the URL of the referring document.
        Defaults to http://servername/ if no Referer:
-       header was present. 
+       header was present.
 
    
   
    nocontent
   
    Sends a status code of 204 No Content,
@@ -227,7 +227,7 @@ The values for each of the directives can any of the following:
   
    error
   
    Fails with a 500 Server Error.  Valid for all but
        base, but sort of silly for anything but
-       default. 
+       default.
 
    
 
 
    Coordinates
    
@@ -237,13 +237,13 @@ The values for each of the directives can any of the following:
        separated by a comma.  The coordinates are separated from each other
        by whitespace.  To accommodate the way Lynx handles imagemaps, should a
        user select the coordinate 0,0, it is as if
-       no coordinate had been selected.   
+       no coordinate had been selected.
 
    
 
 
    Quoted Text
    
 
    
   
    "Menu Text"
-  
    After the value or after the coordinates, the line optionally may 
+  
    After the value or after the coordinates, the line optionally may
        contain text within double quotes.  This string is used as the
        text for the link if a menu is generated:
    
      <a href="http://foo.com/">Menu text</a>
    
diff --git a/docs/manual/mod/mod_include.html b/docs/manual/mod/mod_include.html
index f1576471e63..d8b2f04ada4 100644
--- a/docs/manual/mod/mod_include.html
+++ b/docs/manual/mod/mod_include.html
@@ -19,7 +19,7 @@ This module is contained in the mod_include.c file, and
 is compiled in by default. It provides for server-parsed html
 documents. Several directives beyond the original NCSA definition have been
 included in Apache 1.2 - these are flagged below with the phrase
-"Apache 1.2 and above".  Of particular significance are the new flow 
+"Apache 1.2 and above".  Of particular significance are the new flow
 control directives documented at the bottom.
 
 
    Enabling Server-Side Includes
    
@@ -193,7 +193,7 @@ output. Thus included files can be nested.
 
    value
 
    The value to give a variable.
 
    
-For example: 
+For example:
   <!--#set var="category" value="help" -->
 
    Apache 1.2 and above.
 
@@ -203,7 +203,7 @@ For example:
 
 In addition to the variables in the standard CGI environment, these are
 available for the echo command, for if and
-elif, and to any program invoked by the document.  
+elif, and to any program invoked by the document.
 
 
    
 
    DATE_GMT
@@ -254,8 +254,8 @@ current document.
     "X" and REQUEST_METHOD is
     "Y".
 
-
     EXAMPLE: the below example will print "in foo" if the DOCUMENT_URI is 
-/foo/file.html, "in bar" if it is /bar/file.html and "in neither" 
+
     EXAMPLE: the below example will print "in foo" if the DOCUMENT_URI is
+/foo/file.html, "in bar" if it is /bar/file.html and "in neither"
 otherwise:
 
         <!--#if expr="\"$DOCUMENT_URI\" = \"/foo/file.html\"" -->
@@ -291,7 +291,7 @@ elements are:
     if the original test_condition was false.  These elements
     are optional.
 
-
     The endif element ends the 
+
     The endif element ends the
     if element and is required.
 
 
     test_condition is one of the following:
@@ -309,19 +309,19 @@ elements are:
     Unix egrep command.
 
 
    ( test_condition )
-        
    true if test_condition is true 
+        
    true if test_condition is true
 
    ! test_condition
         
    true if test_condition is false
 
    test_condition1 && test_condition2
         
    true if both test_condition1 and
-        test_condition2 are true 
+        test_condition2 are true
 
    test_condition1 || test_condition2
         
    true if either test_condition1 or
-        test_condition2 is true 
+        test_condition2 is true
 
    
 
 
     "=" and "!=" bind more tightly than "&&" and
-    "||". 
+    "||".
     "!" binds most tightly.  Thus, the following are equivalent:
 
 
    @@ -360,7 +360,7 @@ elements are:
 
 The XBitHack directives controls the parsing of ordinary html documents.
 This directive only affects files associated with the MIME type
-text/html. 
+text/html.
 Status can have the following values:
 
    
 
    off
diff --git a/docs/manual/mod/mod_negotiation.html b/docs/manual/mod/mod_negotiation.html
index 141b74bfe63..c69777f9c9c 100644
--- a/docs/manual/mod/mod_negotiation.html
+++ b/docs/manual/mod/mod_negotiation.html
@@ -17,7 +17,7 @@
 
 This module is contained in the mod_negotiation.c file,
 and is compiled in by default. It provides for content negotiation. 
+HREF="../content-negotiation.html">content negotiation.
 
 
    Summary
    
 Content negotiation, or more accurately content selection, is the
@@ -56,7 +56,7 @@ as en.
 
    The length of the file, in bytes. If this header is not present, then
 the actual length of the file is used.
 
    Content-Type:
-
    The MIME media type of the document, with optional parameters. 
+
    The MIME media type of the document, with optional parameters.
 parameters are separated from the media type and from one another by
 semi-colons. Parameter syntax is name=value; allowed parameters are:
 
    
@@ -111,7 +111,7 @@ efficient.
 
 This directive only applies to requests which come from HTTP/1.0 browsers.
 HTTP/1.1 provides much better control over the caching of negotiated
-documents, and this directive has no effect in responses to 
+documents, and this directive has no effect in responses to
 HTTP/1.1 requests.
 
 
@@ -139,7 +139,7 @@ a language preference, then foo.html.fr would be returned.
    
 
 Note that this directive only has an effect if a 'best' language
 cannot be determined by other any other means. Correctly implemented
-HTTP/1.1 requests will mean this directive has no effect. 
+HTTP/1.1 requests will mean this directive has no effect.
 
 
 
diff --git a/docs/manual/mod/mod_proxy.html b/docs/manual/mod/mod_proxy.html
index 958e62f0877..2cb5aee704b 100644
--- a/docs/manual/mod/mod_proxy.html
+++ b/docs/manual/mod/mod_proxy.html
@@ -28,7 +28,7 @@ stability is greatly improved.
    
 
    Summary
    
 
 This module implements a proxy/cache for Apache. It implements
-proxying capability for 
+proxying capability for
 FTP,
 CONNECT (for SSL),
 HTTP/0.9, and
@@ -347,7 +347,7 @@ depending on the speed with which the hostname lookups occur.
    
 
    Can I use the Apache proxy module with my SOCKS proxy?
    
 
 Yes. Just build Apache with the rule SOCKS4=yes in your
-Configuration file, and follow the instructions there. SOCKS5 
+Configuration file, and follow the instructions there. SOCKS5
 capability can be added in a similar way (there's no SOCKS5
 rule yet), so use the EXTRA_LDFLAGS definition, or build Apache
 normally and run it with the runsocks wrapper provided with SOCKS5,
diff --git a/docs/manual/mod/mod_rewrite.html b/docs/manual/mod/mod_rewrite.html
index 4cb6c83b85c..495eefa7992 100644
--- a/docs/manual/mod/mod_rewrite.html
+++ b/docs/manual/mod/mod_rewrite.html
@@ -31,7 +31,7 @@ in the server build Configuration file:
 
    Summary
    
 
 This module uses a rule-based rewriting engine (based on a
-regular-expression parser) to rewrite requested URLs on the fly. 
+regular-expression parser) to rewrite requested URLs on the fly.
 
 
    
 It supports an unlimited number of additional rule conditions (which can
@@ -58,7 +58,7 @@ Written for The Apache Group by
 
    
     Ralf S. Engelschall
    
     rse@engelschall.com
    
-    www.engelschall.com 
+    www.engelschall.com
 
    
 
 
@@ -99,7 +99,7 @@ Written for The Apache Group by
 The RewriteEngine directive enables or disables the
 runtime rewriting engine. If it is set to off this module does
 no runtime processing at all. It does not even update the SCRIPT_URx
-environment variables. 
+environment variables.
 
 
    
 Use this directive to disable the module instead of commenting out
@@ -143,7 +143,7 @@ The RewriteLog directive sets the name of the file to which the
 server logs any rewriting actions it performs. If the name does not begin
 with a slash ('/') then it is assumed to be relative to the
 Server Root.  The directive should occur only once per server
-config. 
+config.
 
 
    
 
@@ -272,7 +272,7 @@ of the following formats:
 #   map.real-to-user -- maps realnames to usernames
 #
 
-Ralf.S.Engelschall    rse   # Bastard Operator From Hell 
+Ralf.S.Engelschall    rse   # Bastard Operator From Hell
 Dr.Fred.Klabuster     fred  # Mr. DAU
 
    
 
    
@@ -317,7 +317,7 @@ RewriteMap real-to-host txt:/path/to/file/map.real-to-user
 #!/usr/bin/perl
 $| = 1;
 while (<STDIN>) {
-    # ...here any transformations 
+    # ...here any transformations
     # or lookups should occur...
     print $_;
 }
@@ -342,7 +342,7 @@ The RewriteMap directive can occur more than once. For each
 mapping-function use one RewriteMap directive to declare its
 rewriting mapfile. While you cannot declare a map in per-directory
 context it is of course possible to use this map in per-directory
-context.  
+context.
 
 
    
 
@@ -380,7 +380,7 @@ to know what the corresponding URL-prefix or URL-base is. By default this
 prefix is the corresponding filepath itself. But at most websites URLs are
 NOT directly related to physical filename paths, so this assumption
 will be usually be wrong! There you have to use the RewriteBase
-directive to specify the correct URL-prefix. 
+directive to specify the correct URL-prefix.
 
 
    
 
    
@@ -409,7 +409,7 @@ directives.
 
 RewriteEngine On
 
-#  let the server know that we are reached via /xyz and not 
+#  let the server know that we are reached via /xyz and not
 #  via the physical path prefix /abc/def
 RewriteBase   /xyz
 
@@ -420,7 +420,7 @@ RewriteRule   ^oldstuff\.html$  newstuff.html
 
 
    
 In the above example, a request to /xyz/oldstuff.html gets correctly
-rewritten to the physical file /abc/def/newstuff.html. 
+rewritten to the physical file /abc/def/newstuff.html.
 
 
    
 
    
@@ -450,7 +450,7 @@ because the per-directory rewriting comes too late in the process.  So,
 when it occurs the (rewritten) request has to be re-injected into the Apache
 kernel! BUT: While this seems like a serious overhead, it really isn't, because
 this re-injection happens fully internal to the Apache server and the same
-procedure is used by many other operations inside Apache. So, you can be 
+procedure is used by many other operations inside Apache. So, you can be
 sure the design and implementation is correct.
 
@@ -480,7 +480,7 @@ state of the URI AND if these additional conditions apply, too.
 TestString is a string which contains server-variables of the form
 
 
    
-%{ NAME_OF_VARIABLE } 
+%{ NAME_OF_VARIABLE }
 
    
 
 where NAME_OF_VARIABLE can be a string
@@ -606,7 +606,7 @@ look-ahead for the final value of file.
 CondPattern is the condition pattern, i.e. a regular expression
 which gets applied to the current instance of the TestString, i.e.
 TestString gets evaluated and then matched against
-CondPattern. 
+CondPattern.
 
 
    
 Remember: CondPattern is a standard
@@ -678,7 +678,7 @@ is a comma-separated list of the following flags:
 
     RewriteCond %{REMOTE_HOST}  ^host1.*  [OR]
 RewriteCond %{REMOTE_HOST}  ^host2.*  [OR]
-RewriteCond %{REMOTE_HOST}  ^host3.*  
+RewriteCond %{REMOTE_HOST}  ^host3.*
 RewriteRule ...some special stuff for any of these hosts...
 
    
     Without this flag you had to write down the cond/rule three times.
@@ -745,14 +745,14 @@ Some hints about the syntax of regular expressions:
 ^           Start of line
 $           End of line
 .           Any single character
-[chars]     One of chars 
-[^chars]    None of chars 
+[chars]     One of chars
+[^chars]    None of chars
 
 ?           0 or 1 of the preceding char
 *           0 or N of the preceding char
 +           1 or N of the preceding char
 
-\char       escape that specific char 
+\char       escape that specific char
             (e.g. for specifying the chars ".[]()" etc.)
 
 (string)    Grouping of chars (the Nth group can be used on the RHS with $N)
@@ -782,7 +782,7 @@ substitution string!
 
    
 Substitution of a rewriting rule is the string
 which is substituted for (or replaces) the original URL for which
-Pattern matched.  Beside plain text you can use 
+Pattern matched.  Beside plain text you can use
 
 
      
 
    1. pattern-group back-references ($N)
@@ -842,14 +842,14 @@ comma-separated list of the following flags:
 
 
        
 
      • 'redirect|R[=code]' (force redirect)
        
-    Prefix Substitution 
+    Prefix Substitution
     with http://thishost[:thisport]/ (which makes the new URL a URI) to
     force a external redirection. If no code is given a HTTP response
     of 302 (MOVED TEMPORARILY) is used. If you want to use other response
     codes in the range 300-400 just specify them as a number or use
     one of the following symbolic names: temp (default), permanent,
     seeother.
-    Use it for rules which should 
+    Use it for rules which should
     canonicalize the URL and gives it back to the client, e.g. translate
     ``/~'' into ``/u/'' or always append a slash to
     /u/user, etc.
        
@@ -902,7 +902,7 @@ comma-separated list of the following flags:
     from the last rewriting rule.  This corresponds to the Perl
     next command or the continue command from the C
     language. Use this flag to restart the rewriting process, i.e.  to
-    immediately go to the top of the loop. 
         
+    immediately go to the top of the loop. 
        
     But be careful not to create a deadloop!
 
        
 
      • 'chain|C' (chained with next rule)
        
@@ -948,7 +948,7 @@ comma-separated list of the following flags:
     with mod_alias:
     
             RewriteRule ^/abc(.*)  /def$1 [PT]
-    Alias       /def       /ghi   
+    Alias       /def       /ghi
     
        
     If you omit the PT flag then mod_rewrite
     will do its job fine, i.e. it rewrites uri=/abc/... to
@@ -990,7 +990,7 @@ comma-separated list of the following flags:
         <!--#echo var="VAR"-->) or CGI (e.g. $ENV{'VAR'}).
         But additionally you can also dereference it in a following RewriteCond
         pattern via %{ENV:VAR}. Use this to strip but remember
-        information from URLs. 
+        information from URLs.
 
      
 
 
      
diff --git a/docs/manual/mod/mod_status.html b/docs/manual/mod/mod_status.html
index f671ad78367..65c2dc389d0 100644
--- a/docs/manual/mod/mod_status.html
+++ b/docs/manual/mod/mod_status.html
@@ -33,7 +33,7 @@ performed and the total number of bytes served by the child (*)
 
    2. A total number of accesses and byte count served (*)
 
    3. The time the server was started/restarted and the
 time it has been running for
-
    4. Averages giving the number of requests per second, 
+
    5. Averages giving the number of requests per second,
 the number of bytes served per second and the average number
 of bytes per request (*)
 
    6. The current percentage CPU used by each child and in total by
@@ -52,7 +52,7 @@ domain add this code to your access.conf configuration file
 
           <Location /server-status>
     SetHandler server-status
-    
+
     order deny,allow
     deny from all
     allow from .foo.com
@@ -62,8 +62,8 @@ domain add this code to your access.conf configuration file
 You can now access server statistics by using a Web browser to access the
 page http://your.server.name/server-status
 
      
-Note that mod_status will only work when you are running Apache in 
-standalone mode and not 
+Note that mod_status will only work when you are running Apache in
+standalone mode and not
 inetd mode.
 
 
      Automatic Updates
      
diff --git a/docs/manual/mod/mod_userdir.html b/docs/manual/mod/mod_userdir.html
index fb0a201c890..50ae172b132 100644
--- a/docs/manual/mod/mod_userdir.html
+++ b/docs/manual/mod/mod_userdir.html
@@ -81,7 +81,7 @@ UserDir http://www.foo.com/~*/     -> http://www.foo.com/~bob/one/two.html
  
  Be careful when using this directive; for instance,
  "UserDir ./" would map
- "/~root" to 
+ "/~root" to
  "/" - which is probably undesirable.  If you are
  running Apache 1.3 or above, it is strongly recommended that your
  configuration include a
diff --git a/docs/manual/platform/perf-bsd44.html b/docs/manual/platform/perf-bsd44.html
index f754f213acb..01ea158da61 100644
--- a/docs/manual/platform/perf-bsd44.html
+++ b/docs/manual/platform/perf-bsd44.html
@@ -41,7 +41,7 @@ problem since.
 
      
 
 After the edit, recompile the kernel and recompile the Apache server
-then reboot.  
+then reboot.
 
 
      
 
@@ -134,8 +134,8 @@ connection ends up in the TIME_WAIT state for several minutes, during
 which time its mbufs are not yet freed. Another reason is that, on server
 timeouts, some connections end up in FIN_WAIT_2 state forever, because
 this state doesn't time out on the server, and the browser never sent
-a final FIN.  For more details see the 
-FIN_WAIT_2 page. 
+a final FIN.  For more details see the
+FIN_WAIT_2 page.
 
 
      
 
@@ -169,7 +169,7 @@ value derived from maxusers proved sufficient for our load.
 Be aware that your system may not boot with a kernel that is configured
 to use more resources than you have available system RAM. ALWAYS
 have a known bootable kernel available when tuning your system this way,
-and use the system tools beforehand to learn if you need to buy more 
+and use the system tools beforehand to learn if you need to buy more
 memory before tuning.
 
 
      
diff --git a/docs/manual/platform/perf-dec.html b/docs/manual/platform/perf-dec.html
index 7cc8bb13081..8b5b9402645 100644
--- a/docs/manual/platform/perf-dec.html
+++ b/docs/manual/platform/perf-dec.html
@@ -16,7 +16,7 @@
 
 Below is a set of newsgroup posts made by an engineer from DEC in
 response to queries about how to modify DEC's Digital Unix OS for more
-heavily loaded web sites.  Copied with permission.  
+heavily loaded web sites.  Copied with permission.
 
 
      
 
diff --git a/docs/manual/platform/perf.html b/docs/manual/platform/perf.html
index 566cc0f2719..ff0f7e9ba58 100644
--- a/docs/manual/platform/perf.html
+++ b/docs/manual/platform/perf.html
@@ -59,11 +59,12 @@ performance tuning hints for BSD-derived systems.
 Digital UNIX
 
 
-
    
 
@@ -43,9 +43,9 @@ Used properly, this feature can reduce considerably the security risks involved
 with allowing users to develop and run private CGI or SSI programs.  However,
 if suEXEC is improperly configured, it can cause any number of problems and
 possibly create new holes in your computer's security.  If you aren't familiar
-with managing setuid root programs and the security issues they present, we 
+with managing setuid root programs and the security issues they present, we
 highly recommend that you not consider using suEXEC.
-
     
+
    
 
 
    
 BACK TO CONTENTS
@@ -65,7 +65,7 @@ capable of supporting suEXEC, may differ in their configuration.
 
    
 
 
    
-Second, it is assumed you are familiar with some basic concepts of your 
+Second, it is assumed you are familiar with some basic concepts of your
 computer's security and its administration.  This involves an understanding
 of setuid/setgid operations and the various effects they
 may have on your system and its level of security.
@@ -76,14 +76,14 @@ Third, it is assumed that you are using an unmodified
 version of suEXEC code.  All code for suEXEC has been carefully scrutinized and
 tested by the developers as well as numerous beta testers.  Every precaution has
 been taken to ensure a simple yet solidly safe base of code.  Altering this
-code can cause unexpected problems and new security risks.  It is 
-highly recommended you not alter the suEXEC code unless you 
+code can cause unexpected problems and new security risks.  It is
+highly recommended you not alter the suEXEC code unless you
 are well versed in the particulars of security programming and are willing to
 share your work with the Apache Group for consideration.
 
    
 
 
    
-Fourth, and last, it has been the decision of the Apache Group to 
+Fourth, and last, it has been the decision of the Apache Group to
 NOT make suEXEC part of the default installation of Apache.
 To this end, suEXEC configuration is a manual process requiring of the
 administrator careful attention to details.  It is through this process
@@ -112,7 +112,7 @@ are taken to ensure your system's security.
 called by the main Apache web server.  This wrapper is called when an HTTP
 request is made for a CGI or SSI program that the administrator has designated
 to run as a userid other than that of the main server.  When such a request
-is made, Apache provides the suEXEC wrapper with the program's name and the 
+is made, Apache provides the suEXEC wrapper with the program's name and the
 user and group IDs under which the program is to execute.
 
    
 
@@ -299,15 +299,15 @@ match your local Apache installation.
      #define GID_MIN 100
 
      /*
-      * USERDIR_SUFFIX -- Define to be the subdirectory under users' 
+      * USERDIR_SUFFIX -- Define to be the subdirectory under users'
       *                   home directories where suEXEC access should
       *                   be allowed.  All executables under this directory
-      *                   will be executable by suEXEC as the user so 
-      *                   they should be "safe" programs.  If you are 
-      *                   using a "simple" UserDir directive (ie. one 
-      *                   without a "*" in it) this should be set to 
+      *                   will be executable by suEXEC as the user so
+      *                   they should be "safe" programs.  If you are
+      *                   using a "simple" UserDir directive (ie. one
+      *                   without a "*" in it) this should be set to
       *                   the same value.  suEXEC will not work properly
-      *                   in cases where the UserDir directive points to 
+      *                   in cases where the UserDir directive points to
       *                   a location that is not the same as the user's
       *                   home directory as referenced in the passwd file.
       *
@@ -345,7 +345,7 @@ match your local Apache installation.
 
 
    
 COMPILING THE SUEXEC WRAPPER
    
-You now need to compile the suEXEC wrapper.  At the shell command prompt, 
+You now need to compile the suEXEC wrapper.  At the shell command prompt,
 type:  cc suexec.c -o suexec [ENTER].
 This should create the suexec wrapper executable.
 
    
@@ -382,8 +382,8 @@ exercise above to the defined location for SUEXEC_BIN.
 
    
 
 
    
-In order for the wrapper to set the user ID, it must me installed as owner 
-root and must have the setuserid execution bit 
+In order for the wrapper to set the user ID, it must me installed as owner
+root and must have the setuserid execution bit
 set for file modes.  If you are not running a root
 user shell, do so now and execute the following commands.
 
    
@@ -447,7 +447,7 @@ scrutiny of the security checks above.
 
    
 The suEXEC wrapper will write log information to the location defined in
 the suexec.h as indicated above. If you feel you have
-configured and installed the wrapper properly, have a look at this log 
+configured and installed the wrapper properly, have a look at this log
 and the error_log for the server to see where you may have gone astray.
 
    
 
diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en
index 0157cd0c1b5..6eb3a93e19e 100644
--- a/docs/manual/suexec.html.en
+++ b/docs/manual/suexec.html.en
@@ -25,7 +25,7 @@
         
  • Enabling & Disabling suEXEC
    • 
         
  • Debugging suEXEC
    • 
         
  • Beware the Jabberwock: Warnings &
-         Examples
    •  
+         Examples
 
 
    
 
@@ -43,9 +43,9 @@ Used properly, this feature can reduce considerably the security risks involved
 with allowing users to develop and run private CGI or SSI programs.  However,
 if suEXEC is improperly configured, it can cause any number of problems and
 possibly create new holes in your computer's security.  If you aren't familiar
-with managing setuid root programs and the security issues they present, we 
+with managing setuid root programs and the security issues they present, we
 highly recommend that you not consider using suEXEC.
-
     
+
    
 
 
    
 BACK TO CONTENTS
@@ -65,7 +65,7 @@ capable of supporting suEXEC, may differ in their configuration.
 
    
 
 
    
-Second, it is assumed you are familiar with some basic concepts of your 
+Second, it is assumed you are familiar with some basic concepts of your
 computer's security and its administration.  This involves an understanding
 of setuid/setgid operations and the various effects they
 may have on your system and its level of security.
@@ -76,14 +76,14 @@ Third, it is assumed that you are using an unmodified
 version of suEXEC code.  All code for suEXEC has been carefully scrutinized and
 tested by the developers as well as numerous beta testers.  Every precaution has
 been taken to ensure a simple yet solidly safe base of code.  Altering this
-code can cause unexpected problems and new security risks.  It is 
-highly recommended you not alter the suEXEC code unless you 
+code can cause unexpected problems and new security risks.  It is
+highly recommended you not alter the suEXEC code unless you
 are well versed in the particulars of security programming and are willing to
 share your work with the Apache Group for consideration.
 
    
 
 
    
-Fourth, and last, it has been the decision of the Apache Group to 
+Fourth, and last, it has been the decision of the Apache Group to
 NOT make suEXEC part of the default installation of Apache.
 To this end, suEXEC configuration is a manual process requiring of the
 administrator careful attention to details.  It is through this process
@@ -112,7 +112,7 @@ are taken to ensure your system's security.
 called by the main Apache web server.  This wrapper is called when an HTTP
 request is made for a CGI or SSI program that the administrator has designated
 to run as a userid other than that of the main server.  When such a request
-is made, Apache provides the suEXEC wrapper with the program's name and the 
+is made, Apache provides the suEXEC wrapper with the program's name and the
 user and group IDs under which the program is to execute.
 
    
 
@@ -299,15 +299,15 @@ match your local Apache installation.
      #define GID_MIN 100
 
      /*
-      * USERDIR_SUFFIX -- Define to be the subdirectory under users' 
+      * USERDIR_SUFFIX -- Define to be the subdirectory under users'
       *                   home directories where suEXEC access should
       *                   be allowed.  All executables under this directory
-      *                   will be executable by suEXEC as the user so 
-      *                   they should be "safe" programs.  If you are 
-      *                   using a "simple" UserDir directive (ie. one 
-      *                   without a "*" in it) this should be set to 
+      *                   will be executable by suEXEC as the user so
+      *                   they should be "safe" programs.  If you are
+      *                   using a "simple" UserDir directive (ie. one
+      *                   without a "*" in it) this should be set to
       *                   the same value.  suEXEC will not work properly
-      *                   in cases where the UserDir directive points to 
+      *                   in cases where the UserDir directive points to
       *                   a location that is not the same as the user's
       *                   home directory as referenced in the passwd file.
       *
@@ -345,7 +345,7 @@ match your local Apache installation.
 
 
    
 COMPILING THE SUEXEC WRAPPER
    
-You now need to compile the suEXEC wrapper.  At the shell command prompt, 
+You now need to compile the suEXEC wrapper.  At the shell command prompt,
 type:  cc suexec.c -o suexec [ENTER].
 This should create the suexec wrapper executable.
 
    
@@ -382,8 +382,8 @@ exercise above to the defined location for SUEXEC_BIN.
 
    
 
 
    
-In order for the wrapper to set the user ID, it must me installed as owner 
-root and must have the setuserid execution bit 
+In order for the wrapper to set the user ID, it must me installed as owner
+root and must have the setuserid execution bit
 set for file modes.  If you are not running a root
 user shell, do so now and execute the following commands.
 
    
@@ -447,7 +447,7 @@ scrutiny of the security checks above.
 
    
 The suEXEC wrapper will write log information to the location defined in
 the suexec.h as indicated above. If you feel you have
-configured and installed the wrapper properly, have a look at this log 
+configured and installed the wrapper properly, have a look at this log
 and the error_log for the server to see where you may have gone astray.