Commit c737f2a0 authored by Joe Orton's avatar Joe Orton
Browse files

Add changes, docs for DefaultStateDir and DavLockDB default change. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842938 13f79535-47bb-0310-9956-ffa450edef68
parent b246bf19

CHANGES

+6 −0
Changes for CHANGES: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.1



  *) mod_dav_fs: Set a default DAVLockDB within the state directory.

     [Joe Orton]



  *) core: Add DefaultStateDir and layout-specific state directory

     created at "make install".  [Joe Orton]



  *) mod_ssl: Fix a regression that the configuration settings for verify mode

     and verify depth were taken from the frontend connection in case of

     connections by the proxy to the backend. PR 62769. [Ruediger Pluem]

docs/manual/mod/core.xml

+34 −0
Changes for docs/manual/mod/core.xml: 34 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -743,6 +743,40 @@ DefaultRuntimeDir scratch/ 
    permissions on the <directive>ServerRoot</directive></seealso>

</directivesynopsis>



<directivesynopsis>

<name>DefaultStateDir</name>

<description>Base directory for the persistent state files</description>

<syntax>DefaultStateeDir <var>directory-path</var></syntax>

<default>DefaultRuntimeDir DEFAULT_REL_STATEDIR (state/)</default>

<contextlist><context>server config</context></contextlist>

<compatibility>Available in Apache 2.5.1 and later</compatibility>



<usage>

    <p>The <directive>DefaultStateDir</directive> directive sets the

    directory in which the server will create various persistent state

    files (databases, long-lived caches, etc.). If set as a relative

    path, the full path will be relative to

    <directive>ServerRoot</directive>.</p>



    <p><strong>Example</strong></p>

   <highlight language="config">

DefaultStateDir state/

    </highlight>



    <p>The default location of <directive>DefaultStateDir</directive> may be

    modified by changing the <code>DEFAULT_REL_STATEDIR</code> #define

    at build time.</p>



   <p>Note: <directive>ServerRoot</directive> should be specified before this

   directive is used. Otherwise, the default value of <directive>ServerRoot</directive>

   would be used to set the base directory.</p>



</usage>

<seealso><a href="../misc/security_tips.html#serverroot">the

    security tips</a> for information on how to properly set

    permissions on the <directive>ServerRoot</directive></seealso>

</directivesynopsis>



<directivesynopsis>

<name>DefaultType</name>

<description>This directive has no effect other than to emit warnings

docs/manual/mod/mod_dav_fs.xml

+8 −0
Changes for docs/manual/mod/mod_dav_fs.xml: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ 
<syntax>DavLockDB <var>file-path</var></syntax>

<contextlist><context>server config</context><context>virtual host</context>

</contextlist>

<default>DavLockDB <var>statedir</var>/davlockdb</default>

<compatibility>No default prior to version 2.5.1.</compatibility>



<usage>

    <p>Use the <directive>DavLockDB</directive> directive to specify
@@ -84,6 +86,12 @@ 
    module="core">ServerRoot</directive> with the base filename

    <code>DavLock</code> and extension name chosen by the server.</p>



    <note><title>Default setting</title>

    <p>In httpd version 2.5.1 and later, a hard-coded default path

    relative to the state directory (configurable via <directive

    module="core">DefaultStateDir</directive>) is used.</p>

    </note>



</usage>

</directivesynopsis>