From [EMAIL PROTECTED] at Mon, 26 Jun 2006 10:46:48 -0400:
FWIW, these patches don't build. Have discussed with Matt on IRC, and
he's re-generating the patches. Hopefully will have this stuff committed
later today.
Attached are patches which do build. I'm sorry about the borked patches. :(
Please find fresh patches for 2.0, 2.2, and trunk.
Warmest,
--Matt
--
/*
* Matt Lewandowsky [EMAIL PROTECTED]
* Random Geek http://www.iamcode.net/
* +1 (866) 606-9696 +44 (0) 844 484 8254
*/
Index: core.xml
===================================================================
--- core.xml (revision 416671)
+++ core.xml (working copy)
@@ -74,7 +74,7 @@
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>
Index: core.xml.de
===================================================================
--- core.xml.de (revision 416671)
+++ core.xml.de (working copy)
@@ -79,7 +79,7 @@
für gewöhnliche Dateien weist <code>PATH_INFO</code>-Zugriffe
standardmäßig zurü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>
Index: core.xml.es
===================================================================
--- core.xml.es (revision 416671)
+++ core.xml.es (working copy)
@@ -83,7 +83,7 @@
rechaza por defecto las peticiones de <code>PATH_INFO</code>. Los
handlers que sirven scripts, como <a
href="mod_cgi.html">cgi-script</a> e <a
- href="mod_isapi.html">isapi-isa</a>, generalmente aceptan
+ href="mod_isapi.html">isapi-handler</a>, generalmente aceptan
<code>PATH_INFO</code> por defecto.</dd>
</dl>
Index: core.xml.ja
===================================================================
--- core.xml.ja (revision 416671)
+++ core.xml.ja (working copy)
@@ -66,7 +66,7 @@
<a href="../handler.html">$B%O%s%I%i(B</a>$B$G7h$^$j$^$9!#(B
$BIaDL$N%U%!%$%k$N$?$a$N%3%"%O%s%I%i$N%G%U%)%k%H$O(B <code>PATH_INFO</code> $B$r5qH]$7$^$9!#(B
<a href="mod_cgi.html">cgi-script</a> $B$d(B <a
- href="mod_isapi.html">isapi-isa</a> $B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O(B
+ href="mod_isapi.html">isapi-handler</a> $B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O(B
$B0lHLE*$K%G%U%)%k%H$G(B <code>PATH_INFO</code> $B$r<u$1IU$1$^$9!#(B</dd>
</dl>
Index: mod_isapi.xml
===================================================================
--- mod_isapi.xml (revision 416671)
+++ mod_isapi.xml (working copy)
@@ -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 versions of the Apache server prior to 2.0.37, use
+ <code>isapi-isa</code> instead of <code>isapi-handler</code>. The new
+ handler name is not available prior to version 2.0.37. 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
Index: core.xml
===================================================================
--- core.xml (revision 416671)
+++ core.xml (working copy)
@@ -125,7 +125,7 @@
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>
Index: core.xml.de
===================================================================
--- core.xml.de (revision 416671)
+++ core.xml.de (working copy)
@@ -79,7 +79,7 @@
für gewöhnliche Dateien weist <code>PATH_INFO</code>-Zugriffe
standardmäßig zurü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>
Index: core.xml.ja
===================================================================
--- core.xml.ja (revision 416671)
+++ core.xml.ja (working copy)
@@ -118,7 +118,7 @@
<a href="../handler.html">$B%O%s%I%i(B</a>$B$G7h$^$j$^$9!#(B
$BIaDL$N%U%!%$%k$N$?$a$N%3%"%O%s%I%i$N%G%U%)%k%H$O(B <code>PATH_INFO</code> $B$r5qH]$7$^$9!#(B
<a href="mod_cgi.html">cgi-script</a> $B$d(B <a
- href="mod_isapi.html">isapi-isa</a> $B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O(B
+ href="mod_isapi.html">isapi-handler</a> $B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O(B
$B0lHLE*$K%G%U%)%k%H$G(B <code>PATH_INFO</code> $B$r<u$1IU$1$^$9!#(B</dd>
</dl>
Index: mod_isapi.xml
===================================================================
--- mod_isapi.xml (revision 416671)
+++ mod_isapi.xml (working copy)
@@ -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
Index: mod_isapi.xml.ko
===================================================================
--- mod_isapi.xml.ko (revision 416671)
+++ mod_isapi.xml.ko (working copy)
@@ -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>¾ÆÆÄÄ¡ ¼¹ö´Â ¿äûÇÑ ¸ðµâÀ» ¸Þ¸ð¸®¿¡ °è¼Ó µÑ ¼ö ¾ø´Ù.
Index: core.xml
===================================================================
--- core.xml (revision 417202)
+++ core.xml (working copy)
@@ -125,7 +125,7 @@
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>
Index: core.xml.de
===================================================================
--- core.xml.de (revision 417202)
+++ core.xml.de (working copy)
@@ -79,7 +79,7 @@
für gewöhnliche Dateien weist <code>PATH_INFO</code>-Zugriffe
standardmäßig zurü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>
Index: core.xml.ja
===================================================================
--- core.xml.ja (revision 417202)
+++ core.xml.ja (working copy)
@@ -118,7 +118,7 @@
<a href="../handler.html">$B%O%s%I%i(B</a>$B$G7h$^$j$^$9!#(B
$BIaDL$N%U%!%$%k$N$?$a$N%3%"%O%s%I%i$N%G%U%)%k%H$O(B <code>PATH_INFO</code> $B$r5qH]$7$^$9!#(B
<a href="mod_cgi.html">cgi-script</a> $B$d(B <a
- href="mod_isapi.html">isapi-isa</a> $B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O(B
+ href="mod_isapi.html">isapi-handler</a> $B$N$h$&$K%9%/%j%W%H$r07$&%O%s%I%i$O(B
$B0lHLE*$K%G%U%)%k%H$G(B <code>PATH_INFO</code> $B$r<u$1IU$1$^$9!#(B</dd>
</dl>
Index: mod_isapi.xml
===================================================================
--- mod_isapi.xml (revision 417202)
+++ mod_isapi.xml (working copy)
@@ -55,6 +55,13 @@
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>. As of 2.3 development versions of the Apache
+ server, <code>isapi-isa</code> is no longer valid. You will need to
+ change your configuration to use <code>isapi-handler</code>
+ instead.</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
Index: mod_isapi.xml.ko
===================================================================
--- mod_isapi.xml.ko (revision 417202)
+++ mod_isapi.xml.ko (working copy)
@@ -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>¾ÆÆÄÄ¡ ¼¹ö´Â ¿äûÇÑ ¸ðµâÀ» ¸Þ¸ð¸®¿¡ °è¼Ó µÑ ¼ö ¾ø´Ù.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]