From: William A. Rowe Jr Date: Tue, 20 Sep 2005 18:01:27 +0000 (+0000) Subject: Backport TraceEnable docs to the 2.2-dev branch X-Git-Tag: 2.1.8~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4de858eac1f176199e4a38b759dceff93287d6d;p=thirdparty%2Fapache%2Fhttpd.git Backport TraceEnable docs to the 2.2-dev branch git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290496 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 262cfaed00b..761d2e9ef70 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -91,6 +91,7 @@ available
  • SetInputFilter
  • SetOutputFilter
  • TimeOut
    • +
  • TraceEnable
  • UseCanonicalName
  • <VirtualHost>
    • @@ -3052,6 +3053,32 @@ certain events before failing a request default because there may still be odd places in the code where the timer is not reset when a packet is sent.

    + +
    top
    +

    TraceEnable Directive

    + + + + + + + +
    Description:Name of the distributed configuration file
    Syntax:TraceEnable [on|off|extended]
    Default:TraceEnable on
    Context:server config
    Status:Core
    Module:core
    +

    This directive overrides the behavior of TRACE for both + the core server and mod_proxy. The default TraceEnable + on permits TRACE requests per RFC 2616, which disallows + any request body to accompany the request. TraceEnable + off causes the core server and mod_proxy to return + a 405 FORBIDDEN error to the client.

    + +

    Finally, for testing and diagnostic purposes only, request + bodies may be allowed using the non-compliant TraceEnable + extended directive. The core (as an origin server) will + restrict the request body to 64k (plus 8k for chunk headers if + Transfer-Encoding: chunked is used). The core will reflect the + full headers and all chunk headers with the request body. As a + proxy server, the request body is not restricted to 64k.

    +
    top

    UseCanonicalName Directive

    diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 15731053761..411f79e4d10 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -3011,6 +3011,32 @@ certain events before failing a request + +TraceEnable +Name of the distributed configuration file +TraceEnable [on|off|extended] +TraceEnable on +server config + + + +

    This directive overrides the behavior of TRACE for both + the core server and mod_proxy. The default TraceEnable + on permits TRACE requests per RFC 2616, which disallows + any request body to accompany the request. TraceEnable + off causes the core server and mod_proxy to return + a 405 FORBIDDEN error to the client.

    + +

    Finally, for testing and diagnostic purposes only, request + bodies may be allowed using the non-compliant TraceEnable + extended directive. The core (as an origin server) will + restrict the request body to 64k (plus 8k for chunk headers if + Transfer-Encoding: chunked is used). The core will reflect the + full headers and all chunk headers with the request body. As a + proxy server, the request body is not restricted to 64k.

    +     +     + UseCanonicalName Configures how the server determines its own name and diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 52b32347728..db938f09dd6 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -406,6 +406,7 @@
  • ThreadsPerChild
  • ThreadStackSize
  • TimeOut
    • +
  • TraceEnable
  • TransferLog
  • TypesConfig
  • UnsetEnv
    • diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 2ccb8d14a4f..a370c4db164 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -713,29 +713,30 @@ per child process client connections TimeOut seconds 300 sCAmount of time the server will wait for certain events before failing a request -TransferLog file|pipesvBSpecify location of a log file -TypesConfig file-path conf/mime.types sBThe location of the mime.types file -UnsetEnv env-variable [env-variable] -...svdhBRemoves variables from the environment -UseCanonicalName On|Off|DNS Off svdCConfigures how the server determines its own name and +TraceEnable [on|off|extended] on sCName of the distributed configuration file +TransferLog file|pipesvBSpecify location of a log file +TypesConfig file-path conf/mime.types sBThe location of the mime.types file +UnsetEnv env-variable [env-variable] +...svdhBRemoves variables from the environment +UseCanonicalName On|Off|DNS Off svdCConfigures how the server determines its own name and port -User unix-userid #-1 sMThe userid under which the server will answer +User unix-userid #-1 sMThe userid under which the server will answer requests -UserDir directory-filenamesvBLocation of the user-specific directories -VirtualDocumentRoot interpolated-directory|none none svEDynamically configure the location of the document root +UserDir directory-filenamesvBLocation of the user-specific directories +VirtualDocumentRoot interpolated-directory|none none svEDynamically configure the location of the document root for a given virtual host -VirtualDocumentRootIP interpolated-directory|none none svEDynamically configure the location of the document root +VirtualDocumentRootIP interpolated-directory|none none svEDynamically configure the location of the document root for a given virtual host -<VirtualHost +<VirtualHost addr[:port] [addr[:port]] - ...> ... </VirtualHost>sCContains directives that apply only to a specific + ...> ... </VirtualHost>sCContains directives that apply only to a specific hostname or IP address -VirtualScriptAlias interpolated-directory|none none svEDynamically configure the location of the CGI directory for +VirtualScriptAlias interpolated-directory|none none svEDynamically configure the location of the CGI directory for a given virtual host -VirtualScriptAliasIP interpolated-directory|none none svEDynamically configure the location of the cgi directory for +VirtualScriptAliasIP interpolated-directory|none none svEDynamically configure the location of the cgi directory for a given virtual host -Win32DisableAcceptExsMUse accept() rather than AcceptEx() to accept network connections -XBitHack on|off|full off svdhBParse SSI directives in files with the execute bit +Win32DisableAcceptExsMUse accept() rather than AcceptEx() to accept network connections +XBitHack on|off|full off svdhBParse SSI directives in files with the execute bit set