Patch submitted by Matt Lewandowsky - fixes name of mod_isapi handler.

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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index e1b40fcfb2751709710a38947cf792ec2136a3f4..0828b3d6086dab4f47c749e8b2f9a5c6b2145e7f 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -194,7 +194,7 @@ available</td></tr>
     <dt><code>Default</code></dt><dd>The treatment of requests with
     trailing pathname information is determined by the <a href="../handler.html">handler</a> responsible for the request.
     The core handler for normal files defaults to rejecting
-    <code>PATH_INFO</code> requests. Handlers that serve scripts, such as <a href="mod_cgi.html">cgi-script</a> and <a href="mod_isapi.html">isapi-isa</a>, generally accept
+    <code>PATH_INFO</code> requests. Handlers that serve scripts, such as <a href="mod_cgi.html">cgi-script</a> and <a href="mod_isapi.html">isapi-handler</a>, generally accept
     <code>PATH_INFO</code> by default.</dd>
     </dl>
 

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 0da8fdf2d774b225d8f91306bed5af07e819108f..d72fddf09221362b2691cac9d97cc935e6fb5f7c 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -125,7 +125,7 @@ available</description>
     The core handler for normal files defaults to rejecting
     <code>PATH_INFO</code> requests. Handlers that serve scripts, such as <a
     href="mod_cgi.html">cgi-script</a> and <a
-    href="mod_isapi.html">isapi-isa</a>, generally accept
+    href="mod_isapi.html">isapi-handler</a>, generally accept
     <code>PATH_INFO</code> by default.</dd>
     </dl>
 

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 06029030961d577d12fec5bd1e65dad6fdcee82f..7b4f619a63ef5c5fec65f39bf515235f23561d08 100644 (file)
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -79,7 +79,7 @@ Servers</description>
     f&uuml;r gew&ouml;hnliche Dateien weist <code>PATH_INFO</code>-Zugriffe
     standardm&auml;&szlig;ig zur&uuml;ck. Handler, die Skripte bedienen,
     wie z.B. <a href="mod_cgi.html">cgi-script</a> und
-    <a href="mod_isapi.html">isapi-isa</a>, sind im Allgemeinen darauf
+    <a href="mod_isapi.html">isapi-handler</a>, sind im Allgemeinen darauf
     voreingestellt, <code>PATH_INFO</code> zu akzeptieren.</dd>
     </dl>
 

diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 63ed26086d8236964a7b37cfd33999420e980401..da5537d9648e36b8e733030cba0bcbfe0d829d10 100644 (file)
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -118,7 +118,7 @@
     <a href="../handler.html">\e$B%O%s%I%i\e(B</a>\e$B$G7h$^$j$^$9!#\e(B
     \e$BIaDL$N%U%!%$%k$N$?$a$N%3%"%O%s%I%i$N%G%U%)%k%H$O\e(B <code>PATH_INFO</code> \e$B$r5qH]$7$^$9!#\e(B
     <a href="mod_cgi.html">cgi-script</a> \e$B$d\e(B <a
-    href="mod_isapi.html">isapi-isa</a> \e$B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O\e(B
+    href="mod_isapi.html">isapi-handler</a> \e$B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O\e(B
     \e$B0lHLE*$K%G%U%)%k%H$G\e(B <code>PATH_INFO</code> \e$B$r<u$1IU$1$^$9!#\e(B</dd>
     </dl>
 

diff --git a/docs/manual/mod/mod_isapi.html.en b/docs/manual/mod/mod_isapi.html.en
index 5fd33e7ba6269d6e1cd686711e25b3e03bfd6cc5..b0ca5efbe961c013b6aa88af08e7f744e9f43824 100644 (file)
--- a/docs/manual/mod/mod_isapi.html.en
+++ b/docs/manual/mod/mod_isapi.html.en
@@ -64,14 +64,20 @@
 
     <p>In the server configuration file, use
     the <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> directive to
-    associate ISAPI files with the <code>isapi-isa</code> handler, and map
+    associate ISAPI files with the <code>isapi-handler</code> handler, and map
     it to them with their file extensions. To enable any .dll file to be
     processed as an ISAPI extension, edit the httpd.conf file and add the
     following line:</p>
     <div class="example"><p><code>
-        AddHandler isapi-isa .dll
+        AddHandler isapi-handler .dll
     </code></p></div>
 
+    <div class="note">In older versions of the Apache server,
+    <code>isapi-isa</code> was the proper handler name, rather than
+    <code>isapi-handler</code>. For compatibility, configurations may
+    continue using <code>isapi-isa</code> through all versions of Apache
+    prior to 2.3.0.</div>
+
     <p>There is no capability within the Apache server to leave a
     requested module loaded. However, you may preload and keep a
     specific module loaded by using the following syntax in your

diff --git a/docs/manual/mod/mod_isapi.xml b/docs/manual/mod/mod_isapi.xml
index 348ac71520434665558ea1628a71025114d121e4..891314c1313d4f51eb9788396f9f2650a4aac596 100644 (file)
--- a/docs/manual/mod/mod_isapi.xml
+++ b/docs/manual/mod/mod_isapi.xml
@@ -47,14 +47,20 @@
 
     <p>In the server configuration file, use
     the <directive module="mod_mime">AddHandler</directive> directive to
-    associate ISAPI files with the <code>isapi-isa</code> handler, and map
+    associate ISAPI files with the <code>isapi-handler</code> handler, and map
     it to them with their file extensions. To enable any .dll file to be
     processed as an ISAPI extension, edit the httpd.conf file and add the
     following line:</p>
     <example>
-        AddHandler isapi-isa .dll
+        AddHandler isapi-handler .dll
     </example>
 
+    <note>In older versions of the Apache server,
+    <code>isapi-isa</code> was the proper handler name, rather than
+    <code>isapi-handler</code>. For compatibility, configurations may
+    continue using <code>isapi-isa</code> through all versions of Apache
+    prior to 2.3.0.</note>
+
     <p>There is no capability within the Apache server to leave a
     requested module loaded. However, you may preload and keep a
     specific module loaded by using the following syntax in your

diff --git a/docs/manual/mod/mod_isapi.xml.ko b/docs/manual/mod/mod_isapi.xml.ko
index 1fd2da8f04a02212e10fb6377f285a13579eb9bf..c3f545f6a8fa35207ff112fabc12ebf7f9bdad7a 100644 (file)
--- a/docs/manual/mod/mod_isapi.xml.ko
+++ b/docs/manual/mod/mod_isapi.xml.ko
@@ -45,11 +45,11 @@
 
     <p>¼­¹ö¼³Á¤ÆÄÀÏ¿¡¼­ <directive
     module="mod_mime">AddHandler</directive> Áö½Ã¾î¸¦ »ç¿ëÇÏ¿©
-    ISAPI ÆÄÀÏ È®ÀåÀÚ¿Í <code>isapi-isa</code> Çڵ鷯¸¦ ¿¬°áÇÑ´Ù.
+    ISAPI ÆÄÀÏ È®ÀåÀÚ¿Í <code>isapi-handler</code> Çڵ鷯¸¦ ¿¬°áÇÑ´Ù.
     .dll ÆÄÀÏÀ» ISAPI extensionÀ¸·Î ó¸®ÇÏ·Á¸é httpd.conf ÆÄÀÏ¿¡
     ´ÙÀ½°ú °°ÀÌ Ãß°¡ÇÑ´Ù.</p>
     <example>
-        AddHandler isapi-isa .dll
+        AddHandler isapi-handler .dll
     </example>
 
     <p>¾ÆÆÄÄ¡ ¼­¹ö´Â ¿äûÇÑ ¸ðµâÀ» ¸Þ¸ð¸®¿¡ °è¼Ó µÑ ¼ö ¾ø´Ù.