ScriptInterpreterSource Registry also uses the registry subkey ExecCGI

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@100393 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index c155d98d274900d40d3c01ca0106c49d8ddf6e6a..c84b1aef56a5101217e9bd9096dfbbd128645a07 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2499,9 +2499,10 @@ later</td></tr>
     cause the Windows Registry tree <code>HKEY_CLASSES_ROOT</code> to be
     searched using the script file extension (e.g., <code>.pl</code>) as a
     search key. The command defined by the registry subkey
+    <code>Shell\ExecCGI\Command</code> or if not exists by the subkey
     <code>Shell\Open\Command</code> is used to open the script file. In absence
-    of the file extension key or the <code>Shell\Open\Command</code> subkey
-    Apache uses the <code>Script</code> option.</p>
+    of the file extension key or both subkeys Apache uses the
+    <code>Script</code> option.</p>
 
     <div class="warning"><h3>Security</h3>
       <p>Be careful to use <code>ScriptInterpreterSource Registry</code> with 
@@ -2517,8 +2518,8 @@ later</td></tr>
     </div>
 
     <p>The option <code>Registry-Strict</code> which is new in Apache 2.0
-      does the same as <code>Registry</code> but uses the subkey
-      <code>Shell\ExecCGI\Command</code> instead. The <code>ExecCGI</code> key
+      does the same as <code>Registry</code> but uses only the subkey
+      <code>Shell\ExecCGI\Command</code>. The <code>ExecCGI</code> key
       is not a common one. It has to be configured manually and prevents your
       system from accidental program calls.</p>
 

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index f47324690975ff41d68dd4665583e662e6c3c804..47d63b74574b3d32172dccc7eb46a4f4623009d9 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2448,9 +2448,10 @@ later</compatibility>
     cause the Windows Registry tree <code>HKEY_CLASSES_ROOT</code> to be
     searched using the script file extension (e.g., <code>.pl</code>) as a
     search key. The command defined by the registry subkey
+    <code>Shell\ExecCGI\Command</code> or if not exists by the subkey
     <code>Shell\Open\Command</code> is used to open the script file. In absence
-    of the file extension key or the <code>Shell\Open\Command</code> subkey
-    Apache uses the <code>Script</code> option.</p>
+    of the file extension key or both subkeys Apache uses the
+    <code>Script</code> option.</p>
 
     <note type="warning"><title>Security</title>
       <p>Be careful to use <code>ScriptInterpreterSource Registry</code> with 
@@ -2466,8 +2467,8 @@ later</compatibility>
     </note>
 
     <p>The option <code>Registry-Strict</code> which is new in Apache 2.0
-      does the same as <code>Registry</code> but uses the subkey
-      <code>Shell\ExecCGI\Command</code> instead. The <code>ExecCGI</code> key
+      does the same as <code>Registry</code> but uses only the subkey
+      <code>Shell\ExecCGI\Command</code>. The <code>ExecCGI</code> key
       is not a common one. It has to be configured manually and prevents your
       system from accidental program calls.</p>
 </usage>