You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2012/08/05 16:35:48 UTC
svn commit: r1369607 - in /httpd/httpd/branches/2.4.x: ./
docs/conf/httpd.conf.in docs/manual/mod/mod_cgid.xml
Author: trawick
Date: Sun Aug 5 14:35:48 2012
New Revision: 1369607
URL: http://svn.apache.org/viewvc?rev=1369607&view=rev
Log:
merge r1364709 from trunk:
doc fixes for r1299718:
The value of ScriptSock is relative to DefaultRuntimeDir.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cgid.xml
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1369604
Modified: httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in?rev=1369607&r1=1369606&r2=1369607&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/httpd.conf.in Sun Aug 5 14:35:48 2012
@@ -255,7 +255,7 @@ LogLevel warn
# ScriptSock: On threaded servers, designate the path to the UNIX
# socket used to communicate with the CGI daemon of mod_cgid.
#
- #Scriptsock @rel_runtimedir@/cgisock
+ #Scriptsock cgisock
</IfModule>
#
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cgid.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cgid.xml?rev=1369607&r1=1369606&r2=1369607&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cgid.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_cgid.xml Sun Aug 5 14:35:48 2012
@@ -77,7 +77,7 @@
<description>The filename prefix of the socket to use for communication with
the cgi daemon</description>
<syntax>ScriptSock <var>file-path</var></syntax>
-<default>ScriptSock logs/cgisock</default>
+<default>ScriptSock cgisock</default>
<contextlist><context>server config</context></contextlist>
<usage>
@@ -89,6 +89,10 @@ the cgi daemon</description>
scripts, it is important that no other user has permission to
write in the directory where the socket is located.</p>
+ <p>If <var>file-path</var> is not an absolute path, the location specified
+ will be relative to the value of
+ <directive module="core">DefaultRuntimeDir</directive>.</p>
+
<example><title>Example</title>
<highlight language="config">
ScriptSock /var/run/cgid.sock