diff options
Diffstat (limited to 'usr.sbin/httpd')
| -rw-r--r-- | usr.sbin/httpd/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | usr.sbin/httpd/htdocs/manual/FAQ.html | 19 | ||||
| -rw-r--r-- | usr.sbin/httpd/htdocs/manual/env.html | 2 | ||||
| -rw-r--r-- | usr.sbin/httpd/htdocs/manual/misc/known_client_problems.html | 2 | ||||
| -rw-r--r-- | usr.sbin/httpd/htdocs/manual/mod/directives.html | 6 | ||||
| -rw-r--r-- | usr.sbin/httpd/htdocs/manual/mod/index-bytype.html | 15 | ||||
| -rw-r--r-- | usr.sbin/httpd/htdocs/manual/mod/index.html | 15 | ||||
| -rw-r--r-- | usr.sbin/httpd/htdocs/manual/mod/mod_browser.html | 116 | ||||
| -rw-r--r-- | usr.sbin/httpd/htdocs/manual/mod/mod_cookies.html | 62 | ||||
| -rw-r--r-- | usr.sbin/httpd/htdocs/manual/mod/mod_log_config.html | 3 |
10 files changed, 9 insertions, 235 deletions
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper index e097fcad419..50c835ff0f5 100644 --- a/usr.sbin/httpd/Makefile.bsd-wrapper +++ b/usr.sbin/httpd/Makefile.bsd-wrapper @@ -1,5 +1,5 @@ # Build wrapper for Apache -# $OpenBSD: Makefile.bsd-wrapper,v 1.53 2005/07/29 23:57:17 jmc Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.54 2005/08/01 19:40:33 jmc Exp $ # Our lndir is hacked; specify a full path to avoid potential conflicts # with the one installed with X11. @@ -349,10 +349,8 @@ MANUALFILES= \ manual/mod/mod_auth_dbm.html \ manual/mod/mod_auth_digest.html \ manual/mod/mod_autoindex.html \ - manual/mod/mod_browser.html \ manual/mod/mod_cern_meta.html \ manual/mod/mod_cgi.html \ - manual/mod/mod_cookies.html \ manual/mod/mod_define.html \ manual/mod/mod_digest.html \ manual/mod/mod_dir.html \ diff --git a/usr.sbin/httpd/htdocs/manual/FAQ.html b/usr.sbin/httpd/htdocs/manual/FAQ.html index cabbb8c9784..16508214293 100644 --- a/usr.sbin/httpd/htdocs/manual/FAQ.html +++ b/usr.sbin/httpd/htdocs/manual/FAQ.html @@ -361,9 +361,6 @@ <li><a href="#cookies1">Why does Apache send a cookie on every response?</a></li> - <li><a href="#cookies2">Why don't my cookies work, I even - compiled in <samp>mod_cookies</samp>?</a></li> - <li><a href="#jdk1-and-http1.1">Why do my Java app[let]s give me plain text when I request an URL from an Apache server?</a></li> @@ -2114,22 +2111,6 @@ </li> <li> - <a id="cookies2" name="cookies2"><strong>Why don't my - cookies work, I even compiled in - <samp>mod_cookies</samp>?</strong></a> - - <p>Firstly, you do <em>not</em> need to compile in - <samp>mod_cookies</samp> in order for your scripts to work - (see the <a href="#cookies1">previous question</a> for more - about <samp>mod_cookies</samp>). Apache passes on your - <samp>Set-Cookie</samp> header fine, with or without this - module. If cookies do not work it will be because your - script does not work properly or your browser does not use - cookies or is not set-up to accept them.</p> - <hr /> - </li> - - <li> <a id="jdk1-and-http1.1" name="jdk1-and-http1.1"><strong>Why do my Java app[let]s give me plain text when I request an URL from an Apache diff --git a/usr.sbin/httpd/htdocs/manual/env.html b/usr.sbin/httpd/htdocs/manual/env.html index 1b79aa7c653..2b674e345e3 100644 --- a/usr.sbin/httpd/htdocs/manual/env.html +++ b/usr.sbin/httpd/htdocs/manual/env.html @@ -235,7 +235,7 @@ particular clients. To make these mechanisms as flexible as possible, they are invoked by defining environment variables, typically with <a - href="mod/mod_browser.html#browsermatch">BrowserMatch</a>, + href="mod/mod_setenvif.html#browsermatch">BrowserMatch</a>, though <a href="mod/mod_env.html#setenv">SetEnv</a> and <a href="mod/mod_env.html#passenv">PassEnv</a> could also be used, for example.</p> diff --git a/usr.sbin/httpd/htdocs/manual/misc/known_client_problems.html b/usr.sbin/httpd/htdocs/manual/misc/known_client_problems.html index f2e87c55f84..86f55b8f3d3 100644 --- a/usr.sbin/httpd/htdocs/manual/misc/known_client_problems.html +++ b/usr.sbin/httpd/htdocs/manual/misc/known_client_problems.html @@ -46,7 +46,7 @@ <p>Various of these workarounds are triggered by environment variables. The admin typically controls which are set, and for which clients, by using <a - href="../mod/mod_browser.html">mod_browser</a>. Unless + href="../mod/mod_setenvif.html">mod_setenvif</a>. Unless otherwise noted all of these workarounds exist in versions 1.2 and later.</p> diff --git a/usr.sbin/httpd/htdocs/manual/mod/directives.html b/usr.sbin/httpd/htdocs/manual/mod/directives.html index 8437b26c22a..8c93f3479be 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/directives.html +++ b/usr.sbin/httpd/htdocs/manual/mod/directives.html @@ -196,14 +196,14 @@ href="mod_usertrack.html#cookiedomain">CookieDomain</a></li> <li><a + href="mod_log_config.html#cookielog">CookieLog</a></li> + + <li><a href="mod_usertrack.html#cookieexpires">CookieExpires</a></li> <li><a href="mod_usertrack.html#cookieformat">CookieFormat</a></li> - <li><a href="mod_cookies.html#cookielog">CookieLog</a> - (mod_cookies)</li> - <li><a href="mod_log_config.html#cookielog">CookieLog</a> (mod_log_config)</li> diff --git a/usr.sbin/httpd/htdocs/manual/mod/index-bytype.html b/usr.sbin/httpd/htdocs/manual/mod/index-bytype.html index 551f821e4b1..9f4a49f3ac7 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/index-bytype.html +++ b/usr.sbin/httpd/htdocs/manual/mod/index-bytype.html @@ -226,8 +226,7 @@ <dt><a href="mod_usertrack.html">mod_usertrack</a> Apache 1.2 and up</dt> - <dd>User tracking using Cookies (replacement for - mod_cookies.c)</dd> + <dd>User tracking using Cookies</dd> </dl> <h2>Miscellaneous</h2> @@ -258,18 +257,6 @@ <h2>Obsolete</h2> <dl> - <dt><a href="mod_browser.html">mod_browser</a> Apache 1.2.* - only</dt> - - <dd>Set environment variables based on User-Agent strings. - Replaced by mod_setenvif in Apache 1.3 and up</dd> - - <dt><a href="mod_cookies.html">mod_cookies</a> up to Apache - 1.1.1</dt> - - <dd>Support for Netscape-like cookies. Replaced in Apache 1.2 - by mod_usertrack</dd> - <dt><a href="mod_log_common.html">mod_log_common</a> up to Apache 1.1.1</dt> diff --git a/usr.sbin/httpd/htdocs/manual/mod/index.html b/usr.sbin/httpd/htdocs/manual/mod/index.html index 864795cf31b..8d56c1c1cd3 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/index.html +++ b/usr.sbin/httpd/htdocs/manual/mod/index.html @@ -82,12 +82,6 @@ <dd>Automatic directory listings</dd> - <dt><a href="mod_browser.html">mod_browser</a> Apache 1.2.* - only</dt> - - <dd>Set environment variables based on User-Agent strings. - Replaced by mod_setenvif in Apache 1.3 and up</dd> - <dt><a href="mod_cern_meta.html">mod_cern_meta</a> Apache 1.1 and up</dt> @@ -97,12 +91,6 @@ <dd>Invoking CGI scripts</dd> - <dt><a href="mod_cookies.html">mod_cookies</a> up to Apache - 1.1.1</dt> - - <dd>Support for Netscape-like cookies. Replaced in Apache 1.2 - by mod_usertrack</dd> - <dt><a href="mod_digest.html">mod_digest</a> Apache 1.1 and up</dt> @@ -221,8 +209,7 @@ <dt><a href="mod_usertrack.html">mod_usertrack</a> Apache 1.2 and up</dt> - <dd>User tracking using Cookies (replacement for - mod_cookies.c)</dd> + <dd>User tracking using Cookies</dd> <dt><a href="mod_vhost_alias.html">mod_vhost_alias</a> Apache 1.3.7 and up</dt> diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_browser.html b/usr.sbin/httpd/htdocs/manual/mod/mod_browser.html deleted file mode 100644 index 052ec877a03..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_browser.html +++ /dev/null @@ -1,116 +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>Apache module mod_browser</title> - </head> - <!-- Background white, links blue (unvisited), navy (visited), red (active) --> - - <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 Version 1.3</h3> - </div> - - - <h1 align="CENTER">Module mod_browser</h1> - This module is contained in the <code>mod_browser.c</code> - file, and is compiled in by default. It provides for setting - environment variables based on the browser. This module is part - of Apache 1.2.* only. From Apache 1.3 onwards <code><a - href="mod_setenvif.html">mod_setenvif</a></code> provides the - functionality of this module. - - <h2>Summary</h2> - - <p>This module allows you to set environment variables based on - the name of the browser accessing your document, based on the - <code>User-Agent</code> header field. This is especially useful - when combined with a conditional HTML language such as <a - href="mod_include.html">XSSI</a> or PHP, and can provide for - simple browser-based negotiation of HTML features.</p> - - <h2>Directives</h2> - - <ul> - <li><a href="#browsermatch">BrowserMatch</a></li> - - <li><a href="#browsermatchnocase">BrowserMatchNoCase</a></li> - </ul> - <hr /> - - <h2><a id="browsermatch" - name="browsermatch">BrowserMatch</a></h2> - <a href="directive-dict.html#Syntax" - rel="Help"><strong>Syntax:</strong></a> BrowserMatch <em>regex - attr1 attr2...</em><br /> - <a href="directive-dict.html#Context" - rel="Help"><strong>Context:</strong></a> server config<br /> - <a href="directive-dict.html#Status" - rel="Help"><strong>Status:</strong></a> base<br /> - <a href="directive-dict.html#Module" - rel="Help"><strong>Module:</strong></a> mod_browser<br /> - <a href="directive-dict.html#Compatibility" - rel="Help"><strong>Compatibility:</strong></a> Apache 1.2 and - above - - <p>The BrowserMatch directive defines environment variables - based on the User-Agent header. The first argument should be a - POSIX.2 extended regular expression (similar to an egrep-style - regex). The rest of the arguments give names of variables to - set. These take the form of either "<code>varname</code>", - "<code>!varname</code>" or "<code>varname=value</code>". In the - first form, the value will be set to "1". The second will - remove the given variable if already defined, and the third - will set the variable to the value given by <code>value</code>. - If a User-Agent string matches more than one entry, they will - be merged. Entries are processed in the order they appear, and - later entries can override earlier ones.</p> - - <p>For example:</p> -<pre> - BrowserMatch ^Mozilla forms jpeg=yes browser=netscape - BrowserMatch "^Mozilla/[2-3]" tables agif frames javascript - BrowserMatch MSIE !javascript -</pre> - - <h2><a id="browsermatchnocase" - name="browsermatchnocase">BrowserMatchNoCase</a></h2> - <a href="directive-dict.html#Syntax" - rel="Help"><strong>Syntax:</strong></a> BrowserMatchNoCase - <em>regex attr1 attr2...</em><br /> - <a href="directive-dict.html#Context" - rel="Help"><strong>Context:</strong></a> server config<br /> - <a href="directive-dict.html#Status" - rel="Help"><strong>Status:</strong></a> base<br /> - <a href="directive-dict.html#Module" - rel="Help"><strong>Module:</strong></a> mod_browser<br /> - <a href="directive-dict.html#Compatibility" - rel="Help"><strong>Compatibility:</strong></a> Apache 1.2 and - above - - <p>The <code>BrowserMatchNoCase</code> directive is - semantically identical to the <a - href="#browsermatch"><code>BrowserMatch</code></a> directive. - However, it provides for case-insensitive matching. For - example:</p> -<pre> - BrowserMatchNoCase mac platform=macintosh - BrowserMatchNoCase win platform=windows -</pre> - - <p> <hr /> - - <h3 align="CENTER">Apache HTTP Server Version 1.3</h3> - <a href="./"><img src="../images/index.gif" alt="Index" /></a> - <a href="../"><img src="../images/home.gif" alt="Home" /></a> - - </p> - </body> -</html> - diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_cookies.html b/usr.sbin/httpd/htdocs/manual/mod/mod_cookies.html deleted file mode 100644 index ef456e7b4dc..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_cookies.html +++ /dev/null @@ -1,62 +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>Apache module mod_cookies</title> - </head> - <!-- Background white, links blue (unvisited), navy (visited), red (active) --> - - <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 Version 1.3</h3> - </div> - - - <h1 align="CENTER">Module mod_cookies</h1> - <strong><font color="red">This module is obsolete. As of - version 1.2 of Apache, it has been replaced with <a - href="mod_usertrack.html">mod_usertrack</a>.</font></strong> - - <p>This module is contained in the <code>mod_cookies.c</code> - file, and is not compiled in by default. It provides for - Netscape(TM) cookies. There is no documentation available for - this module.</p> - - <ul> - <li><a href="#cookielog">CookieLog</a></li> - </ul> - <hr /> - - <h2><a id="cookielog" name="cookielog">CookieLog</a></h2> - - <a href="directive-dict.html#Syntax" - rel="Help"><strong>Syntax:</strong></a> CookieLog - <em>filename</em><br /> - <a href="directive-dict.html#Context" - rel="Help"><strong>Context:</strong></a> server config, virtual - host<br /> - <a href="directive-dict.html#Status" - rel="Help"><strong>Status:</strong></a> Experimental<br /> - <a href="directive-dict.html#Module" - rel="Help"><strong>Module:</strong></a> mod_cookies - - <p>The CookieLog directive sets the filename for logging of - cookies. The filename is relative to the <a - href="core.html#serverroot">ServerRoot</a>.</p> - - <p> <hr /> - - <h3 align="CENTER">Apache HTTP Server Version 1.3</h3> - <a href="./"><img src="../images/index.gif" alt="Index" /></a> - <a href="../"><img src="../images/home.gif" alt="Home" /></a> - - </p> - </body> -</html> - diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_log_config.html b/usr.sbin/httpd/htdocs/manual/mod/mod_log_config.html index b3b292f3344..d1ccc9fed1b 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_log_config.html +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_log_config.html @@ -239,8 +239,7 @@ <p>The CookieLog directive sets the filename for logging of cookies. The filename is relative to the <a href="core.html#serverroot">ServerRoot</a>. This directive is - included only for compatibility with <a - href="mod_cookies.html">mod_cookies</a>, and is deprecated.</p> + included only for compatibility with mod_cookies, and is deprecated.</p> <hr /> <h2><a id="customlog" name="customlog">CustomLog</a> <a |