src - OpenBSD base system

diff options


context:
space:
mode:

author	Jason McIntyre <jmc@cvs.openbsd.org>	2005-07-26 14:02:49 +0000
committer	Jason McIntyre <jmc@cvs.openbsd.org>	2005-07-26 14:02:49 +0000
commit	ea13113ae67d9c6618793bd7e217ccac2332b64e (patch)
tree	b3da727381b4cacd2dbefe5eb6ed6d605d2502cf /usr.sbin/httpd
parent	e0cb213b9aefb5d5b7434fa5c4f39d3cc4e79ece (diff)

remove details of PATH_INFO handling for historic versions of apache,

and the one and only reference to it; from tamas tevesz; ok henning@

Diffstat (limited to 'usr.sbin/httpd')

-rw-r--r--

usr.sbin/httpd/htdocs/manual/cgi_path.html.en

108

-rw-r--r--

usr.sbin/httpd/htdocs/manual/cgi_path.html.fr

137

-rw-r--r--

usr.sbin/httpd/htdocs/manual/cgi_path.html.html

112

-rw-r--r--

usr.sbin/httpd/htdocs/manual/cgi_path.html.ja.jis

108

-rw-r--r--

usr.sbin/httpd/htdocs/manual/new_features_1_2.html

253

-rw-r--r--

usr.sbin/httpd/htdocs/manual/sitemap.html

6 files changed, 0 insertions, 719 deletions

diff --git a/usr.sbin/httpd/htdocs/manual/cgi_path.html.en b/usr.sbin/httpd/htdocs/manual/cgi_path.html.en
deleted file mode 100644
index 38adb0eef29..00000000000
--- a/usr.sbin/httpd/htdocs/manual/cgi_path.html.en
+++ /dev/null

@@ -1,108 +0,0 @@

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

- <head>

- <meta name="generator" content="HTML Tidy, see www.w3.org" />

- <title>PATH_INFO Changes in the CGI Environment</title>

- </head>

-

- <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"

- vlink="#000080" alink="#FF0000">

- <div align="CENTER">

- <img src="images/sub.gif" alt="[APACHE DOCUMENTATION]" />

- <h3>Apache HTTP Server</h3>

- </div>

- <h1 align="CENTER">PATH_INFO Changes in the CGI

- Environment</h1>

- <hr />

- <h2><a id="over" name="over">Overview</a></h2>

- <p>As implemented in Apache 1.1.1 and earlier versions, the

- method Apache used to create PATH_INFO in the CGI environment

- was counterintuitive, and could result in crashes in certain

- cases. In Apache 1.2 and beyond, this behavior has changed.

- Although this results in some compatibility problems with

- certain legacy CGI applications, the Apache 1.2 behavior is

- still compatible with the CGI/1.1 specification, and CGI

- scripts can be easily modified (<a href="#compat">see

- below</a>).</p>

- <h2><a id="prob" name="prob">The Problem</a></h2>

- <p>Apache 1.1.1 and earlier implemented the PATH_INFO and

- SCRIPT_NAME environment variables by looking at the filename,

- not the URL. While this resulted in the correct values in many

- cases, when the filesystem path was overloaded to contain path

- information, it could result in errant behavior. For example,

- if the following appeared in a config file:</p>

-<pre>

- Alias /cgi-ralph /usr/local/httpd/cgi-bin/user.cgi/ralph

-</pre>

- <p>In this case, <code>user.cgi</code> is the CGI script, the

- "/ralph" is information to be passed onto the CGI. If this

- configuration was in place, and a request came for

- "<code>/cgi-ralph/script/</code>", the code would set PATH_INFO

- to "<code>/ralph/script</code>", and SCRIPT_NAME to

- "<code>/cgi-</code>". Obviously, the latter is incorrect. In

- certain cases, this could even cause the server to crash.</p>

- <h2><a id="solution" name="solution">The Solution</a></h2>

- <p>Apache 1.2 and later now determine SCRIPT_NAME and PATH_INFO

- by looking directly at the URL, and determining how much of the

- URL is client-modifiable, and setting PATH_INFO to it. To use

- the above example, PATH_INFO would be set to

- "<code>/script</code>", and SCRIPT_NAME to

- "<code>/cgi-ralph</code>". This makes sense and results in no

- server behavior problems. It also permits the script to be

- guaranteed that

- "<code>http://$SERVER_NAME:$SERVER_PORT$SCRIPT_NAME$PATH_INFO</code>"

- will always be an accessible URL that points to the current

- script, something which was not necessarily true with previous

- versions of Apache.</p>

- <p>However, the "<code>/ralph</code>" information from the

- <code>Alias</code> directive is lost. This is unfortunate, but

- we feel that using the filesystem to pass along this sort of

- information is not a recommended method, and a script making

- use of it "deserves" not to work. Apache 1.2b3 and later,

- however, do provide <a href="#compat">a workaround.</a></p>

- <h2><a id="compat" name="compat">Compatibility with Previous

- Servers</a></h2>

- <p>It may be necessary for a script that was designed for

- earlier versions of Apache or other servers to need the

- information that the old PATH_INFO variable provided. For this

- purpose, Apache 1.2 (1.2b3 and later) sets an additional

- variable, FILEPATH_INFO. This environment variable contains the

- value that PATH_INFO would have had with Apache 1.1.1.</p>

- <p>A script that wishes to work with both Apache 1.2 and

- earlier versions can simply test for the existence of

- FILEPATH_INFO, and use it if available. Otherwise, it can use

- PATH_INFO. For example, in Perl, one might use:</p>

-<pre>

- $path_info = $ENV{'FILEPATH_INFO'} || $ENV{'PATH_INFO'};

-</pre>

- <p>By doing this, a script can work with all servers supporting

- the CGI/1.1 specification, including all versions of

- Apache.</p>

- <hr />

- <h3 align="CENTER">Apache HTTP Server</h3>

- <a href="./"><img src="images/index.gif" alt="Index" /></a>

- </body>

-</html>

diff --git a/usr.sbin/httpd/htdocs/manual/cgi_path.html.fr b/usr.sbin/httpd/htdocs/manual/cgi_path.html.fr
deleted file mode 100644
index b6c9022a561..00000000000
--- a/usr.sbin/httpd/htdocs/manual/cgi_path.html.fr
+++ /dev/null

@@ -1,137 +0,0 @@

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-

-<html xmlns="http://www.w3.org/1999/xhtml">

- <head>

- <meta name="generator" content="HTML Tidy, see www.w3.org" />

- <meta http-equiv="Content-Type"

- content="text/html; charset=iso-8859-1" />

- <title>Modification de PATH_INFO dans l'environnement

- CGI</title>

- </head>

-

- <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"

- vlink="#000080" alink="#FF0000">

- <div align="CENTER">

- <img src="images/sub.gif" alt="[APACHE DOCUMENTATION]" />

- <h3>Apache HTTP Server</h3>

- </div>

- <h1 align="CENTER">Modification de PATH_INFO dans

- l'environnement CGI</h1>

- <hr />

- <h2><a id="over" name="over">Vue d'ensemble</a></h2>

- <p>Telle qu'elle était implémentée dans

- les versions antérieures à la version 1.1.1

- d'Apache (comprise), la méthode utilisée par

- Apache pour créer la variable PATH_INFO dans

- l'environnement CGI était loin d'être intuitive,

- et pouvait conduire à certaines défaillances dans

- certains cas. A partir de la version 1.2 d'Apache, cette

- méthode a été modifiée. Bien que

- ces modifications puissent conduire à certaines

- incompatibilités avec certaines applications CGI, le

- comportement d'Apache 1.2 reste toujours compatible avec la

- spécification CGI/1.1, et les scripts CGI restent

- facilement modifiables (<a href="#compat">voir

- ci-dessous</a>).</p>

- <h2><a id="prob" name="prob">Le Problème</a></h2>

- <p>Les versions d'Apache jusqu'à 1.1.1 construisaient

- les variables d'environnement CGI PATH_INFO et SCRIPT_NAME en

- inspectant les noms de fichiers, et non les URL. Bien que cette

- technique conduise à des valeurs correctes dans la

- plupart des cas, il pouvait arriver que le chemin défini

- par le système de fichiers soit surchargé par une

- redéfinition, laquelle conduisait à une mauvaise

- interprétation lors de la constitution des variables.

- Par exemple, si la ligne suivante apparaissait dans un fichier

- de configuration :</p>

-<pre>

- Alias /cgi-ralph /usr/local/httpd/cgi-bin/user.cgi/ralph

-</pre>

- <p>Dans ce cas, <code>user.cgi</code> désigne le script

- CGI, la chaîne "/ralph" est une information à

- passer au CGI. Si cette configuration était en place, et

- qu'une requête vers "<code>/cgi-ralph/script/</code>"

- était reçue, le code du serveur aurait

- constitué une variable PATH_INFO de valeur

- "<code>/ralph/script</code>", et SCRIPT_NAME de valeur

- "<code>/cgi-</code>". Il est évident de constater que la

- deuxième variable est fausse. Dans certains cas, cela

- aurait même pu conduire à un arrêt du

- serveur.</p>

- <h2><a id="solution" name="solution">La Solution</a></h2>

- <p>Les versions postérieures à 1.2 d'Apache

- définissent maintenant les variables SCRIPT_NAME et

- PATH_INFO en inspectant directement l'URL, et en

- déterminant quelle portion de l'URL est modifiable par

- le client. PATH_INFO est initialisé à cette

- partie modifiable. Pour réexploiter l'exemple ci-dessus,

- PATH_INFO prendrait maintenant la valeur

- "<code>/script</code>", et SCRIPT_NAME la valeur correcte

- "<code>/cgi-ralph</code>". Il n'y a plus de problème de

- comportement du serveur dans ce cas. Cela permet en outre de

- garantir l'accessibilité de l'URL

- <code>http://$SERVER_NAME:$SERVER_PORT$SCRIPT_NAME$PATH_INFO</code>"

- laquelle pointe sur le script courant. Ce n'était pas

- nécesairement vrai dans les versions

- précédentes d'Apache.</p>

- <p>Toutefois, l'information "<code>/ralph</code>" de la

- directive <code>Alias</code> est perdue. Nous pensions que

- l'utilisation du système de fichiers pour faire passer

- ce genre d'information n'était pas une méthode

- recommandée, et un script utilisant ce principe

- était de toutes façons à éviter.

- Nous avons ajouté malgré tout à partir de

- la version 1.2b3 d'Apache une façon de <a

- href="#compat">contourner</a> cette restriction.</p>

- <h2><a id="compat" name="compat">Compatibilité avec des

- serveurs plus anciens</a></h2>

- <p>Il se peut que certains scripts écrits pour des

- versions antérieures d'Apache ou pour d'autres serveurs

- aient besoin d'exploiter les informations données dans

- l'ancien modèle de variable PATH_INFO. A cet effet, la

- version 1.2 d'Apache (1.2b3 et postérieures) proposent

- une variable supplémentaire, appelée

- FILEPATH_INFO. Cette nouvelle variable d'environnement contient

- la valeur qui était précédemment inscrite

- dans PATH_INFO par la version 1.1.1 d'Apache.</p>

- <p>Un script désirant être compatible avec toutes

- les versions d'Apache peut simplement tester l'existence de la

- variable FILEPATH_INFO, et utiliser cette variable si besoin

- est. Autrement, il récupérera ses informations

- dans la variable PATH_INFO. Par exemple, en Perl, on pourra

- écrire :</p>

-<pre>

- $path_info = $ENV{'FILEPATH_INFO'} || $ENV{'PATH_INFO'};

-</pre>

- <p>Par cette écriture, un script fonctionnera avec tous

- les serveurs conformes à la spécification

- CGI/1.1, incluant par là même toutes les versions

- d'Apache.</p>

- <hr />

- <h3 align="CENTER">Apache HTTP Server</h3>

- <a href="./"><img src="images/index.gif" alt="Index" /></a>

- </body>

-</html>

diff --git a/usr.sbin/httpd/htdocs/manual/cgi_path.html.html b/usr.sbin/httpd/htdocs/manual/cgi_path.html.html
deleted file mode 100644
index 434ab2106b4..00000000000
--- a/usr.sbin/httpd/htdocs/manual/cgi_path.html.html
+++ /dev/null

@@ -1,112 +0,0 @@

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

- <head>

- <meta name="generator" content="HTML Tidy, see www.w3.org" />

- <title>PATH_INFO Changes in the CGI Environment</title>

- </head>

-

- <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"

- vlink="#000080" alink="#FF0000">

- <div align="CENTER">

- <img src="images/sub.gif" alt="[APACHE DOCUMENTATION]" />

- <h3>Apache HTTP Server</h3>

- </div>

- <h1 align="CENTER">PATH_INFO Changes in the CGI

- Environment</h1>

- <hr />

- <h2><a id="over" name="over">Overview</a></h2>

- <p>As implemented in Apache 1.1.1 and earlier versions, the

- method Apache used to create PATH_INFO in the CGI environment

- was counterintuitive, and could result in crashes in certain

- cases. In Apache 1.2 and beyond, this behavior has changed.

- Although this results in some compatibility problems with

- certain legacy CGI applications, the Apache 1.2 behavior is

- still compatible with the CGI/1.1 specification, and CGI

- scripts can be easily modified (<a href="#compat">see

- below</a>).</p>

- <h2><a id="prob" name="prob">The Problem</a></h2>

- <p>Apache 1.1.1 and earlier implemented the PATH_INFO and

- SCRIPT_NAME environment variables by looking at the filename,

- not the URL. While this resulted in the correct values in many

- cases, when the filesystem path was overloaded to contain path

- information, it could result in errant behavior. For example,

- if the following appeared in a config file:</p>

-<pre>

- Alias /cgi-ralph /usr/local/httpd/cgi-bin/user.cgi/ralph

-</pre>

- <p>In this case, <code>user.cgi</code> is the CGI script, the

- "/ralph" is information to be passed onto the CGI. If this

- configuration was in place, and a request came for

- "<code>/cgi-ralph/script/</code>", the code would set PATH_INFO

- to "<code>/ralph/script</code>", and SCRIPT_NAME to

- "<code>/cgi-</code>". Obviously, the latter is incorrect. In

- certain cases, this could even cause the server to crash.</p>

- <h2><a id="solution" name="solution">The Solution</a></h2>

- <p>Apache 1.2 and later now determine SCRIPT_NAME and PATH_INFO

- by looking directly at the URL, and determining how much of the

- URL is client-modifiable, and setting PATH_INFO to it. To use

- the above example, PATH_INFO would be set to

- "<code>/script</code>", and SCRIPT_NAME to

- "<code>/cgi-ralph</code>". This makes sense and results in no

- server behavior problems. It also permits the script to be

- guaranteed that

- "<code>http://$SERVER_NAME:$SERVER_PORT$SCRIPT_NAME$PATH_INFO</code>"

- will always be an accessible URL that points to the current

- script, something which was not necessarily true with previous

- versions of Apache.</p>

- <p>However, the "<code>/ralph</code>" information from the

- <code>Alias</code> directive is lost. This is unfortunate, but

- we feel that using the filesystem to pass along this sort of

- information is not a recommended method, and a script making

- use of it "deserves" not to work. Apache 1.2b3 and later,

- however, do provide <a href="#compat">a workaround.</a></p>

- <h2><a id="compat" name="compat">Compatibility with Previous

- Servers</a></h2>

- <p>It may be necessary for a script that was designed for

- earlier versions of Apache or other servers to need the

- information that the old PATH_INFO variable provided. For this

- purpose, Apache 1.2 (1.2b3 and later) sets an additional

- variable, FILEPATH_INFO. This environment variable contains the

- value that PATH_INFO would have had with Apache 1.1.1.</p>

- <p>A script that wishes to work with both Apache 1.2 and

- earlier versions can simply test for the existence of

- FILEPATH_INFO, and use it if available. Otherwise, it can use

- PATH_INFO. For example, in Perl, one might use:</p>

-<pre>

- $path_info = $ENV{'FILEPATH_INFO'} || $ENV{'PATH_INFO'};

-</pre>

- <p>By doing this, a script can work with all servers supporting

- the CGI/1.1 specification, including all versions of

- Apache.</p>

- <hr />

- <h3 align="CENTER">Apache HTTP Server</h3>

- <a href="./"><img src="images/index.gif" alt="Index" /></a>

- </body>

-</html>

diff --git a/usr.sbin/httpd/htdocs/manual/cgi_path.html.ja.jis b/usr.sbin/httpd/htdocs/manual/cgi_path.html.ja.jis
deleted file mode 100644
index 76a423a2513..00000000000
--- a/usr.sbin/httpd/htdocs/manual/cgi_path.html.ja.jis
+++ /dev/null

@@ -1,108 +0,0 @@

-<?xml version="1.0" encoding="iso-2022-jp"?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

- <head>

- <title>CGI $B4D6-$N(B PATH_INFO $B$NJQ99(B</title>

-

- </head>

-

- <body bgcolor="#ffffff" text="#000000" link="#0000ff"

- vlink="#000080" alink="#ff0000">

- <div align="CENTER">

- <img src="images/sub.gif" alt="[APACHE DOCUMENTATION]" />

- <h3>Apache HTTP Server</h3>

- </div>

- <h1 align="center">CGI $B4D6-$N(B PATH_INFO $B$NJQ99(B</h1>

- <hr />

- <h2><a id="over" name="over">$B35MW(B</a></h2>

- <p>Apache 1.1.1 $B$*$h$S$=$l0JA0$N%P!<%8%g%s$G<BAu$5$l$F$$$?(B

- CGI $B4D6-$G(B PATH_INFO $B$r:n@.$9$kJ}K!$OD>4QE*$G$J$/!"(B

- $B>l9g$K$h$C$F$O%/%i%C%7%e$9$k$3$H$b$"$j$^$7$?!#(B

- Apache 1.2 $B5Z$S$=$l0J9_$K$*$$$F!"$3$NF0:n$,JQ99$5$l$^$7$?!#(B

- $B$3$N$3$H$K$h$jFCDj$N8E$$(B CGI $B%"%W%j%1!<%7%g%s$K$*$$$F$$$/$D$+(B

- $B8_49@-$NLdBj$,@8$8$k$3$H$,$"$j$^$9$,!"$=$l$G$b(B Apache 1.2 $B$NF0:n$O(B

- CGI/1.1 $B;EMM$H8_49$,$"$j!"(BCGI $B%9%/%j%W%H$OMF0W$K=$@5$G$-$^$9(B(<a

- href="#compat">$B0J2<;2>H(B</a>)$B!#(B</p>

- <h2><a id="prob" name="prob">$BLdBj(B</a></h2>

- <p>Apache 1.1.1 $B$*$h$S$=$l0JA0$G$O!"(BURL $B$G$O$J$/%U%!%$%kL>$r;2>H$7$F(B

- PATH_INFO $B$H(B SCRIPT_NAME $B4D6-JQ?t$r@_Dj$7$F$$$^$7$?!#(B

- $BB?$/$N>l9g$O$3$l$,@5$7$$7k2L$rJV$7$^$9$,!"%Q%9>pJs$r4^$`$h$&$K(B

- filesystem $B%Q%9$,%*!<%P!<%m!<%I$5$l$?>l9g$O!"(B

- $B8m$C$?7k2L$rJV$9>l9g$,$"$j$^$7$?!#(B

- $B$?$H$($P!"@_Dj%U%!%$%k$K0J2<$,$"$k>l9g(B</p>

-<pre>

- Alias /cgi-ralph /usr/local/httpd/cgi-bin/user.cgi/ralph

-</pre>

- <p>$B$3$N>l9g!"(B<code>user.cgi</code> $B$O(B CGI $B%9%/%j%W%H$G$"$j!"(B

- "/ralph" $B$O!"(BCGI $B$KEO$5$l$k>pJs$G$9!#$b$7>e$N@_Dj$,$J$5$l$F$$$F!"(B

- "<code>/cgi-ralph/script/</code>" $B$X$N%j%/%(%9%H$,Mh$l$P!"(B

- PATH_INFO $B$K$O(B "<code>/ralph/script/</code>" $B$,!"(B

- SCRIPT_NAME $B$K$O(B "<code>/cgi-</code>" $B$,@_Dj$5$l$^$9!#(B

- $BL@$i$+$K!"8e<T$O4V0c$C$F$$$^$9!#FCDj$N>l9g$K$O!"$3$l$K$h$j(B

- $B%5!<%P$,%/%i%C%7%e$9$k$3$H$5$($"$j$^$7$?!#(B</p>

- <h2><a id="solution" name="solution">$B2r7h(B</a></h2>

- <p>Apache 1.2 $B0J9_$G$O(B SCRIPT_NAME $B$H(B PATH_INFO $B$N7hDj$K$O(B URL

- $B$rD>@\;2>H$7$F!"(BURL

- $B$N$I$l$@$1$NItJ,$,%/%i%$%"%s%H$,JQ992DG=$J$N$+$r3NDj$5$;$?>e$G(B

- PATH_INFO $B$r@_Dj$9$k$h$&$K$J$j$^$7$?!#>e$NNc$G$O!"(BPATH_INFO $B$K$O(B

- "<code>/script</code>" $B$,!"(BSCRIPT_NAME $B$K$O(B

- "<code>/cgi-ralph</code>" $B$,@_Dj$5$l$^$9!#(B

- $B$3$l$O@5$7$/!"$5$i$K!"%5!<%P$NF0:n$KLdBj$r5/$3$9$3$H$b$"$j$^$;$s!#$^$?!"(B

- "<code>http://$SERVER_NAME:$SERVER_PORT$SCRIPT_NAME$PATH_INFO</code>"

- $B$,!">o$K:G?7$N%9%/%j%W%H$r;X$9!"%"%/%;%92DG=$J(B URL $B$G$"$k$3$H$r(B

- $BJ]>Z$7$^$9!#$3$l$O!"0JA0$N%P!<%8%g%s$N(B Apache

- $B$G$OI,$:$7$b$=$&$H$O8B$i$J$+$C$?$3$H$G$9!#(B

- </p>

- <p>$B$7$+$7(B <code>Alias</code> $B%G%#%l%/%F%#%V$+$i$N(B

- "<code>/ralph</code>" $B>pJs$O<:$o$l$^$9!#(B

- $B$3$l$O;DG0$G$9$,!"(Bfilesystem $B$rDL$7$F$3$N<oN`$N>pJs$r(B

- $BEO$9$N$OA&$a$i$l$?J}K!$G$O$J$/!"(B

- $B$^$?$=$l$r;H$C$?%9%/%j%W%H$OF0:n$7$J$/$F$bEvA3$@$H9M$($^$9!#(B

- $B$?$@$7!"(BApache 1.2b3 $B0J9_$G$O(B<a

- href="#compat">$BBeBX<jCJ(B</a>$B$rMQ0U$7$F$$$^$9!#(B</p>

- <h2><a id="compat" name="compat">$B0JA0$N%5!<%P$H$N8_49@-(B</a></h2>

- <p>$B0JA0$N%P!<%8%g%s$N(B Apache $B$dB>$N%5!<%P8~$1$K@_7W$5$l$?(B

- $B%9%/%j%W%H$K$O8E$$(B PATH_INFO $BJQ?t$K$h$jDs6!$5$l$k>pJs$,(B

- $BI,MW$G$"$k$+$b$7$l$^$;$s!#(B

- $B$3$NL\E*$N$?$a$K!"(B

- Apache 1.2 (1.2b3 $B0J9_(B) $B$G$ODI2C$NJQ?t!"(BFILEPATH_INFO

- $B$r@_Dj$7$^$9!#$3$N4D6-JQ?t$K$O!"(BApache 1.1.1 $B$G(B

- PATH_INFO $B$G$"$C$?$G$"$m$&CM$,@_Dj$5$l$^$9!#(B</p>

- <p>Apache 1.2 $B$*$h$S$=$l0JA0$N%P!<%8%g%s$NN>J}$GF0:n$5$;$?$$%9%/%j%W%H$O!"(B

- FILEPATH_INFO $B$NB8:_$rC1$KD4$Y$F!"$=$l$,$"$l$P(B

- $B;H$&!"$H$$$&$3$H$,$G$-$^$9!#$=$&$G$J$1$l$P!"(BPATH_INFO

- $B$r;H$&$3$H$,$G$-$^$9!#$?$H$($P!"(BPerl $B$G$O<!$N$b$N$r;H$&$3$H$,$G$-$^$9(B</p>

-<pre>

- $path_info = $ENV{'FILEPATH_INFO'} || $ENV{'PATH_INFO'};

-</pre>

- <p>$B$3$l$K$h$j!"%9%/%j%W%H$O$9$Y$F$N%P!<%8%g%s$N(B Apache $B$r4^$`!"(B

- CGI/1.1 $B$r%5%]!<%H$9$k$9$Y$F$N%5!<%P$GF0:n$9$k$3$H$,$G$-$^$9!#(B

- </p>

- <hr />

- <h3 align="CENTER">Apache HTTP Server</h3>

- <a href="./"><img src="images/index.gif" alt="Index" /></a>

- </body>

-</html>

diff --git a/usr.sbin/httpd/htdocs/manual/new_features_1_2.html b/usr.sbin/httpd/htdocs/manual/new_features_1_2.html
deleted file mode 100644
index 1e8964f5568..00000000000
--- a/usr.sbin/httpd/htdocs/manual/new_features_1_2.html
+++ /dev/null

@@ -1,253 +0,0 @@

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

- <head>

- <meta name="generator" content="HTML Tidy, see www.w3.org" />

- <title>New features with Apache 1.2</title>

- </head>

-

- <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"

- vlink="#000080" alink="#FF0000">

- <div align="CENTER">

- <img src="images/sub.gif" alt="[APACHE DOCUMENTATION]" />

- <h3>Apache HTTP Server</h3>

- </div>

- <h1 align="CENTER">Overview of new features</h1>

- <h2>API Changes</h2>

- <p>Some non-compatible changes were made to the Apache API in

- order to deal with HTTP/1.1 compatibility. It is possible that

- some modules will no longer work (specifically, those that

- process input using the POST or PUT methods). If you encounter

- a module that does not work, please contact the author. A <a

- href="misc/client_block_api.html">programmer's note</a> on the

- subject is available.</p>

- <p>Additionally, some changes were made to the CGI environment

- that may cause some CGI scripts to work incorrectly. If you are

- experiencing trouble with a CGI that worked fine under Apache

- 1.1.1, please see <a href="cgi_path.html">our explanation of

- the changes.</a></p>

- <h2>New Features with Apache 1.2</h2>

- <p>New features with this release, as extensions of the Apache

- functionality. Because the core code has changed so

- significantly, there are certain liberties that earlier

- versions of Apache (and the NCSA daemon) took that recent

- Apache versions are pickier about - please check the <a

- href="misc/compat_notes.html">compatibility notes</a> if you

- have any problems.</p>

- <hr />

- <p>In addition to a number of bug fixes and internal

- performance enhancements, <a

- href="http://www.apache.org/dist/httpd/">Apache 1.2</a> has the

- following specific new user features:</p>

- <ul>

-

- <li><strong><a id="http11.html" name="http11.html">HTTP/1.1

- Compliance</a></strong> [Documentation to be written]<br />

- Aside from the optional proxy module (which operates as

- HTTP/1.0), Apache is conditionally compliant with the

- HTTP/1.1 proposed standard, as approved by the IESG and the

- <a href="http://www.ics.uci.edu/pub/ietf/http/">IETF HTTP

- working group</a>. HTTP/1.1 provides a much-improved

- protocol, and should allow for greater performance and

- efficiency when transferring files. Apache does, however,

- still work great with HTTP/1.0 browsers. We are very close to

- being unconditionally compliant; if you note any deviance

- from the proposed standard, please report it as a bug.</li>

- <li><strong><a href="mod/mod_include.html">eXtended Server

- Side Includes (XSSI)</a></strong><br />

- A new set of server-side include directives allows the user

- to better create WWW pages. This includes number of powerful

- new features, such as the ability to set variables and use

- conditional HTML.</li>

- <li><strong><a href="mod/core.html#files">File-based and

- Regex-enabled Directive Sections</a></strong><br />

- The new <a

- href="mod/core.html#files"><code><Files></code></a>

- section allows directives to be enabled based on full

- filename, not just directory and URL. In addition,

- <code><Files></code> sections can appear in

- <code>.htaccess</code> files. <code><Files></code>,

- along with <a

- href="mod/core.html#directory"><code><Directory></code></a>

- and <a

- href="mod/core.html#location"><code><Location></code></a>,

- can also now be based on regular expressions, not just simple

- prefix matching.</li>

- <li><strong><a href="mod/mod_browser.html">Browser-based

- Environment Variables</a></strong><br />

- Environment variables can now be set based on the

- <code>User-Agent</code> string of the browser. Combined with

- <a href="mod/mod_include.html">XSSI</a>, this allows you to

- write browser-based conditional HTML documents.</li>

- <li><strong><a href="suexec.html">SetUID CGI

- Execution</a></strong><br />

- Apache now supports the execution of CGI scripts as users

- other than the server user. A number of security checks are

- built in to try and make this as safe as possible.</li>

- <li><strong><a href="mod/mod_rewrite.html">URL Rewriting

- Module</a></strong><br />

- The optional <code>mod_rewrite</code> module is now

- included. This module can provide powerful URL mapping, using

- regular expressions. There's nothing this module can't

- do!</li>

- <li><strong><a href="mod/mod_log_config.html">Enhanced,

- Configurable Logging</a></strong><br />

- The optional <code>mod_log_config</code> included with

- earlier versions of Apache is now standard, and has been

- enhanced to allow logging of much more detail about the

- transaction, and can be used to open <a

- href="multilogs.html">more than one log file</a> at once

- (each of which can have a different log format). If you have

- Apache write any logs to a directory which is writable by

- anyone other than the user that starts the server, see the <a

- href="misc/security_tips.html">security tips</a> document to

- be sure you aren't putting the security of your server at

- risk.</li>

- <li><strong><a href="mod/mod_usertrack.html">User Tracking

- (Cookies) Revisions</a></strong><br />

- The <code>mod_cookies</code> included with previous versions

- of Apache has been renamed <code>mod_usertrack</code>, to

- more accurately reflect its function (some people

- inadvertently thought it enabled cookie support in Apache,

- which is not true - Apache supports the use of cookies

- directly). It is also now possible to disable the generation

- of cookies, even when the cookie module is compiled in. Also,

- an expiry time can be set on the cookies.</li>

- <li><strong><a

- href="mod/core.html#virtualhost"><VirtualHost>

- Enhancements</a></strong><br />

- The <VirtualHost> directive can now take more than one

- IP address or hostname. This lets a single vhost handles

- requests for multiple IPs or hostnames. Also the special

- section <VirtualHost _default_> can be used to handle

- requests normally left for the main server

- configuration.</li>

- <li><strong><a href="mod/mod_cgi.html#cgi_debug">CGI

- Debugging Environment</a></strong><br />

- <code>ScriptLog</code> allows you to now set up a log that

- records all input and output to failed CGI scripts. This

- includes environment variables, input headers, POST data,

- output, and more. This makes CGI scripts much easier to

- debug.</li>

- <li><strong><a href="mod/core.html#rlimit">Resource Limits

- for CGI Scripts</a></strong><br />

- New directives allow the limiting of resources used by CGI

- scripts (<em>e.g.</em>, max CPU time). This is helpful in

- preventing 'runaway' CGI processes.</li>

- <li><strong><a href="mod/mod_alias.html">Redirect Directive

- Can Return Alternate Status</a></strong><br />

- The Redirect directive can return permanent or temporary

- redirects, "Gone" or "See Other" HTTP status. For

- NCSA-compatibility, RedirectTemp and RedirectPermanent are

- also implemented.</li>

- <li><strong><a href="install.html">Simplified

- Compilation</a></strong><br />

- The process of configuring Apache for compilation has been

- simplified.</li>

- <li><strong><a href="mod/core.html#options">Add or Remove

- Options</a></strong><br />

- The <code>Options</code> directive can now add or remove

- options from those currently in force, rather than always

- replacing them.</li>

- <li><strong><a href="invoking.html#help">Command-line

- Help</a></strong><br />

- The <code>-h</code> command-line option now lists all the

- available directives.</li>

- <li><strong><a href="mod/mod_headers.html">Optional Headers

- Module to Set or Remove HTTP Headers</a></strong><br />

- The optional <code>mod_headers</code> module can be used to

- set custom headers in the HTTP response. It can append to

- existing headers, replace them, or remove headers from the

- response.</li>

- <li><strong><a href="mod/core.html#ifmodule">Conditional

- Config Directives</a></strong><br />

- A new <code><IfModule></code> section allows

- directives to be enabled only if a given module is loaded

- into the server.</li>

- <li><strong><a href="mod/core.html#satisfy">NCSA Satisfy

- authentication directive now implemented</a></strong><br />

- <code>Satisfy</code> allows for more flexible access control

- configurations.</li>

- <li><strong>Better NCSA Compatibility</strong><br />

- Apache directives are now more compatible with NCSA 1.5 to

- make moving between servers easier. In particular, Apache now

- implements the <a

- href="mod/core.html#satisfy"><code>Satisfy</code></a>, <a

- href="mod/core.html#maxkeepaliverequests">MaxKeepAliveRequests</a>,

- <a

- href="mod/mod_alias.html#redirectperm">RedirectPermanent</a>

- and <a

- href="mod/mod_alias.html#redirecttemp">RedirectTemp</a>,

- directives, and the following directives are now

- syntax-compatible with NCSA: <a

- href="mod/mod_auth.html#authuserfile">AuthUserFile</a>, <a

- href="mod/mod_auth.html#authgroupfile">AuthGroupFile</a>, <a

- href="mod/mod_digest.html#authdigestfile">AuthDigestFile</a>,

- <a href="mod/core.html#keepalive">KeepAlive</a> and <a

- href="mod/core.html#keepalivetimeout">KeepAliveTimeout</a>.</li>

- <li>

- <strong><a href="mod/mod_proxy.html">Optional proxy

- module</a></strong><br />

- An improved FTP, HTTP, and CONNECT mode SSL proxy is

- included with Apache 1.2. Some of the changes visible to

- users:

- <dl>

- <dd>

- <dl>

- <dt>- Improved FTP proxy supporting PASV mode</dt>

- <dt>- ProxyBlock directive for excluding sites to

- proxy</dt>

- <dt>- NoCache * directive for disabling proxy

- caching</dt>

- <dt>- Numerous bug fixes</dt>

- </dl>

- </dd>

- </dl>

- </li>

- </ul>

- <hr />

- <h3 align="CENTER">Apache HTTP Server</h3>

- <a href="./"><img src="images/index.gif" alt="Index" /></a>

- </body>

-</html>

diff --git a/usr.sbin/httpd/htdocs/manual/sitemap.html b/usr.sbin/httpd/htdocs/manual/sitemap.html
index 3551206dee0..99b4d26f6e9 100644
--- a/usr.sbin/httpd/htdocs/manual/sitemap.html
+++ b/usr.sbin/httpd/htdocs/manual/sitemap.html

@@ -160,7 +160,6 @@ Side Includes</a></li>

<li><a href="misc/">Older Documentation</a>

<ul>

-<li><a href="cgi_path.html">PATH_INFO Changes in the CGI Environment</a></li>

<li><a href="keepalive.html">Apache Keep-Alive Support</a></li>

<li><a href="multilogs.html">Apache Multiple Log Files</a></li>

<li><a href="process-model.html">Server Pool Management</a></li>