From: Astrid Malo <kess@apache.org>
Date: Sun, 29 Jun 2003 10:24:23 +0000 (+0000)
Subject: ScriptInterpreterSource Registry also uses the ExecCGI subkey
X-Git-Tag: pre_ajp_proxy~1500
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb7e9735908533e8f76776d1be4c16d968d8b96a;p=thirdparty%2Fapache%2Fhttpd.git

ScriptInterpreterSource Registry also uses the ExecCGI subkey


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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index b30644e18d2..3c1f118bfc7 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2504,9 +2504,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 
@@ -2522,8 +2523,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 bf0040b969e..3e0c3425d09 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2456,9 +2456,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 
@@ -2474,8 +2475,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>