diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2002-07-20 00:16:22 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2002-07-20 00:16:22 +0000 |
| commit | 4293f75624bc531155794d4ba9cc34d09d7b6a8b (patch) | |
| tree | f7b9e53c598e1738f7151b6201cb3dd1621922cf /usr.sbin | |
| parent | b5381ebb20fd9701a5a25f16204aeef0d86b2e3a (diff) | |
remove pre-apache-1.3.26 cruft
Note for upgraders:
to actually see the current manual, you should do
find /var/www/htdocs/manual/ -type f -exec rm {} \;
cd /usr/src/usr.sbin/httpd/
make -f Makefile.bsd-wrapper distribution
you will also need a current httpd.conf, MultiViews need to be enabled in
/var/www/htdocs/manual/
Diffstat (limited to 'usr.sbin')
30 files changed, 1 insertions, 2604 deletions
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper index 609d1ec520d..e30987e31b8 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.29 2002/07/19 23:39:44 henning Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.30 2002/07/20 00:16:21 henning Exp $ # Our lndir is hacked; specify a full path to avoid potential conflicts # with the one installed with X11. @@ -246,13 +246,11 @@ MANUALFILES= \ manual/cgi_path.html.fr \ manual/cgi_path.html.html \ manual/cgi_path.html.ja.jis \ - manual/configuring.html \ manual/configuring.html.en \ manual/configuring.html.fr \ manual/configuring.html.html \ manual/configuring.html.ja.jis \ manual/content-negotiation.html \ - manual/custom-error.html \ manual/custom-error.html.en \ manual/custom-error.html.fr \ manual/custom-error.html.html \ @@ -267,18 +265,15 @@ MANUALFILES= \ manual/env.html.html \ manual/env.html.ja.jis \ manual/footer.html \ - manual/handler.html \ manual/handler.html.en \ manual/handler.html.html \ manual/handler.html.ja.jis \ manual/header.html \ - manual/index.html \ manual/index.html.en \ manual/index.html.fr \ manual/index.html.html \ manual/index.html.ja.jis \ manual/install-tpf.html \ - manual/install.html \ manual/install.html.en \ manual/install.html.es \ manual/install.html.fr \ @@ -313,12 +308,10 @@ MANUALFILES= \ manual/new_features_1_0.html \ manual/new_features_1_1.html \ manual/new_features_1_2.html \ - manual/new_features_1_3.html \ manual/new_features_1_3.html.en \ manual/new_features_1_3.html.html \ manual/new_features_1_3.html.ja.jis \ manual/new_features_2_0.html \ - manual/process-model.html \ manual/process-model.html.en \ manual/process-model.html.html \ manual/process-model.html.ja.jis \ @@ -347,7 +340,6 @@ MANUALFILES= \ manual/misc/vif-info.html \ manual/misc/windoz_keepalive.html \ manual/readme-tpf.html \ - manual/sections.html \ manual/sections.html.en \ manual/sections.html.html \ manual/sections.html.ja.jis \ @@ -421,7 +413,6 @@ MANUALFILES= \ manual/mod/core.html.en \ manual/mod/core.html.fr \ manual/mod/core.html.html \ - manual/mod/directive-dict.html \ manual/mod/directive-dict.html.en \ manual/mod/directive-dict.html.fr \ manual/mod/directive-dict.html.html \ @@ -441,17 +432,13 @@ MANUALFILES= \ manual/mod/index.html.fr \ manual/mod/index.html.html \ manual/mod/index.html.ja.jis \ - manual/mod/mod_access.html \ manual/mod/mod_access.html.en \ manual/mod/mod_access.html.html \ manual/mod/mod_access.html.ja.jis \ - manual/mod/mod_actions.html \ manual/mod/mod_actions.html.en \ manual/mod/mod_actions.html.html \ manual/mod/mod_actions.html.ja.jis \ manual/mod/mod_alias.html \ - manual/mod/mod_asis.html \ - manual/mod/mod_so.html \ manual/mod/mod_asis.html.en \ manual/mod/mod_asis.html.html \ manual/mod/mod_asis.html.ja.jis \ @@ -463,7 +450,6 @@ MANUALFILES= \ manual/mod/mod_autoindex.html \ manual/mod/mod_browser.html \ manual/mod/mod_cern_meta.html \ - manual/mod/mod_cgi.html \ manual/mod/mod_cgi.html.en \ manual/mod/mod_cgi.html.html \ manual/mod/mod_cgi.html.ja.jis \ @@ -474,7 +460,6 @@ MANUALFILES= \ manual/mod/mod_dir.html.html \ manual/mod/mod_dir.html.ja.jis \ manual/mod/mod_dld.html \ - manual/mod/mod_dll.html \ manual/mod/mod_env.html.en \ manual/mod/mod_env.html.html \ manual/mod/mod_env.html.ja.jis \ @@ -483,7 +468,6 @@ MANUALFILES= \ manual/mod/mod_headers.html \ manual/mod/mod_imap.html \ manual/mod/mod_include.html \ - manual/mod/mod_info.html \ manual/mod/mod_info.html.en \ manual/mod/mod_info.html.html \ manual/mod/mod_info.html.ja.jis \ @@ -497,7 +481,6 @@ MANUALFILES= \ manual/mod/mod_mime.html.ja.jis \ manual/mod/mod_mime_magic.html \ manual/mod/mod_mmap_static.html \ - manual/mod/mod_negotiation.html \ manual/mod/mod_negotiation.html.en \ manual/mod/mod_negotiation.html.html \ manual/mod/mod_negotiation.html.ja.jis \ @@ -509,40 +492,33 @@ MANUALFILES= \ manual/mod/mod_setenvif.html.ja.jis \ manual/mod/mod_so.html.html \ manual/mod/mod_so.html.ja.jis \ - manual/mod/mod_speling.html \ manual/mod/mod_speling.html.en \ manual/mod/mod_speling.html.html \ manual/mod/mod_speling.html.ja.jis \ manual/mod/mod_status.html \ - manual/mod/mod_unique_id.html \ manual/mod/mod_unique_id.html.en \ manual/mod/mod_unique_id.html.html \ manual/mod/mod_unique_id.html.ja.jis \ - manual/mod/mod_userdir.html \ manual/mod/mod_userdir.html.en \ manual/mod/mod_userdir.html.html \ manual/mod/mod_userdir.html.ja.jis \ manual/mod/mod_usertrack.html \ manual/mod/mod_vhost_alias.html \ - manual/mod/module-dict.html \ manual/mod/module-dict.html.en \ manual/mod/module-dict.html.html \ manual/mod/module-dict.html.ja.jis \ manual/unixware.html \ manual/upgrading_to_1_3.html \ manual/urlmapping.html \ - manual/win_compiling.html \ manual/win_compiling.html.en \ manual/win_compiling.html.html \ manual/win_compiling.html.ja.jis \ manual/win_service.html.en \ manual/win_service.html.html \ manual/win_service.html.ja.jis \ - manual/windows.html \ manual/windows.html.en \ manual/windows.html.ja.jis \ manual/programs/ab.html \ - manual/programs/apachectl.html \ manual/programs/apachectl.html.en \ manual/programs/apachectl.html.html \ manual/programs/apachectl.html.ja.jis \ @@ -551,11 +527,9 @@ MANUALFILES= \ manual/programs/footer.html \ manual/programs/header.html \ manual/programs/htdigest.html \ - manual/programs/htpasswd.html \ manual/programs/htpasswd.html.en \ manual/programs/htpasswd.html.html \ manual/programs/htpasswd.html.ja.jis \ - manual/programs/httpd.html \ manual/programs/httpd.html.en \ manual/programs/httpd.html.html \ manual/programs/httpd.html.ja.jis \ @@ -565,7 +539,6 @@ MANUALFILES= \ manual/programs/logresolve.html \ manual/programs/other.html \ manual/programs/rotatelogs.html \ - manual/programs/suexec.html \ manual/programs/suexec.html.en \ manual/programs/suexec.html.html \ manual/programs/suexec.html.ja.jis \ @@ -573,14 +546,12 @@ MANUALFILES= \ manual/vhosts/details.html \ manual/vhosts/details_1_2.html \ manual/vhosts/examples.html \ - manual/vhosts/fd-limits.html \ manual/vhosts/fd-limits.html.en \ manual/vhosts/fd-limits.html.html \ manual/vhosts/fd-limits.html.ja.jis \ manual/vhosts/footer.html \ manual/vhosts/header.html \ manual/vhosts/host.html \ - manual/vhosts/index.html \ manual/vhosts/index.html.en \ manual/vhosts/index.html.html \ manual/vhosts/index.html.ja.jis \ diff --git a/usr.sbin/httpd/htdocs/manual/configuring.html b/usr.sbin/httpd/htdocs/manual/configuring.html deleted file mode 100644 index d9ffa78580b..00000000000 --- a/usr.sbin/httpd/htdocs/manual/configuring.html +++ /dev/null @@ -1,198 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> -<HEAD> -<TITLE>Configuring Apache</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 - </H3> -</DIV> - -<H1 ALIGN="CENTER">Configuring Apache</H1> - -<H2>Main Configuration Files</H2> - -<P>Apache is configured by placing <A HREF="mod/directives.html" ->directives</A> in plain text configuration files. The main -configuration file is usually called <CODE>httpd.conf</CODE>. The -location of this file is set at compile-time, but may be overridden -with the <CODE>-f</CODE> command line flag. Some sites also have -<CODE>srm.conf</CODE> and <CODE>access.conf</CODE> files for <A -HREF="http://www.apache.org/info/three-config-files.html">historical -reasons</A>. In addition, other configuration files may be added using -the <CODE><A HREF="mod/core.html#include">Include</A></CODE> -directive. Any directive may be placed in any of these configuration -files. Changes to the main configuration files are only recognized by -Apache when it is started or restarted. - -<P>New with Apache 1.3.13 is a feature where if any configuration -file is actually a directory, Apache will enter that directory -and parse any files (and subdirectories) found there as configuration -files. One possible use for this would be to add VirtualHosts -by creating small configuration files for each host, and placing -them in such a configuration directory. Thus, you can add or -remove VirtualHosts without editing any files at all, simply -adding or deleting them. This makes automating such processes -much easier. - -<P> -The server also reads a file containing mime document types; the -filename is set by the <A HREF="mod/mod_mime.html#typesconfig" ->TypesConfig</A> directive, and is <CODE>mime.types</CODE> by default. - -<H2>Syntax of the Configuration Files</H2> - -<P>Apache configuration files contain one directive per line. The -back-slash "\" may be used as the last character on a line to indicate -that the directive continues onto the next line. There must be no -other characters or white space between the back-slash and the end of -the line. To end a line with a literal back-slash, you can escape it -by preceding it with a second back-slash "\\". - -<P>Directives in the configuration files are case-insensitive, but -arguments to directives are often case sensitive. Lines which begin -with the hash character "#" are considered comments, and are ignored. -Comments may <STRONG>not</STRONG> be included on a line after a -configuration directive. Blank lines and white space occurring before -a directive are ignored, so you may indent directives for clarity. - -<P>You can check your configuration files for syntax errors without -starting the server by using <CODE>apachectl configtest</CODE> -or the <CODE>-t</CODE> command line option. - -<H2>Modules</H2> - -<P>Apache is a modular server. This implies that only the most basic -functionality is included in the core server. Extended features are -available through <A HREF="mod/index-bytype.html">modules</A> which can -be loaded into Apache. By default, a <A -HREF="mod/directive-dict.html#Status">base</A> set of modules is -included in the server at compile-time. If the server is compiled to -use <A HREF="dso.html">dynamically loaded</A> modules, then modules -can be compiled separately and added at any time using the <A -HREF="mod/mod_so.html#loadmodule">LoadModule</A> directive. -Otherwise, Apache must be recompiled to add or remove modules. - -<P>To see which modules are currently compiled into the server, -you can use the <CODE>-l</CODE> command line option. - -<H2>Scope of Directives</H2> - -<P>Directives placed in the main configuration files apply to the entire -server. If you wish to change the configuration for only a part of -the server, you can scope your directives by placing them in -<CODE><A HREF="mod/core.html#directory"><Directory></A>, -<A HREF="mod/core.html#directorymatch"><DirectoryMatch></A>, -<A HREF="mod/core.html#files"><Files></A>, -<A HREF="mod/core.html#filesmatch"><FilesMatch></A>, -<A HREF="mod/core.html#location"><Location></A>, -</CODE> and <CODE> -<A HREF="mod/core.html#locationmatch"><LocationMatch></A> -</CODE> -sections. These sections limit the application of the directives -which they enclose to particular filesystem locations or URLs. They -can also be nested, allowing for very fine grained configuration. - -<P>Apache has the capability to serve many different websites -simultaneously. This is called <A HREF="vhosts/">Virtual Hosting</A>. -Directives can also be scoped by placing them inside -<CODE><A HREF="mod/core.html#virtualhost"><VirtualHost></A></CODE> -sections, so that they will only apply to requests for a particular -website. - -<P>Although most directives can be placed in any of these sections, -some directives do not make sense in some contexts. For example, -directives controlling process creation can only be placed in the main -server context. To find which directives can be placed in which -sections, check the <A -HREF="mod/directive-dict.html#Context">Context</A> of the directive. -For further information, we provide details on <A -HREF="sections.html">How Directory, Location and Files sections -work</A>. - -<H2>.htaccess Files</H2> - -<P>Apache allows for decentralized management of configuration via -special files placed inside the web tree. The special files are -usually called <CODE>.htaccess</CODE>, but any name can be specified -in the <A HREF="mod/core.html#accessfilename"><CODE ->AccessFileName</CODE></A> directive. Directives placed in -<CODE>.htaccess</CODE> files apply to the directory where you place -the file, and all sub-directories. The <CODE>.htaccess</CODE> files -follow the same syntax as the main configuration files. Since -<CODE>.htaccess</CODE> files are read on every request, rather than -only at server startup, changes made in these files take immediate -effect. - -<P>To find which directives can be placed in <CODE>.htaccess</CODE> -files, check the <A HREF="mod/directive-dict.html#Context">Context</A> -of the directive. The server administrator further controls what -directives may be placed in <CODE>.htaccess</CODE> files by -configuring the <A -HREF="mod/core.html#allowoverride"><CODE>AllowOverride</CODE></A> -directive in the main configuration files. - -<H2>Log files</H2> -<H3>security warning</H3> -Anyone who can write to the directory where Apache is writing a -log file can almost certainly gain access to the uid that the server is -started as, which is normally root. Do <EM>NOT</EM> give people write -access to the directory the logs are stored in without being aware of -the consequences; see the <A HREF="misc/security_tips.html">security tips</A> -document for details. - -<H3>pid file</H3> - -<P>On startup, Apache saves the process id of the parent httpd process to -the file <CODE>logs/httpd.pid</CODE>. This filename can be changed -with the <A HREF="mod/core.html#pidfile">PidFile</A> directive. The -process-id is for use by the administrator in restarting and -terminating the daemon: on Unix, a HUP or USR1 signal causes the -daemon to re-read its configuration files and a TERM signal causes it -to die gracefully; on Windows, use the -k command line option instead. -For more information see the <A HREF="stopping.html">Stopping and -Restarting</A> page. - -<P> -If the process dies (or is killed) abnormally, then it will be necessary to -kill the children httpd processes. - -<H3>Error log</H3> - -<P>The server will log error messages to a log file, by default -<CODE>logs/error_log</CODE> on Unix or <CODE>logs/error.log</CODE> on -Windows and OS/2. The filename can be set using the <A -HREF="mod/core.html#errorlog">ErrorLog</A> directive; different error -logs can be set for different <A -HREF="mod/core.html#virtualhost">virtual hosts</A>. - -<H3>Transfer log</H3> - -<P>The server will typically log each request to a transfer file, by -default <CODE>logs/access_log</CODE> on Unix or -<CODE>logs/access.log</CODE> on Windows and OS/2. The filename can be -set using a <A HREF="mod/mod_log_config.html#customlog">CustomLog</A> -directive; different transfer logs can be set for different <A -HREF="mod/core.html#virtualhost">virtual hosts</A>. - - -<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/custom-error.html b/usr.sbin/httpd/htdocs/manual/custom-error.html deleted file mode 100644 index ba0602efb5c..00000000000 --- a/usr.sbin/httpd/htdocs/manual/custom-error.html +++ /dev/null @@ -1,189 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> -<HEAD> -<TITLE>Custom error responses</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 - </H3> -</DIV> - -<H1 ALIGN="CENTER">Custom error responses</H1> - -<DL> - -<DT>Purpose - - <DD>Additional functionality. Allows webmasters to configure the response of - Apache to some error or problem. - - <P>Customizable responses can be defined to be activated in the - event of a server detected error or problem. - - <P>e.g. if a script crashes and produces a "500 Server Error" - response, then this response can be replaced with either some - friendlier text or by a redirection to another URL (local or - external). - <P> - -<DT>Old behavior - - <DD>NCSA httpd 1.3 would return some boring old error/problem message - which would often be meaningless to the user, and would provide no - means of logging the symptoms which caused it.<BR> - - <P> - -<DT>New behavior - - <DD>The server can be asked to; - <OL> - <LI>Display some other text, instead of the NCSA hard coded messages, or - <LI>redirect to a local URL, or - <LI>redirect to an external URL. - </OL> - - <P>Redirecting to another URL can be useful, but only if some information - can be passed which can then be used to explain and/or log the - error/problem - more clearly. - - <P>To achieve this, Apache will define new CGI-like environment - variables, <EM>e.g.</EM> - - <BLOCKQUOTE><CODE> -REDIRECT_HTTP_ACCEPT=*/*, image/gif, image/x-xbitmap, image/jpeg <BR> -REDIRECT_HTTP_USER_AGENT=Mozilla/1.1b2 (X11; I; HP-UX A.09.05 9000/712) <BR> -REDIRECT_PATH=.:/bin:/usr/local/bin:/etc <BR> -REDIRECT_QUERY_STRING= <BR> -REDIRECT_REMOTE_ADDR=121.345.78.123 <BR> -REDIRECT_REMOTE_HOST=ooh.ahhh.com <BR> -REDIRECT_SERVER_NAME=crash.bang.edu <BR> -REDIRECT_SERVER_PORT=80 <BR> -REDIRECT_SERVER_SOFTWARE=Apache/0.8.15 <BR> -REDIRECT_URL=/cgi-bin/buggy.pl <BR> - </CODE></BLOCKQUOTE> - - <P>note the <CODE>REDIRECT_</CODE> prefix. - - <P>At least <CODE>REDIRECT_URL</CODE> and <CODE>REDIRECT_QUERY_STRING</CODE> - will - be passed to the new URL (assuming it's a cgi-script or a cgi-include). - The - other variables will exist only if they existed prior to the - error/problem. - <STRONG>None</STRONG> of these will be set if your ErrorDocument is an - <EM>external</EM> redirect (<EM>i.e.</EM>, anything starting with a - scheme name - like <CODE>http:</CODE>, even if it refers to the same host as the - server).<P> - -<DT>Configuration - - <DD> Use of "ErrorDocument" is enabled for .htaccess files when the - <A HREF="mod/core.html#allowoverride">"FileInfo" override</A> is - allowed. - - <P>Here are some examples... - - <BLOCKQUOTE><CODE> -ErrorDocument 500 /cgi-bin/crash-recover <BR> -ErrorDocument 500 "Sorry, our script crashed. Oh dear<BR> -ErrorDocument 500 http://xxx/ <BR> -ErrorDocument 404 /Lame_excuses/not_found.html <BR> -ErrorDocument 401 /Subscription/how_to_subscribe.html - </CODE></BLOCKQUOTE> - - <P>The syntax is, - - <P><CODE><A HREF="mod/core.html#errordocument">ErrorDocument</A></CODE> -<3-digit-code> action - - <P>where the action can be, - - <OL> - <LI>Text to be displayed. Prefix the text with a quote ("). Whatever - follows the quote is displayed. <EM>Note: the (") prefix isn't - displayed.</EM> - - <LI>An external URL to redirect to. - - <LI>A local URL to redirect to. - - </OL> -</DL> - -<P><HR><P> - -<H2>Custom error responses and redirects</H2> - -<DL> - -<DT>Purpose - - <DD>Apache's behavior to redirected URLs has been modified so that additional - environment variables are available to a script/server-include.<P> - -<DT>Old behavior - - <DD>Standard CGI vars were made available to a script which has been - redirected to. No indication of where the redirection came from was - provided. - - <P> - -<DT>New behavior - <DD> - -A new batch of environment variables will be initialized for use by a -script which has been redirected to. Each new variable will have the -prefix <CODE>REDIRECT_</CODE>. <CODE>REDIRECT_</CODE> environment -variables are created from the CGI environment variables which existed -prior to the redirect, they are renamed with a <CODE>REDIRECT_</CODE> -prefix, <EM>i.e.</EM>, <CODE>HTTP_USER_AGENT</CODE> becomes -<CODE>REDIRECT_HTTP_USER_AGENT</CODE>. In addition to these new -variables, Apache will define <CODE>REDIRECT_URL</CODE> and -<CODE>REDIRECT_STATUS</CODE> to help the script trace its origin. -Both the original URL and the URL being redirected to can be logged in -the access log. - -</DL> -<P> -If the ErrorDocument specifies a local redirect to a CGI script, the script -should include a "<SAMP>Status:</SAMP>" header field in its output -in order to ensure the propagation all the way back to the client -of the error condition that caused it to be invoked. For instance, a Perl -ErrorDocument script might include the following: -</P> -<PRE> - : - print "Content-type: text/html\n"; - printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; - : -</PRE> -<P> -If the script is dedicated to handling a particular error condition, such as -<SAMP>404 Not Found</SAMP>, it can use the specific code and -error text instead. -</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/handler.html b/usr.sbin/httpd/htdocs/manual/handler.html deleted file mode 100644 index 25e3c03767c..00000000000 --- a/usr.sbin/httpd/htdocs/manual/handler.html +++ /dev/null @@ -1,207 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> -<HEAD> -<TITLE>Apache's Handler Use</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 - </H3> -</DIV> - -<H1 ALIGN="CENTER">Apache's Handler Use</H1> - -<H2>What is a Handler</H2> - -<P>A "handler" is an internal Apache representation of the action to be -performed when a file is called. Generally, files have implicit -handlers, based on the file type. Normally, all files are simply -served by the server, but certain file typed are "handled" -separately. For example, you may use a type of -"application/x-httpd-cgi" to invoke CGI scripts.</P> - -<P>Apache 1.1 adds the additional ability to use handlers -explicitly. Either based on filename extensions or on location, these -handlers are unrelated to file type. This is advantageous both because -it is a more elegant solution, but it also allows for both a type -<STRONG>and</STRONG> a handler to be associated with a file (See also -<A HREF="mod/mod_mime.html#multipleext">Files with Multiple Extensions</A>) - -</P> - -<P>Handlers can either be built into the server or to a module, or -they can be added with the <A -HREF="mod/mod_actions.html#action">Action</A> directive. The built-in -handlers in the standard distribution are as follows:</P> - -<UL> -<LI><STRONG>default-handler</STRONG>: - Send the file using the <CODE>default_handler()</CODE>, which is the - handler used by default to handle static content. - (core) -<LI><STRONG>send-as-is</STRONG>: - Send file with HTTP headers as is. - (<A HREF="mod/mod_asis.html">mod_asis</A>) -<LI><STRONG>cgi-script</STRONG>: - Treat the file as a CGI script. - (<A HREF="mod/mod_cgi.html">mod_cgi</A>) -<LI><STRONG>imap-file</STRONG>: - Imagemap rule file. - (<A HREF="mod/mod_imap.html">mod_imap</A>) -<LI><STRONG>server-info</STRONG>: - Get the server's configuration information - (<A HREF="mod/mod_info.html">mod_info</A>) -<LI><STRONG>server-parsed</STRONG>: - Parse for server-side includes - (<A HREF="mod/mod_include.html">mod_include</A>) -<LI><STRONG>server-status</STRONG>: - Get the server's status report - (<A HREF="mod/mod_status.html">mod_status</A>) -<LI><STRONG>type-map</STRONG>: - Parse as a type map file for content negotiation - (<A HREF="mod/mod_negotiation.html">mod_negotiation</A>) -</UL> - -<P> - -<H2>Directives</H2> -<UL> -<LI><A HREF="#addhandler">AddHandler</A> -<LI><A HREF="#sethandler">SetHandler</A> -</UL> - -<HR> - -<H2><A NAME="addhandler">AddHandler</A></H2> - -<A - HREF="mod/directive-dict.html#Syntax" - REL="Help" -><STRONG>Syntax:</STRONG></A> AddHandler <EM>handler-name extension extension...</EM><BR> -<A - HREF="mod/directive-dict.html#Context" - REL="Help" -><STRONG>Context:</STRONG></A> server config, virtual host, directory, .htaccess<BR> -<A - HREF="mod/directive-dict.html#Override" - REL="Help" -><STRONG>Override:</STRONG></A> FileInfo<BR> -<A - HREF="mod/directive-dict.html#Status" - REL="Help" -><STRONG>Status:</STRONG></A> Base<BR> -<A - HREF="mod/directive-dict.html#Module" - REL="Help" -><STRONG>Module:</STRONG></A> mod_mime<BR> -<A - HREF="mod/directive-dict.html#Compatibility" - REL="Help" -><STRONG>Compatibility:</STRONG></A> AddHandler is only available in Apache -1.1 and later<P> - -<P>AddHandler maps the filename extensions <EM>extension</EM> to the -handler <EM>handler-name</EM>. This mapping is added to any already -in force, overriding any mappings that already exist for the same -<EM>extension</EM>. - -For example, to activate CGI scripts -with the file extension "<CODE>.cgi</CODE>", you might use: -<PRE> - AddHandler cgi-script cgi -</PRE> - -<P>Once that has been put into your srm.conf or httpd.conf file, any -file containing the "<CODE>.cgi</CODE>" extension will be treated as a -CGI program.</P> - -<P> - -<STRONG>See also</STRONG>: <A HREF="mod/mod_mime.html#multipleext">Files with -multiple extensions</A> - -<HR> - -<H2><A NAME="sethandler">SetHandler</A></H2> - -<A - HREF="mod/directive-dict.html#Syntax" - REL="Help" -><STRONG>Syntax:</STRONG></A> SetHandler <EM>handler-name</EM><BR> -<A - HREF="mod/directive-dict.html#Context" - REL="Help" -><STRONG>Context:</STRONG></A> directory, .htaccess<BR> -<A - HREF="mod/directive-dict.html#Status" - REL="Help" -><STRONG>Status:</STRONG></A> Base<BR> -<A - HREF="mod/directive-dict.html#Module" - REL="Help" -><STRONG>Module:</STRONG></A> mod_mime<BR> -<A - HREF="mod/directive-dict.html#Compatibility" - REL="Help" -><STRONG>Compatibility:</STRONG></A> SetHandler is only available in Apache -1.1 and later.<P> - -<P>When placed into an <CODE>.htaccess</CODE> file or a -<CODE><Directory></CODE> or <CODE><Location></CODE> -section, this directive forces all matching files to be parsed through -the handler given by <EM>handler-name</EM>. For example, if you had a -directory you wanted to be parsed entirely as imagemap rule files, -regardless of extension, you might put the following into an -<CODE>.htaccess</CODE> file in that directory: -<PRE> - SetHandler imap-file -</PRE> - -<P>Another example: if you wanted to have the server display a status -report whenever a URL of <CODE>http://servername/status</CODE> was -called, you might put the following into access.conf: -<PRE> - <Location /status> - SetHandler server-status - </Location> -</PRE> -<HR> - -<H2>Programmer's Note</H2> - -<P>In order to implement the handler features, an addition has been -made to the <A HREF="misc/API.html">Apache API</A> that you may wish to -make use of. Specifically, a new record has been added to the -<CODE>request_rec</CODE> structure:</P> -<PRE> - char *handler -</PRE> -<P>If you wish to have your module engage a handler, you need only to -set <CODE>r->handler</CODE> to the name of the handler at any time -prior to the <CODE>invoke_handler</CODE> stage of the -request. Handlers are implemented as they were before, albeit using -the handler name instead of a content type. While it is not -necessary, the naming convention for handlers is to use a -dash-separated word, with no slashes, so as to not invade the media -type name-space.</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/index.html b/usr.sbin/httpd/htdocs/manual/index.html deleted file mode 100644 index 6919ab1a0f7..00000000000 --- a/usr.sbin/httpd/htdocs/manual/index.html +++ /dev/null @@ -1,89 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> -<HEAD> -<TITLE>Apache 1.3 documentation</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 - </H3> -</DIV> - -<H1 ALIGN="CENTER">Apache 1.3 User's Guide</H1> - -<HR> - -<H3><A NAME="new">Release Notes</A></H3> -<UL> -<LI><A HREF="new_features_1_3.html">New features in Apache 1.3</A> -<LI><A HREF="upgrading_to_1_3.html">Upgrading to Apache 1.3</A> -<LI><A HREF="http://www.apache.org/LICENSE">Apache License</A> -</UL> - -<H3><A NAME="ref">Apache Reference Manual</A></H3> - -<UL> -<LI><A HREF="http://www.apache.org/search.html"> - <STRONG>Search</STRONG></A> for key words -<LI><A HREF="install.html">Compiling and Installing</A> -<LI><A HREF="invoking.html">Starting</A> -<LI><A HREF="stopping.html">Stopping or Restarting</A> -<LI><A HREF="configuring.html">Configuring</A> -<LI><A HREF="mod/directives.html">Run-time configuration directives</A> -<LI>Modules: <A HREF="mod/index-bytype.html">By Type</A> or - <A HREF="mod/index.html">Alphabetical</A> -<LI><A HREF="vhosts/index.html">Virtual Hosts</A> -<LI><A HREF="dso.html">Dynamic Shared Object (DSO) support</A> -<LI><A HREF="handler.html">Handlers</A> -<LI><A HREF="content-negotiation.html">Content negotiation</A> -<LI><A HREF="env.html">Special purpose environment variables</A> -<LI><A HREF="misc/API.html">The Apache API</A> -<LI><A HREF="suexec.html">Using SetUserID Execution for CGI</A> -</UL> - -<H3><A NAME="pla">Platform Specific Notes</A></H3> -<UL> -<LI><A HREF="windows.html">Using Apache with Microsoft Windows</A> -<LI><A HREF="netware.html">Using Apache with Novell Netware 5</A> -<LI><A HREF="mpeix.html">Using Apache with HP MPE/iX</A> -<LI><A HREF="unixware.html">Compiling Apache under UnixWare</A> -<LI><A HREF="readme-tpf.html">Overview of the Apache TPF Port</A> -</UL> - -<H3><A NAME="oth">Other Notes</A></H3> -<UL> -<LI><A HREF="misc/FAQ.html">Frequently Asked Questions</A> -<LI><A HREF="misc/tutorials.html">Tutorials</A> -<LI><A HREF="misc/rewriteguide.html">URL Rewriting Guide</A> -<LI><A HREF="misc/perf-tuning.html">General Performance hints</A> for -getting the best performance out of Apache -<LI><A HREF="misc/perf.html">OS Specific Performance hints</A> to help -fine-tune specific platforms -<LI><A HREF="misc/security_tips.html">Security tips</A> -<LI><A HREF="misc/compat_notes.html">Compatibility Notes with NCSA httpd</A> -<LI><A HREF="misc/howto.html">How do I? documentation</A> -<LI><A HREF="misc/fin_wait_2.html">Discussion of the FIN_WAIT_2 problem</A> -<LI><A HREF="misc/known_client_problems.html">Known problems with various - clients</A> -</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/install.html b/usr.sbin/httpd/htdocs/manual/install.html deleted file mode 100644 index 6548abf12ce..00000000000 --- a/usr.sbin/httpd/htdocs/manual/install.html +++ /dev/null @@ -1,284 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> -<HEAD> -<TITLE>Compiling and Installing Apache</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 - </H3> -</DIV> - - -<H1 ALIGN="CENTER">Compiling and Installing Apache 1.3</H1> - -<P>This document covers compilation and installation of Apache on Unix -systems, using the manual build and install method. If you wish to -use the autoconf-style configure interface, you should instead -read the INSTALL file in the root directory of the Apache source -distribution. For compiling and installation on specific platforms, see</P> -<UL> -<LI><A HREF="windows.html">Using Apache with Microsoft Windows</A> -<LI><A HREF="netware.html">Using Apache with Novell Netware 5</A> -<LI><A HREF="mpeix.html">Using Apache with HP MPE/iX</A> -<LI><A HREF="unixware.html">Compiling Apache under UnixWare</A> -<LI><A HREF="readme-tpf.html">Overview of the Apache TPF Port</A> -</UL> - -<H2>Downloading Apache</H2> - -Information on the latest version of Apache can be found on the Apache -web server at <A -HREF="http://www.apache.org/">http://www.apache.org/</A>. This will -list the current release, any more recent beta-test release, together -with details of mirror web and anonymous ftp sites. - -<P> - -If you downloaded a binary distribution, skip to <A -HREF="#install">Installing Apache</A>. Otherwise read the next section -for how to compile the server. - -<H2>Compiling Apache</H2> - -Compiling Apache consists of three steps: Firstly select which Apache -<STRONG>modules</STRONG> you want to include into the server. Secondly create a -configuration for your operating system. Thirdly compile the -executable. -<P> - -All configuration of Apache is performed in the <CODE>src</CODE> -directory of the Apache distribution. Change into this directory. - -<OL> - <LI> - Select modules to compile into Apache in the - <CODE>Configuration</CODE> file. Uncomment lines corresponding to - those optional modules you wish to include (among the AddModule lines - at the bottom of the file), or add new lines corresponding to - additional modules you have downloaded or written. (See <A - HREF="misc/API.html">API.html</A> for preliminary docs on how to - write Apache modules). Advanced users can comment out some of the - default modules if they are sure they will not need them (be careful - though, since many of the default modules are vital for the correct - operation and security of the server). - <P> - - You should also read the instructions in the <CODE>Configuration</CODE> - file to see if you need to set any of the <CODE>Rule</CODE> lines. - - - <LI> - Configure Apache for your operating system. Normally you can just - type run the <CODE>Configure</CODE> script as given below. However - if this fails or you have any special requirements (<EM>e.g.</EM>, to include - an additional library required by an optional module) you might need - to edit one or more of the following options in the - <CODE>Configuration</CODE> file: - <CODE>EXTRA_CFLAGS, LIBS, LDFLAGS, INCLUDES</CODE>. - <P> - - Run the <CODE>Configure</CODE> script: - <BLOCKQUOTE> - <PRE> - % Configure - Using 'Configuration' as config file - + configured for <whatever> platform - + setting C compiler to <whatever> * - + setting C compiler optimization-level to <whatever> * - + Adding selected modules - + doing sanity check on compiler and options - Creating Makefile in support - Creating Makefile in main - Creating Makefile in os/unix - Creating Makefile in modules/standard - </PRE> - </BLOCKQUOTE> - - (*: Depending on Configuration and your system, Configure - might not print these lines. That's OK).<P> - - This generates a Makefile for use in stage 3. It also creates a - Makefile in the support directory, for compilation of the optional - support programs. - <P> - - (If you want to maintain multiple configurations, you can give a - option to <CODE>Configure</CODE> to tell it to read an alternative - Configuration file, such as <CODE>Configure -file - Configuration.ai</CODE>). - <P> - - <LI> - Type <CODE>make</CODE>. -</OL> - -The modules we place in the Apache distribution are the ones we have -tested and are used regularly by various members of the Apache -development group. Additional modules contributed by members or third -parties with specific needs or functions are available at -<<A HREF="http://www.apache.org/dist/contrib/modules/" - >http://www.apache.org/dist/contrib/modules/</A>>. -There are instructions on that page for linking these modules into the -core Apache code. - -<H2><A NAME="install">Installing Apache</A></H2> - -You will have a binary file called <CODE>httpd</CODE> in the -<CODE>src</CODE> directory. A binary distribution of Apache will -supply this file. <P> - -The next step is to install the program and configure it. Apache is -designed to be configured and run from the same set of directories -where it is compiled. If you want to run it from somewhere else, make -a directory and copy the <CODE>conf</CODE>, <CODE>logs</CODE> and -<CODE>icons</CODE> directories into it. In either case you should -read the <A HREF="misc/security_tips.html#serverroot">security tips</A> -describing how to set the permissions on the server root directory.<P> - -The next step is to edit the configuration files for the server. This -consists of setting up various <STRONG>directives</STRONG> in up to three -central configuration files. By default, these files are located in -the <CODE>conf</CODE> directory and are called <CODE>srm.conf</CODE>, -<CODE>access.conf</CODE> and <CODE>httpd.conf</CODE>. To help you get -started there are same files in the <CODE>conf</CODE> directory of the -distribution, called <CODE>srm.conf-dist</CODE>, -<CODE>access.conf-dist</CODE> and <CODE>httpd.conf-dist</CODE>. Copy -or rename these files to the names without the <CODE>-dist</CODE>. -Then edit each of the files. Read the comments in each file carefully. -Failure to setup these files correctly could lead to your server not -working or being insecure. You should also have an additional file in -the <CODE>conf</CODE> directory called <CODE>mime.types</CODE>. This -file usually does not need editing. - -<P> - -First edit <CODE>httpd.conf</CODE>. This sets up general attributes -about the server: the port number, the user it runs as, <EM>etc.</EM> Next -edit the <CODE>srm.conf</CODE> file; this sets up the root of the -document tree, special functions like server-parsed HTML or internal -imagemap parsing, <EM>etc.</EM> Finally, edit the <CODE>access.conf</CODE> -file to at least set the base cases of access. - -<P> - -In addition to these three files, the server behavior can be configured -on a directory-by-directory basis by using <CODE>.htaccess</CODE> -files in directories accessed by the server. - -<H3>Set your system time properly!</H3> - -Proper operation of a public web server requires accurate time -keeping, since elements of the HTTP protocol are expressed as the time -of day. So, it's time to investigate setting up NTP or some other -time synchronization system on your Unix box, or whatever the -equivalent on NT would be. - -<H3>Starting and Stopping the Server</H3> - -To start the server, simply run <CODE>httpd</CODE>. This will look for -<CODE>httpd.conf</CODE> in the location compiled into the code (by -default <CODE>/usr/local/apache/conf/httpd.conf</CODE>). If -this file is somewhere else, you can give the real -location with the -f argument. For example: - -<PRE> - /usr/local/apache/httpd -f /usr/local/apache/conf/httpd.conf -</PRE> - -If all goes well this will return to the command prompt almost -immediately. This indicates that the server is now up and running. If -anything goes wrong during the initialization of the server you will -see an error message on the screen. - -If the server started ok, you can now use your browser to -connect to the server and read the documentation. If you are running -the browser on the same machine as the server and using the default -port of 80, a suitable URL to enter into your browser is - -<PRE> - http://localhost/ -</PRE> - -<P> - -Note that when the server starts it will create a number of -<EM>child</EM> processes to handle the requests. If you started Apache -as the root user, the parent process will continue to run as root -while the children will change to the user as given in the httpd.conf -file. - -<P> - -If when you run <CODE>httpd</CODE> it complained about being unable to -"bind" to an address, then either some other process is already using -the port you have configured Apache to use, or you are running httpd -as a normal user but trying to use a port below 1024 (such as the -default port 80). - -<P> - -If the server is not running, read the error message displayed -when you run httpd. You should also check the server -error_log for additional information (with the default configuration, -this will be located in the file <CODE>error_log</CODE> in the -<CODE>logs</CODE> directory). - -<P> - -If you want your server to continue running after a system reboot, you -should add a call to <CODE>httpd</CODE> to your system startup files -(typically <CODE>rc.local</CODE> or a file in an -<CODE>rc.<EM>N</EM></CODE> directory). This will start Apache as root. -Before doing this ensure that your server is properly configured -for security and access restrictions. - -<P> - -To stop Apache send the parent process a TERM signal. The PID of this -process is written to the file <CODE>httpd.pid</CODE> in the -<CODE>logs</CODE> directory (unless configured otherwise). Do not -attempt to kill the child processes because they will be renewed by -the parent. A typical command to stop the server is: - -<PRE> - kill -TERM `cat /usr/local/apache/logs/httpd.pid` -</PRE> - -<P> - -For more information about Apache command line options, configuration -and log files, see <A HREF="invoking.html">Starting Apache</A>. For a -reference guide to all Apache directives supported by the distributed -modules, see the <A HREF="mod/directives.html">Apache directives</A>. - -<H2>Compiling Support Programs</H2> - -In addition to the main <CODE>httpd</CODE> server which is compiled -and configured as above, Apache includes a number of support programs. -These are not compiled by default. The support programs are in the -<CODE>support</CODE> directory of the distribution. To compile -the support programs, change into this directory and type -<PRE> - make -</PRE> - -<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/mod/directive-dict.html b/usr.sbin/httpd/htdocs/manual/mod/directive-dict.html deleted file mode 100644 index 6cccc5a2ca6..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/directive-dict.html +++ /dev/null @@ -1,279 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> - <HEAD> - <TITLE>Definitions of terms used to describe Apache directives - </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">Terms Used to Describe Apache Directives</H1> - - <P> - Each Apache configuration directive is described using a common format - that looks like this: - </P> - <DL> - <DD><A - HREF="#Syntax" - REL="Help" - ><STRONG>Syntax:</STRONG></A> <EM>directive-name</EM> <EM>some args</EM> - <BR> - <A - HREF="#Default" - REL="Help" - ><STRONG>Default:</STRONG></A> - <SAMP><EM>directive-name default-value</EM></SAMP> - <BR> - <A - HREF="#Context" - REL="Help" - ><STRONG>Context:</STRONG></A> <EM>context-list</EM> - <BR> - <A - HREF="#Override" - REL="Help" - ><STRONG>Override:</STRONG></A> <EM>override</EM> - <BR> - <A - HREF="#Status" - REL="Help" - ><STRONG>Status:</STRONG></A> <EM>status</EM> - <BR> - <A - HREF="#Module" - REL="Help" - ><STRONG>Module:</STRONG></A> <EM>module-name</EM> - <BR> - <A - HREF="#Compatibility" - REL="Help" - ><STRONG>Compatibility:</STRONG></A> <EM>compatibility notes</EM> - </DD> - </DL> - <P> - Each of the directive's attributes, complete with possible values - where possible, are described in this document. - </P> - - <H2>Directive Terms</H2> - <UL> - <LI><A HREF="#Syntax">Syntax</A> - </LI> - <LI><A HREF="#Default">Default</A> - </LI> - <LI><A HREF="#Context">Context</A> - </LI> - <LI><A HREF="#Override">Override</A> - </LI> - <LI><A HREF="#Status">Status</A> - </LI> - <LI><A HREF="#Module">Module</A> - </LI> - <LI><A HREF="#Compatibility">Compatibility</A> - </LI> - </UL> - - <HR> - <H2><A NAME="Syntax">Syntax</A></H2> - <P> - This indicates the format of the directive as it would appear in a - configuration file. This syntax is extremely directive-specific, so - refer to the text of the directive's description for details. - </P> - - <HR> - <H2><A NAME="Default">Default</A></H2> - <P> - If the directive has a default value (<EM>i.e.</EM>, if you omit it - from your configuration entirely, the Apache Web server will behave as - though you set it to a particular value), it is described here. If - there is no default value, this section should say - "<EM>None</EM>". - </P> - - <HR> - <H2><A NAME="Context">Context</A></H2> - <P> - This indicates where in the server's configuration files the directive - is legal. It's a comma-separated list of one or more of the following - values: - </P> - <DL> - <DT><STRONG>server config</STRONG> - </DT> - <DD>This means that the directive may be used in the server - configuration files (<EM>e.g.</EM>, <SAMP>httpd.conf</SAMP>, - <SAMP>srm.conf</SAMP>, and <SAMP>access.conf</SAMP>), but - <STRONG>not</STRONG> within any <SAMP><VirtualHost></SAMP> or - <Directory> containers. It is not allowed in - <SAMP>.htaccess</SAMP> files at all. - <P> - </P> - </DD> - <DT><STRONG>virtual host</STRONG> - </DT> - <DD>This context means that the directive may appear inside - <SAMP><VirtualHost></SAMP> containers in the server - configuration files. - <P> - </P> - </DD> - <DT><STRONG>directory</STRONG> - </DT> - <DD>A directive marked as being valid in this context may be used - inside <SAMP><Directory></SAMP>, - <SAMP><Location></SAMP>, and <SAMP><Files></SAMP> - containers in the server configuration files, subject to the - restrictions outlined in <A HREF="../sections.html">How Directory, - Location and Files sections work</A>. - <P> - </P> - </DD> - <DT><STRONG>.htaccess</STRONG> - </DT> - <DD>If a directive is valid in this context, it means that it can - appear inside <EM>per</EM>-directory <SAMP>.htaccess</SAMP> files. - It may not be processed, though depending upon the - <A - HREF="#Override" - REL="Help" - >overrides</A> - currently active. - <P> - </P> - </DD> - </DL> - <P> - The directive is <EM>only</EM> allowed within the designated context; - if you try to use it elsewhere, you'll get a configuration error that - will either prevent the server from handling requests in that context - correctly, or will keep the server from operating at all -- - <EM>i.e.</EM>, the server won't even start. - </P> - <P> - The valid locations for the directive are actually the result of a - Boolean OR of all of the listed contexts. In other words, a directive - that is marked as being valid in "<SAMP>server config, - .htaccess</SAMP>" can be used in the <SAMP>httpd.conf</SAMP> file - and in <SAMP>.htaccess</SAMP> files, but not within any - <Directory> or <VirtualHost> containers. - </P> - - <HR> - <H2><A NAME="Override">Override</A></H2> - <P> - This directive attribute indicates which configuration override must - be active in order for the directive to be processed when it appears - in a <SAMP>.htaccess</SAMP> file. If the directive's - <A - HREF="#Context" - REL="Help" - >context</A> - doesn't permit it to appear in <SAMP>.htaccess</SAMP> files, this - attribute should say "<EM>Not applicable</EM>". - </P> - <P> - Overrides are activated by the - <A - HREF="core.html#allowoverride" - REL="Help" - ><SAMP>AllowOverride</SAMP></A> - directive, and apply to a particular scope (such as a directory) and - all descendants, unless further modified by other - <SAMP>AllowOverride</SAMP> directives at lower levels. The - documentation for that directive also lists the possible override - names available. - </P> - - <HR> - <H2><A NAME="Status">Status</A></H2> - <P> - This indicates how tightly bound into the Apache Web server the - directive is; in other words, you may need to recompile the server - with an enhanced set of modules in order to gain access to the - directive and its functionality. Possible values for this attribute - are: - </P> - <DL> - <DT><STRONG>Core</STRONG> - </DT> - <DD>If a directive is listed as having "Core" status, that - means it is part of the innermost portions of the Apache Web server, - and is always available. - <P> - </P> - </DD> - <DT><STRONG>Base</STRONG> - </DT> - <DD>A directive labeled as having "Base" status is - supported by one of the standard Apache modules which is compiled - into the server by default, and is therefore normally available - unless you've taken steps to remove the module from your configuration. - <P> - </P> - </DD> - <DT><STRONG>Extension</STRONG> - </DT> - <DD>A directive with "Extension" status is provided by one - of the modules included with the Apache server kit, but the module - isn't normally compiled into the server. To enable the directive - and its functionality, you will need to change the server build - configuration files and re-compile Apache. - <P> - </P> - </DD> - <DT><STRONG>Experimental</STRONG> - </DT> - <DD>"Experimental" status indicates that the directive is - available as part of the Apache kit, but you're on your own if you - try to use it. The directive is being documented for completeness, - and is not necessarily supported. The module which provides the - directive may or may not be compiled in by default; check the top of - the page which describes the directive and its module to see if it - remarks on the availability. - <P> - </P> - </DD> - </DL> - - <HR> - <H2><A NAME="Module">Module</A></H2> - <P> - This quite simply lists the name of the source module which defines - the directive. - </P> - - <HR> - <H2><A NAME="Compatibility">Compatibility</A></H2> - <P> - If the directive wasn't part of the original Apache version 1 - distribution, the version in which it was introduced should be listed - here. If the directive has the same name as one from the NCSA HTTPd - server, any inconsistencies in behaviour between the two should also - be mentioned. Otherwise, this attribute should say "<EM>No - compatibility issues.</EM>" - </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> - - </BODY> -</HTML> diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_access.html b/usr.sbin/httpd/htdocs/manual/mod/mod_access.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_access.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html b/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_asis.html b/usr.sbin/httpd/htdocs/manual/mod/mod_asis.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_asis.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_cgi.html b/usr.sbin/httpd/htdocs/manual/mod/mod_cgi.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_cgi.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_dll.html b/usr.sbin/httpd/htdocs/manual/mod/mod_dll.html deleted file mode 100644 index c1056cc0c67..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_dll.html +++ /dev/null @@ -1,165 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> -<HEAD> -<TITLE>Apache module mod_dll</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_dll</H1> - -<STRONG><FONT COLOR="red">This module is obsolete. As of version -1.3b6 of Apache, it has been replaced with <A HREF="mod_so.html"> -mod_so</A>. </FONT></STRONG> - -<P> -This module is contained in the <CODE>mod_dll.c</CODE> file, and is -compiled in by default for Windows. It provides for loading of executable code -and modules into the server at start-up time, when they are contained in -Win32 DLLs.</P> - -<H2>Summary</H2> - -<P>The DLL module -loads other modules into the server as it is configuring itself (the -first time only, rereading the config files cannot affect the -state of loaded modules), when these modules are compiled into DLL files.</P> - -<P>This module is included with Apache 1.3 and later, and is available - only when using Microsoft Windows.</P> - -<H2><A NAME="creating">Creating DLL Modules</A></H2> - -<P>The Apache module API is unchanged between the Unix and Windows - versions. Many modules will run on Windows with no or little change - from Unix, although others rely on aspects of the Unix architecture - which are not present in Windows, and will not work.</P> - -<P>When a module does work, it can be added to the server in one of two - ways. As with Unix, it can be compiled into the server. Because Apache - for Windows does not have the <CODE>Configure</CODE> program of Apache - for Unix, the module's source file must be added to the ApacheCore - project file, and its symbols must be added to the - <CODE>nt\modules.c</CODE> file.</P> - -<P>The second way is to compile the module as a DLL, a shared library - that can be loaded into the server at runtime, using the - <CODE><A HREF="#loadmodule">LoadModule</A></CODE> - directive. These module DLLs can be distributed and run on any Apache - for Windows installation, without recompilation of the server.</P> - -<P>To create a module DLL, a small change is necessary to the module's - source file: The module record must be exported from the DLL (which - will be created later; see below). To do this, add the - <CODE>MODULE_VAR_EXPORT</CODE> (defined in the Apache header files) to - your module's module record definition. For example, if your module - has:</P> -<PRE> - module foo_module; -</PRE> -<P>Replace the above with:</P> -<PRE> - module MODULE_VAR_EXPORT foo_module; -</PRE> -<P>Note that this will only be activated on Windows, so the module can - continue to be used, unchanged, with Unix if needed. Also, if you are - familiar with <CODE>.DEF</CODE> files, you can export the module - record with that method instead.</P> - -<P>Now, create a DLL containing your module. You will need to link this - against the ApacheCore.lib export library that is created when the - ApacheCore.dll shared library is compiled. You may also have to change - the compiler settings to ensure that the Apache header files are - correctly located.</P> - -<P>This should create a DLL version of your module. Now simply place it - in the server root, and use the <CODE><A - HREF="#loadmodule">LoadModule</A></CODE> directive to - load it.</P> - -<H2>Directives</H2> -<UL> -<LI><A HREF="#loadfile">LoadFile</A> -<LI><A HREF="#loadmodule">LoadModule</A> -</UL> -<HR> - - -<H2><A NAME="loadfile">LoadFile</A></H2> -<A - HREF="directive-dict.html#Syntax" - REL="Help" -><STRONG>Syntax:</STRONG></A> LoadFile <EM>filename filename ...</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> Core (Windows)<BR> -<A - HREF="directive-dict.html#Module" - REL="Help" -><STRONG>Module:</STRONG></A> mod_dll<P> - -The LoadFile directive links in the named object files or libraries when -the server is started; this is used to load additional code which -may be required for some module to work. <EM>Filename</EM> is relative -to <A HREF="core.html#serverroot">ServerRoot</A>.<P><HR> - -<H2><A NAME="loadmodule">LoadModule</A></H2> -<A - HREF="directive-dict.html#Syntax" - REL="Help" -><STRONG>Syntax:</STRONG></A> LoadModule <EM>module filename</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> Core (Windows)<BR> -<A - HREF="directive-dict.html#Module" - REL="Help" -><STRONG>Module:</STRONG></A> mod_dll<P> - -The LoadModule directive links in the object file or library <EM>filename</EM> -and adds the module structure named <EM>module</EM> to the list of active -modules. <EM>Module</EM> is the name of the external variable of type -<CODE>module</CODE> in the file. Example: - -<BLOCKQUOTE><CODE> -LoadModule status_module modules/ApacheModuleStatus.dll<BR> -</CODE></BLOCKQUOTE> -loads the ApacheModuleStatus.dll module in the modules subdirectory of the -ServerRoot.<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> - -</BODY> -</HTML> - diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_info.html b/usr.sbin/httpd/htdocs/manual/mod/mod_info.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_info.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_negotiation.html b/usr.sbin/httpd/htdocs/manual/mod/mod_negotiation.html deleted file mode 100644 index 9bb3377369d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_negotiation.html +++ /dev/null @@ -1,230 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> -<HEAD> -<TITLE>Apache module mod_negotiation</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_negotiation</H1> - -<p>This module provides for <A -HREF="../content-negotiation.html">content negotiation</A>.</p> - -<P><A -HREF="module-dict.html#Status" -REL="Help" -><STRONG>Status:</STRONG></A> Base -<BR> -<A -HREF="module-dict.html#SourceFile" -REL="Help" -><STRONG>Source File:</STRONG></A> mod_negotiation.c -<BR> -<A -HREF="module-dict.html#ModuleIdentifier" -REL="Help" -><STRONG>Module Identifier:</STRONG></A> negotiation_module -</P> - -<H2>Summary</H2> -Content negotiation, or more accurately content selection, is the -selection of the document that best matches the clients -capabilities, from one of several available documents. -There are two implementations of this. -<UL> -<LI> A type map (a file with the handler <CODE>type-map</CODE>) -which explicitly lists the files containing the variants. -<LI> A MultiViews search (enabled by the MultiViews -<A HREF="core.html#options">Option</A>, where the server does an implicit -filename pattern match, and choose from amongst the results. -</UL> - -<H2>Directives</H2> -<UL> -<LI><A HREF="#cachenegotiateddocs">CacheNegotiatedDocs</A> -<LI><A HREF="#languagepriority">LanguagePriority</A> -</UL> - -<STRONG>See also</STRONG>: -<A HREF="./mod_mime.html#defaultlanguage">DefaultLanguage</A>, -<A HREF="./mod_mime.html#addencoding">AddEncoding</A>, -<A HREF="./mod_mime.html#addlanguage">AddLanguage</A>, -<A HREF="./mod_mime.html#addtype">AddType</A>, and -<A HREF="core.html#options">Options</A>. - -<H2>Type maps</H2> -A type map has the same format as RFC822 mail headers. It contains document -descriptions separated by blank lines, with lines beginning with a hash -character ('#') treated as comments. A document description consists of -several header records; records may be continued on multiple lines if the -continuation lines start with spaces. The leading space will be deleted -and the lines concatenated. A header record consists of a keyword -name, which always ends in a colon, followed by a value. Whitespace is allowed -between the header name and value, and between the tokens of value. - -The headers allowed are: - -<DL> -<DT>Content-Encoding: -<DD>The encoding of the file. Apache only recognizes encodings that are -defined by an <A HREF="mod_mime.html#addencoding">AddEncoding</A> directive. -This normally includes the encodings <CODE>x-compress</CODE> for compress'd -files, and <CODE>x-gzip</CODE> for gzip'd files. The <CODE>x-</CODE> prefix -is ignored for encoding comparisons. -<DT>Content-Language: -<DD>The language of the variant, as an Internet standard language tag -(RFC 1766). An example is <CODE>en</CODE>, meaning English. -<DT>Content-Length: -<DD>The length of the file, in bytes. If this header is not present, then -the actual length of the file is used. -<DT>Content-Type: -<DD>The MIME media type of the document, with optional parameters. -Parameters are separated from the media type and from one another by a -semi-colon, with a syntax of <CODE>name=value</CODE>. Common parameters -include: -<DL> -<DT>level -<DD>an integer specifying the version of the media type. -For <CODE>text/html</CODE> this defaults to 2, otherwise 0. -<DT>qs -<DD>a floating-point number with a value in the range 0.0 to 1.0, - indicating the relative 'quality' of this variant - compared to the other available variants, independent of the client's - capabilities. For example, a jpeg file is usually of higher source - quality than an ascii file if it is attempting to represent a - photograph. However, if the resource being represented is ascii art, - then an ascii file would have a higher source quality than a jpeg file. - All qs values are therefore specific to a given resource. -</DL> -Example: -<BLOCKQUOTE><CODE>Content-Type: image/jpeg; qs=0.8</CODE></BLOCKQUOTE> -<DT>URI: -<DD>The path to the file containing this variant, relative to the map file. -</DL> - -<H2>MultiViews</H2> -A MultiViews search is enabled by the MultiViews -<A HREF="core.html#options">Option</A>. -If the server receives a request for <CODE>/some/dir/foo</CODE> and -<CODE>/some/dir/foo</CODE> does <EM>not</EM> exist, then the server reads the -directory looking for all files named <CODE>foo.*</CODE>, and effectively -fakes up a type map which names all those files, assigning them the same media -types and content-encodings it would have if the client had asked for -one of them by name. It then chooses the best match to the client's -requirements, and returns that document.<P> - - - -<HR> - - -<H2><A NAME="cachenegotiateddocs">CacheNegotiatedDocs</A> directive</H2> -<A - HREF="directive-dict.html#Syntax" - REL="Help" -><STRONG>Syntax:</STRONG></A> CacheNegotiatedDocs<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_negotiation<BR> -<A - HREF="directive-dict.html#Compatibility" - REL="Help" -><STRONG>Compatibility:</STRONG></A> CacheNegotiatedDocs is only available -in Apache 1.1 and later.<P> - -<P>If set, this directive allows content-negotiated documents to be -cached by proxy servers. This could mean that clients behind those -proxys could retrieve versions of the documents that are not the best -match for their abilities, but it will make caching more -efficient. -<P> - -This directive only applies to requests which come from HTTP/1.0 browsers. -HTTP/1.1 provides much better control over the caching of negotiated -documents, and this directive has no effect in responses to -HTTP/1.1 requests. - - - -<H2><A NAME="languagepriority">LanguagePriority</A> directive</H2> -<!--%plaintext <?INDEX {\tt LanguagePriority} directive> --> -<A - HREF="directive-dict.html#Syntax" - REL="Help" -><STRONG>Syntax:</STRONG></A> LanguagePriority <EM>MIME-lang MIME-lang...</EM><BR> -<A - HREF="directive-dict.html#Context" - REL="Help" -><STRONG>Context:</STRONG></A> server config, virtual host, directory, .htaccess<BR> -<A - HREF="directive-dict.html#Override" - REL="Help" -><STRONG>Override:</STRONG></A> FileInfo<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_negotiation<P> - -The LanguagePriority sets the precedence of language variants for the case -where the client does not express a preference, when handling a -MultiViews request. The list of <EM>MIME-lang</EM> are in order of decreasing -preference. Example: - -<BLOCKQUOTE><CODE>LanguagePriority en fr de</CODE></BLOCKQUOTE> - -For a request for <CODE>foo.html</CODE>, where <CODE>foo.html.fr</CODE> -and <CODE>foo.html.de</CODE> both existed, but the browser did not express -a language preference, then <CODE>foo.html.fr</CODE> would be returned.<P> - -<P> - -Note that this directive only has an effect if a 'best' language -cannot be determined by any other means. Correctly implemented -HTTP/1.1 requests will mean this directive has no effect. - -<P> - -<STRONG>See also</STRONG>: -<A HREF="./mod_mime.html#defaultlanguage">DefaultLanguage</A> and -<A HREF="./mod_mime.html#addlanguage">AddLanguage</A> - - -<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> - -</BODY> -</HTML> - diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_so.html b/usr.sbin/httpd/htdocs/manual/mod/mod_so.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_so.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_speling.html b/usr.sbin/httpd/htdocs/manual/mod/mod_speling.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_speling.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_unique_id.html b/usr.sbin/httpd/htdocs/manual/mod/mod_unique_id.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_unique_id.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_userdir.html b/usr.sbin/httpd/htdocs/manual/mod/mod_userdir.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_userdir.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/mod/module-dict.html b/usr.sbin/httpd/htdocs/manual/mod/module-dict.html deleted file mode 100644 index c841c982bdf..00000000000 --- a/usr.sbin/httpd/htdocs/manual/mod/module-dict.html +++ /dev/null @@ -1,149 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> - <HEAD> - <TITLE>Definitions of terms used to describe Apache modules - </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">Terms Used to Describe Apache Modules</H1> - - <P> - Each Apache module is described using a common format that looks - like this: - </P> - <DL> - <DD><A - HREF="#Status" - REL="Help" - ><STRONG>Status:</STRONG></A> <EM>status</EM> - <BR> - <A - HREF="#SourceFile" - REL="Help" - ><STRONG>Source File:</STRONG></A> <EM>source-file</EM> - <BR> - <A - HREF="#ModuleIdentifier" - REL="Help" - ><STRONG>Module Identifier:</STRONG></A> <EM>module-identifier</EM> - <BR> - <A - HREF="#Compatibility" - REL="Help" - ><STRONG>Compatibility:</STRONG></A> <EM>compatibility notes</EM> - </DD> - </DL> - <P> - Each of the attributes, complete with values where possible, are - described in this document. - </P> - - <H2>Module Terms</H2> - <UL> - <LI><A HREF="#Status">Status</A> - </LI> - <LI><A HREF="#SourceFile">Source File</A> - </LI> - <LI><A HREF="#ModuleIdentifier">Module Identifier</A> - </LI> - <LI><A HREF="#Compatibility">Compatibility</A> - </LI> - </UL> - - <HR> - <H2><A NAME="Status">Status</A></H2> - <P> - This indicates how tightly bound into the Apache Web server the - module is; in other words, you may need to recompile the server in - order to gain access to the module and its functionality. Possible - values for this attribute are: - </P> - <DL> - <DT><STRONG>Base</STRONG> - </DT> - <DD>A module labeled as having "Base" status is compiled - and loaded into the server by default, and is therefore normally - available unless you have taken steps to remove the module from your - configuration. - <P> - </P> - </DD> - <DT><STRONG>Extension</STRONG> - </DT> - <DD>A module with "Extension" status is not normally - compiled and loaded into the server. To enable the module and its - functionality, you may need to change the server build - configuration files and re-compile Apache. - <P> - </P> - </DD> - <DT><STRONG>Experimental</STRONG> - </DT> - <DD>"Experimental" status indicates that the module is - available as part of the Apache kit, but you are on your own if you - try to use it. The module is being documented for completeness, - and is not necessarily supported. - <P> - </P> - </DD> - <DT><STRONG>External</STRONG> - </DT> - <DD>Modules which are not included with the base Apache - distribution ("third-party modules") may use the - "External" status. We are not responsible, nor do we - support such modules. - <P> - </P> - </DD> - </DL> - - <HR> - <H2><A NAME="SourceFile">Source File</A></H2> - <P> - This quite simply lists the name of the source file which contains - the code for the module. This is also the name used by the <A - HREF="core.html#ifmodule"><CODE><IfModule></CODE></A> - directive. - </P> - - <HR> - <H2><A NAME="ModuleIdentifier">Module Identifier</A></H2> - <P> - This is a string which identifies the module for use in the <A - HREF="mod_so.html#loadmodule">LoadModule</A> directive when - dynamically loading modules. In particular, it is the name - of the external variable of type module in the source file. - </P> - - <HR> - <H2><A NAME="Compatibility">Compatibility</A></H2> - <P> - If the module was not part of the original Apache version 1 - distribution, the version in which it was introduced should be listed - here. - </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> - - </BODY> -</HTML> diff --git a/usr.sbin/httpd/htdocs/manual/new_features_1_3.html b/usr.sbin/httpd/htdocs/manual/new_features_1_3.html deleted file mode 100644 index 87b2b73677f..00000000000 --- a/usr.sbin/httpd/htdocs/manual/new_features_1_3.html +++ /dev/null @@ -1,705 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML><HEAD> -<TITLE>New features with Apache 1.3</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 - </H3> -</DIV> - -<H1 ALIGN="CENTER">Overview of New Features in Apache 1.3</H1> - -<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> - -<P>If you're upgrading from Apache 1.2, you may wish to read -the <A HREF="upgrading_to_1_3.html">upgrade notes</A>. - -<P>Enhancements: <A HREF="#core">Core</A> | -<A HREF="#performance">Performance</A> | -<A HREF="#config">Configuration</A> | -<A HREF="#mod">Modules</A> | -<A HREF="#api">API</A> | -<A HREF="#misc">Misc</A> - -<P><HR> - -<H2><A NAME="core">Core Enhancements:</A></H2> - -<DL> -<DT><STRONG><A HREF="dso.html">Dynamic Shared Object (DSO) support</A></STRONG> -<DD>Apache modules may now be loaded at runtime; this means that - modules can be loaded into the server process space only when necessary, - thus overall memory usage by Apache will be significantly reduced. DSO - currently is supported on FreeBSD, OpenBSD, NetBSD, Linux, Solaris, SunOS, - Digital UNIX, IRIX, HP/UX, UnixWare, NetWare, AIX, ReliantUnix and generic - SVR4 platforms. - -<DT><STRONG><A HREF="windows.html">Support for Windows NT/95</A></STRONG> -<DD>Apache now experimentally supports the Windows NT and Windows 95 - operating systems. - -<DT><STRONG><A HREF="netware.html">Support for NetWare 5.x</A></STRONG> -<DD>Apache now experimentally supports the NetWare 5.x operating systems. - -<DT><STRONG><A HREF="sourcereorg.html">Re-organized - Sources</A></STRONG> -<DD>The source files for Apache have been re-organized. The main - difference for Apache users is that the "Module" lines in - <CODE>Configuration</CODE> have been replaced with "AddModule" - with a slightly different syntax. For module authors there are - some changes designed to make it easier for users to add their - module. - -<DT><STRONG>Reliable Piped Logs</STRONG> -<DD>On almost all Unix architectures Apache now implements "reliable" - piped logs in <A - HREF="mod/mod_log_config.html">mod_log_config</A>. Where reliable - means that if the logging child dies for whatever reason, Apache - will recover and respawn it without having to restart the entire - server. Furthermore if the logging child becomes "stuck" and - isn't reading its pipe frequently enough Apache will also restart - it. This opens up more opportunities for log rotation, hit - filtering, real-time splitting of multiple vhosts into separate - logs, and asynchronous DNS resolving on the fly. -</DL> - -<P><HR> - -<H2><A NAME="performance">Performance Improvements</A></H2> - -<UL> - <LI>IP-based virtual hosts are looked up via hash table. - <LI><Directory> parsing speedups. - <LI>The critical path for static requests has fewer system calls. - This generally helps all requests. (45 syscalls for a static - request in 1.2 versus 22 in 1.3 in a well tuned - configuration). - <LI><A HREF="mod/mod_proxy.html#proxyreceivebuffersize"> - <CODE>ProxyReceiveBufferSize</CODE></A> directive gives - <CODE>mod_proxy</CODE>'s outgoing connections larger network - buffers, for increased throughput. - <LI>The low level I/O routines use <CODE>writev</CODE> (where - available) to issue multiple writes with a single system call. - They also avoid copying memory into buffers as much as - possible. The result is less CPU time spent on transferring - large files. - <LI>Static requests are served using <CODE>mmap</CODE>, which - means bytes are only copied from the disk buffer to the - network buffer directly by the kernel. The program never - copies bytes around, which reduces CPU time. (Only where - available/tested.) - <LI>When presented with a load spike, the server quickly adapts by - spawning children at faster rates. - <LI>The code which dispatches modules was optimized to avoid - repeatedly skipping over modules that don't implement certain - phases of the API. (This skipping showed up as 5% of the cpu - time on profiles of a server with the default module mix.) - <LI>Revamp of the Unix scoreboard management code so that less - time is spent counting children in various states. Previously - a scan was performed for each hit, now it is performed only - once per second. This should be noticeable on servers running - with hundreds of children and high loads. - <LI>New serialization choices improve performance on Linux, and - IRIX. - <LI><CODE><A - HREF="mod/mod_log_config.html">mod_log_config</A></CODE> can - be compile-time configured to buffer writes. - <LI>Replaced <CODE>strncpy()</CODE> with - <CODE>ap_cpystrn()</CODE>, a routine which doesn't have to - zero-fill the entire result. This has dramatic effects on - <CODE>mod_include</CODE> speed. - <LI>Additions to the internal "table" API (used for keeping lists - of key/value string pairs) provide for up to 20% performance - improvement in many situations. -</UL> - -<P>See <A HREF="misc/perf-tuning.html">the new performance -documentation</A> for more information. - -<P><HR> - -<H2><A NAME="config">Configuration Enhancements</A></H2> - -<DL> -<DT><STRONG>Unified Server Configuration Files</STRONG></DT> -<DD><EM>(Apache 1.3.4)</EM> The contents of the three - server configuration files (<SAMP>httpd.conf</SAMP>, - <SAMP>srm.conf</SAMP>, and <SAMP>access.conf</SAMP>) have - been merged into a single <SAMP>httpd.conf</SAMP> file. - The <SAMP>srm.conf</SAMP> and <SAMP>access.conf</SAMP> files - are now empty except for comments directing the Webmaster - to look in <SAMP>httpd.conf</SAMP>. In addition, the - merged <SAMP>httpd.conf</SAMP> file has been restructured - to allow directives to appear in a hopefully more - intuitive and meaningful order. -</DD> -<DT><STRONG>Continuation Lines in config files</STRONG></DT> -<DD>Directive lines in the server configuration files may now be - split onto multiple lines by using the canonical Unix continuation - mechanism, namely a '\' as the last non-blank character on the - line to indicate that the next line should be concatenated. -</DD> -<DT><STRONG>Apache Autoconf-style Interface (APACI)</STRONG> -<DD>Until Apache 1.3 there was no real out-of-the-box batch-capable - build and installation procedure for the complete Apache - package. This is now provided by a top-level - <CODE>configure</CODE> script and a corresponding top-level - <CODE>Makefile.tmpl</CODE> file. The goal is to provide a GNU - Autoconf-style frontend which is capable to both drive the old - <CODE>src/Configure</CODE> stuff in batch and additionally - installs the package with a GNU-conforming directory layout. Any - options from the old configuration scheme are available plus a lot - of new options for flexibly customizing Apache.<BR> - <STRONG>Note:</STRONG> The default installation layout has changed - for Apache 1.3.4. See the files <CODE>README.configure</CODE> and - <CODE>INSTALL</CODE> for more information. - -<DT><STRONG>APache eXtenSion (APXS) support tool</STRONG> -<DD>Now that Apache provides full support for loading modules under - runtime from dynamic shared object (DSO) files, a new support tool - <CODE>apxs</CODE> was created which provides off-source building, - installing and activating of those DSO-based modules. It - completely hides the platform-dependent DSO-build commands from - the user and provides an easy way to build modules outside the - Apache source tree. To achieve this APACI installs the Apache C - header files together with the <CODE>apxs</CODE> tool. - -<DT><A HREF="install.html#install"><STRONG>Default Apache directory - path changed to <CODE>/usr/local/apache/</CODE></STRONG></A><BR> -<DD>The default directory for the apache ServerRoot changed from the - NCSA-compatible <CODE>/usr/local/etc/httpd/</CODE> to - <CODE>/usr/local/apache/</CODE>. This change covers only the - default setting (and the documentation); it is of course possible - to override it using the <A HREF="invoking.html"> -d - <EM>ServerRoot</EM> and -f <EM>httpd.conf</EM></A> switches when - starting apache. - -<DT><STRONG>Improved HTTP/1.1-style Virtual Hosts</STRONG> -<DD>The new <A - HREF="mod/core.html#namevirtualhost"><CODE>NameVirtualHost</CODE></A> - directive is used to list IP address:port pairs on which - HTTP/1.1-style virtual hosting occurs. This is vhosting based on - the <CODE>Host:</CODE> header from the client. Previously this - address was implicitly the same as the "main address" of the - machine, and this caused no end of problems for users, and was not - powerful enough. Please see the <A - HREF="vhosts/index.html">Apache Virtual Host documentation</A> for - further details on configuration. - -<DT><STRONG><CODE>Include</CODE> directive</STRONG> -<DD>The <A HREF="mod/core.html#include" ><CODE>Include</CODE></A> - directive includes other config files immediately at that point in - parsing. - -<DT><STRONG>-S command line option for debugging vhost setup</STRONG> -<DD>If Apache is invoked with the <CODE>-S</CODE> command line option - it will dump out information regarding how it parsed the - <CODE>VirtualHost</CODE> sections. This is useful for folks - trying to debug their virtual host configuration. - -<DT><STRONG>Control of HTTP methods</STRONG> -<DD><A HREF="mod/core.html#limitexcept"><LimitExcept> and - </LimitExcept></A> are used to enclose a group of access control - directives which will then apply to any HTTP access method not listed in - the arguments; i.e., it is the opposite of a <Limit> section and can be - used to control both standard and nonstandard/unrecognized methods. -</DL> - -<P><HR> - -<H3><A NAME="mod">Module Enhancements</A></H3> - -<DL> -<DT><A HREF="mod/mod_negotiation.html"><STRONG>Improved mod_negotiation - </STRONG></A><BR> -<DD>The optional content negotiation (MultiViews) module has been completely - overhauled for Apache 1.3.4, incorporating the latest HTTP/1.1 - revisions and the experimental Transparent Content Negotion features - of RFC 2295 and RFC 2296. - -<DT><A HREF="mod/mod_speling.html"><STRONG>NEW - Spelling correction - module</STRONG></A><BR> -<DD>This optional module corrects frequently occurring spelling and - capitalization errors in document names requested from the server. - -<DT><A HREF="mod/mod_setenvif.html"><STRONG>NEW - Conditional setting of - environment variables</STRONG></A><BR> -<DD>The addition of - <A HREF="mod/mod_setenvif.html#SetEnvIf"> - <CODE>SetEnvIf</CODE></A> and - <A HREF="mod/mod_setenvif.html#SetEnvIfNoCase"> - <CODE>SetEnvIfNoCase</CODE></A>. These allow you to set - environment variables for server and CGI use based upon attributes - of the request. - -<DT><STRONG><A HREF="mod/mod_mime_magic.html">NEW - "Magic" -MIME-typing</A></STRONG> -<DD>The optional <CODE>mod_mime_magic</CODE> has been - added. It uses "magic numbers" and other hints from a file's - contents to figure out what the contents are. It then uses this - information to set the file's media type, if it cannot be - determined by the file's extension. - -<DT><STRONG><A HREF="mod/mod_unique_id.html">NEW - Unique Request - Identifiers</A></STRONG> -<DD><A HREF="mod/mod_unique_id.html">mod_unique_id</A> can be included - to generate a unique identifier that distinguishes a hit from - every other hit. ("Unique" has some restrictions on it.) The - identifier is available in the environment variable - <CODE>UNIQUE_ID</CODE>. - -<DT><STRONG>mod_proxy enhancements:</STRONG> -<UL> -<LI>Easier and safer authentification for ftp proxy logins: - When no ftp user name and/or password is specified in the - URL, but the destination ftp server requires one, apache now - returns a "[401] Authorization Required" status. This status code - usually makes the client browser pop up an "Enter user name and - password" dialog, and the request is retried with the given user - authentification. That is slightly more secure than specifying - the authentication information as part of the request URL, - where it could be logged in plaintext by older proxy servers. -<LI>The new <SAMP>AllowCONNECT</SAMP> directive allows configuration - of the port numbers to which the proxy CONNECT method may connect. - That allows proxying to https://some.server:8443/ which resulted - in an error message prior to Apache version 1.3.2. -<LI>The proxy now supports the HTTP/1.1 "Via:" header as specified in - RFC2068. The new - <A HREF="mod/mod_proxy.html#proxyvia"><CODE>ProxyVia</CODE></A> - directive allows switching "Via:" support off or on, or - suppressing outgoing "Via:" header lines altogether for privacy - reasons. -<LI>The "Max-Forwards:" TRACE header specified in HTTP/1.1 is now - supported. With it, you can trace the path of a request along a - chain of proxies (if they, too, support it). -<LI><A - HREF="mod/mod_proxy.html#noproxy"><CODE>NoProxy</CODE></A> and <A - HREF="mod/mod_proxy.html#proxydomain"><CODE>ProxyDomain</CODE></A> - directives added to proxy, useful for intranets. -<LI>New <CODE><A HREF="mod/mod_proxy.html#proxypassreverse"> - ProxyPassReverse</A></CODE> directive. It lets Apache adjust the - URL in the <TT>Location</TT> header on HTTP redirect - responses. -<LI>Easier navigation in ftp server directory trees. -</UL> - -<DT><A HREF="mod/mod_include.html#flowctrl"><STRONG>Enhanced - <CODE>mod_include</CODE> string comparisons</STRONG></A><BR> -<DD>The string-based server-side include (SSI) flow-control directives - now include comparison for less-than (<), less-than-or-equal - (<=), greater-than (>), and greater-than-or-equal (>=). - Previously comparisons could only be made for equality or - inequality. - -<DT><STRONG>ServerRoot relative auth filenames</STRONG> -<DD>Auth filenames for the various authentication modules are now - treated as relative to the ServerRoot if they are not full paths. - -<DT><A HREF="mod/mod_autoindex.html"><STRONG>Enhancements to directory - indexing:</STRONG></A> - -<DD><UL> - <LI><STRONG>Code split:</STRONG>The <CODE>mod_dir</CODE> module has - been split in two, with <A - HREF="mod/mod_dir.html">mod_dir</A> handling directory index - files, and <A HREF="mod/mod_autoindex.html">mod_autoindex</A> - creating directory listings. Thus allowing folks to remove the - indexing function from critical servers. - - <LI><STRONG>Sortable:</STRONG> Clicking on a column title will now sort - the listing in order by the values in that column. This feature can - be disabled using the <CODE>SuppressColumnSorting</CODE> <A - HREF="mod/mod_autoindex.html#indexoptions">IndexOptions</A> - keyword. - - <LI><A HREF="mod/mod_autoindex.html#indexoptions:suppresshtmlpreamble"> - <CODE><STRONG>SuppressHTMLPreamble</STRONG></CODE></A> can be used if - your README.html file includes its own HTML header. - - <LI>The <A HREF="mod/mod_autoindex.html#indexoptions"> - <CODE><STRONG>IndexOptions</STRONG></CODE></A> directive now allows - the use of incremental prefixes (+/- to add/remove the respective - keyword feature, as was already possible for the - <A HREF="mod/core.html#options">Options</A> directive) to its - keyword arguments. Multiple IndexOptions directives applying - to the same directory will now be merged. - - <LI><A HREF="mod/mod_autoindex.html#indexoptions:iconheight" - ><STRONG><CODE>IconHeight</CODE></STRONG></A> and - <A HREF="mod/mod_autoindex.html#indexoptions:iconwidth" - ><STRONG><CODE>IconWidth</CODE></STRONG></A> - let you set height and width attributes to the - <CODE><IMG></CODE> tag in directory listings. - - <LI>The new <A HREF="mod/mod_autoindex.html#indexoptions:namewidth" - ><STRONG><CODE>NameWidth</CODE></STRONG></A> keyword to the - <A HREF="mod/mod_autoindex.html#indexoptions">IndexOptions</A> - directive lets you set the number of columns for - <A HREF="mod/mod_autoindex.html#indexoptions:fancyindexing">"fancy" - directory listings</A>. If set to an '*' asterisk, the name width - will be adjusted automatically. - - <LI>The <A HREF="mod/mod_autoindex.html#fancyindexing" - ><SAMP>FancyIndexing</SAMP></A> directive now correctly has - the same impact as - <A HREF="mod/mod_autoindex.html#indexoptions:fancyindexing"><SAMP>IndexOptions FancyIndexing</SAMP></A> - without replacing the effect of any existing <SAMP>IndexOptions</SAMP> - directive. - - </UL> - -<DT><STRONG>Less Buffering of CGI Script Output</STRONG> -<DD>In previous versions of Apache, the output from CGI scripts would - be internally buffered by the server, and wouldn't be forwarded to - the client until either the buffers were full or the CGI script - completed. As of Apache 1.3, the buffer to the client is flushed - any time it contains something and the server is waiting for more - information from the script. This allows CGI script to provide - partial status reports during long processing operations. - - -<DT><STRONG><A HREF="mod/mod_alias.html">Regular Expression support for - <CODE>Alias</CODE> and <CODE>Redirect</CODE></A></STRONG> -<DD>New <A HREF="mod/mod_alias.html#aliasmatch"><CODE>AliasMatch</CODE></A>, - <A HREF="mod/mod_alias.html#scriptaliasmatch" - ><CODE>ScriptAliasMatch</CODE></A>, and - <A HREF="mod/mod_alias.html#redirectmatch"><CODE>RedirectMatch</CODE></A> - directives allow for the use of regular expression matching. - Additionally, new - <A HREF="mod/core.html#directorymatch" - ><CODE><DirectoryMatch></CODE></A>, - <A HREF="mod/core.html#locationmatch" - ><CODE><LocationMatch></CODE></A>, - and - <A HREF="mod/core.html#filesmatch"><CODE><FilesMatch></CODE></A> - sections provide a new syntax for regular expression sectioning. - -<DT><STRONG><A - HREF="mod/mod_info.html#addmoduleinfo"><CODE>AddModuleInfo</CODE></A> - directive added to <A - HREF="mod/mod_info.html">mod_info</A></STRONG> -<DD>Allows additional information to be listed along with a specified - module. - -<DT><STRONG>Absence of any <CODE>TransferLog</CODE> disables - logging</STRONG> -<DD>If no <A HREF="mod/mod_log_config.html#transferlog" - ><CODE>TransferLog</CODE></A> directive is given then no log is - written. This supports co-existence with other logging modules. - -<DT><STRONG>Ability to name logging formats</STRONG> -<DD>The <A - HREF="mod/mod_log_config.html#logformat"><CODE>LogFormat</CODE></A> - directive has been enhanced to allow you to give nicknames to - specific logging formats. You can then use these nicknames in - other <CODE>LogFormat</CODE> and <A - HREF="mod/mod_log_config.html#customlog" - ><CODE>CustomLog</CODE></A> directives, rather than having to - spell out the complete log format string each time. - -<DT><STRONG>Conditional logging</STRONG> -<DD><A HREF="mod/mod_log_config.html#customlog-conditional">mod_log_config</A> - now supports logging based upon environment variables. - mod_log_referer and mod_log_agent are now deprecated. - -<DT><STRONG>mod_cern_meta configurable per-directory</STRONG> -<DD><A HREF="mod/mod_cern_meta.html">mod_cern_meta</A> is now - configurable on a per-directory basis. - -<DT><STRONG>New map types for - <A HREF="mod/mod_rewrite.html#RewriteMap"><CODE>RewriteMap</CODE></A> - directive</STRONG> -<DD>The new map types `Randomized Plain Text' and `Internal Function' - were added to the <CODE>RewriteMap</CODE> directive of - mod_rewrite. They provide two new features: First, you now can - randomly choose a sub-value from a value which was looked-up in a - rewriting map (which is useful when choosing between backend - servers in a Reverse Proxy situation). Second, you now can - translate URL parts to fixed (upper or lower) case (which is - useful when doing mass virtual hosting by the help of - mod_rewrite). - -<DT><STRONG>CIDR and Netmask access control</STRONG> -<DD><A HREF="mod/mod_access.html">mod_access</A> directives now - support CIDR (Classless Inter-Domain Routing) style prefixes, and - netmasks for greater control over IP access lists. - -</DL> -<P><HR> - -<H3><A NAME="api">API Additions and Changes</A></H3> - -<P>For all those module writers and code hackers: - -<DL> -<DT><STRONG><CODE>child_init</CODE></STRONG> -<DD>A new phase for Apache's API is called once per "heavy-weight process," - before any requests are handled. This allows the module to set up - anything that need to be done once per processes. For example, - connections to databases. - -<DT><STRONG><CODE>child_exit</CODE></STRONG> -<DD>A new phase called once per "heavy-weight process," when it is - terminating. Note that it can't be called in some fatal cases (such - as segfaults and kill -9). The <CODE>child_init</CODE> and - <CODE>child_exit</CODE> functions are passed a pool whose lifetime is - the same as the lifetime of the child (modulo completely fatal - events in which apache has no hope of recovering). In contrast, - the module <CODE>init</CODE> function is passed a pool whose lifetime - ends when the parent exits or restarts. - -<DT><STRONG><CODE>child_terminate</CODE></STRONG> -<DD>Used in the child to indicate the child should exit after finishing - the current request. - -<DT><STRONG><CODE>register_other_child</CODE></STRONG> -<DD>See <CODE>http_main.h</CODE>. This is used in the parent to register - a child for monitoring. The parent will report status to a supplied - callback function. This allows modules to create their own children - which are monitored along with the httpd children. - -<DT><STRONG><CODE>piped_log</CODE></STRONG> -<DD>See <CODE>http_log.h</CODE>. This API provides the common code for - implementing piped logs. In particular it implements a reliable piped - log on architectures supporting it (<EM>i.e.</EM>, Unix at the moment). - -<DT><STRONG>scoreboard format changed</STRONG> -<DD>The scoreboard format is quite different. It is considered a - "private" interface in general, so it's only mentioned here as an FYI. - -<DT><STRONG><CODE>set_last_modified</CODE> split into three</STRONG> -<DD>The old function <CODE>set_last_modified</CODE> performed multiple - jobs including the setting of the <CODE>Last-Modified</CODE> header, the - <CODE>ETag</CODE> header, and processing conditional requests (such as - IMS). These functions have been split into three functions: - <CODE>set_last_modified</CODE>, <CODE>set_etag</CODE>, and - <CODE>meets_conditions</CODE>. The field <CODE>mtime</CODE> has been - added to <CODE>request_rec</CODE> to facilitate - <CODE>meets_conditions</CODE>. - -<DT><STRONG>New error logging function: <CODE>ap_log_error</CODE></STRONG> -<DD>All old logging functions are deprecated, we are in the process of - replacing them with a single function called <CODE>ap_log_error</CODE>. - This is still a work in progress. - -<DT><STRONG><CODE>set_file_slot</CODE> for config parsing</STRONG> -<DD>The <CODE>set_file_slot</CODE> routine provides a standard routine that - prepends ServerRoot to non-absolute paths. - -<DT><STRONG><CODE>post_read_request</CODE> module API</STRONG> -<DD>This request phase occurs immediately after reading the request (headers), - and immediately after creating an internal redirect. It is most useful - for setting environment variables to affect future phases. - -<DT><STRONG><CODE>psocket</CODE>, and <CODE>popendir</CODE></STRONG> -<DD>The <CODE>psocket</CODE> and <CODE>pclosesocket</CODE> functions allow - for race-condition free socket creation with resource tracking. - Similarly <CODE>popendir</CODE> and <CODE>pclosedir</CODE> protect - directory reading. - -<DT><STRONG><CODE>is_initial_req</CODE></STRONG> -<DD>Test if the request is the initial request (<EM>i.e.</EM>, the one - coming from the client). - -<DT><STRONG><CODE>kill_only_once</CODE></STRONG> -<DD>An option to <CODE>ap_spawn_child</CODE> functions which prevents Apache - from aggressively trying to kill off the child. - -<DT><STRONG><CODE>alloc debugging code</CODE></STRONG> -<DD>Defining <CODE>ALLOC_DEBUG</CODE> provides a rudimentary memory - debugger which can be used on live servers with low impact -- - it sets all allocated and freed memory bytes to 0xa5. Defining - <CODE>ALLOC_USE_MALLOC</CODE> will cause the alloc code to use - <CODE>malloc()</CODE> and <CODE>free()</CODE> for each object. This - is far more expensive and should only be used for testing with tools - such as Electric Fence and Purify. See <CODE>main/alloc.c</CODE> - for more details. - -<DT><STRONG><CODE>ap_cpystrn</CODE></STRONG> -<DD>The new <CODE>strncpy</CODE> "lookalike", with slightly different - semantics is much faster than <CODE>strncpy</CODE> because it - doesn't have to zero-fill the entire buffer. - -<DT><STRONG><CODE>table_addn</CODE>, <CODE>table_setn</CODE>, - <CODE>table_mergen</CODE></STRONG> -<DD>These new functions do <STRONG>not</STRONG> call <CODE>pstrdup</CODE> - on their arguments. This provides for big speedups. There is - also some debugging support to ensure code uses them properly. - See <CODE>src/CHANGES</CODE> for more information. - -<DT><STRONG><CODE>construct_url</CODE></STRONG> -<DD>The function prototype for this changed from taking a - <CODE>server_rec *</CODE> to taking a <CODE>request_rec *</CODE>. - -<DT><STRONG><CODE>get_server_name</CODE>, <CODE>get_server_port</CODE></STRONG> -<DD>These are wrappers which deal with the - <A HREF="mod/core.html#usecanonicalname">UseCanonicalName</A> directive - when retrieving the server name and port for a request. - -<DT><STRONG>Change to prototype for <CODE>ap_bspawn_child</CODE> and - <CODE>ap_call_exec</CODE></STRONG> -<DD>Added a <CODE>child_info *</CODE> to <CODE>spawn</CODE> function - (as passed to <CODE>ap_bspawn_child</CODE>) and to - <CODE>ap_call_exec</CODE> to allow children to work correctly on Win32. - We also cleaned up the nomenclature a bit, replacing - <CODE>spawn_child_err</CODE> with simply - <CODE>ap_spawn_child</CODE> and <CODE>spawn_child_err_buff</CODE> - with simply <CODE>ap_bspawn_child</CODE>. - -<DT><STRONG><CODE>ap_add_version_component()</CODE></STRONG> -<DD>This API function allows for modules to add their own additional - server tokens which are printed on the on the <CODE>Server:</CODE> - header line. Previous 1.3beta versions had used a - <CODE>SERVER_SUBVERSION</CODE> compile-time <CODE>#define</CODE> - to perform this function. Whether the tokens are actually displayed - is controlled by the new <CODE>ServerTokens</CODE> directive. - -</DL> - -<P><HR> - -<H3><A NAME="misc">Miscellaneous Enhancements</A></H3> - -<DL> -<DT><STRONG><A HREF="ebcdic.html">Port to EBCDIC mainframe machine - running BS2000/OSD</A></STRONG> -<DD>As a premiere, this version of Apache comes with a beta version of - a port to a mainframe machine which uses the EBCDIC character set - as its native codeset (It is the SIEMENS family of mainframes - running the BS2000/OSD operating system on a IBM/390 - compatible processor. This mainframe OS nowadays features a - SVR4-like POSIX subsystem). - -<DT><STRONG><A HREF="mod/core.html#accessfilename"><CODE>AccessFileName</CODE> - Enhancement</A></STRONG> -<DD>The <CODE>AccessFileName</CODE> directive can now take more than - one filename. This lets sites serving pages from network file - systems and more than one Apache web server, configure access - based on the server through which shared pages are being served. - -<DT><STRONG><CODE>HostNameLookups</CODE> now defaults to "Off"</STRONG> -<DD>The <A - HREF="mod/core.html#hostnamelookups"><CODE>HostNameLookups</CODE></A> - directive now defaults to "Off". This means that, unless explicitly - turned on, the server will not resolve IP addresses into names. This - was done to spare the Internet from unnecessary DNS traffic. - -<DT><STRONG>Double-Reverse DNS enforced</STRONG> -<DD>The <A - HREF="mod/core.html#hostnamelookups"><CODE>HostnameLookups</CODE></A> - directive now supports double-reverse DNS. (Known as - <EM>PARANOID</EM> in the terminology of tcp_wrappers.) An IP - address passes a double-reverse DNS test if the forward map of the - reverse map includes the original IP. Regardless of the - HostnameLookups setting, <A - HREF="mod/mod_access.html">mod_access</A> access lists using DNS - names <STRONG>require</STRONG> all names to pass a double-reverse - DNS test. (Prior versions of Apache required a compile-time - switch to enable double-reverse DNS.) - -<DT><STRONG>LogLevel and syslog support</STRONG> -<DD>Apache now has <A HREF="mod/core.html#loglevel">configurable error - logging levels</A> and supports <A - HREF="mod/core.html#errorlog">error logging via syslogd(8)</A>. - -<DT><STRONG>Detaching from stdin/out/err</STRONG> -<DD>On boot Apache will now detach from stdin, stdout, and stderr. It - does not detach from stderr until it has successfully read the - config files. So you will see errors in the config file. This - should make it easier to start Apache via rsh or crontab. - -<DT><A NAME="y2k"><STRONG>Year-2000 Improvements</STRONG></A> -<DD>The default <CODE>timefmt</CODE> string used by <A - HREF="mod/mod_include.html"><CODE>mod_include</CODE></A> has been - modified to display the year using four digits rather than the - two-digit format used previously. The <A - HREF="mod/mod_autoindex.html"><CODE>mod_autoindex</CODE></A> - module has also been modified to display years using four digits - in FancyIndexed directory listings. - -<DT><STRONG>Common routines Moving to a Separate Library</STRONG> -<DD>There are a number of functions and routines that have been - developed for the Apache project that supplement or supersede - library routines that differ from one operating system to another. - While most of these are used only by the Apache server itself, - some are referenced by supporting applications (such as - <CODE>htdigest</CODE>), and these other applications would fail to - build because the routines were built only into the server. These - routines are now being migrated to a separate subdirectory and - library so they can be used by other applications than just the - server. See the <CODE>src/ap/</CODE> subdirectory. - -<DT><STRONG>New <CODE><A HREF="mod/core.html#serversignature"> - ServerSignature</A></CODE> directive</STRONG> -<DD>This directive optionally adds a line containing the server - version and virtual host name to server-generated pages (error - documents, ftp directory listings, mod_info output <EM>etc.</EM>). This - makes it easier for users to tell which server produced the error - message, especially in a proxy chain (often found in intranet - environments). - -<DT><STRONG>New <CODE><A HREF="mod/core.html#usecanonicalname"> - UseCanonicalName</A></CODE> directive</STRONG> -<DD>This directive gives control over how Apache creates - self-referential URLs. Previously Apache would always use the <A - HREF="mod/core.html#servername"> ServerName</A> and <A - HREF="mod/core.html#port">Port</A> directives to construct a - "canonical" name for the server. With <CODE>UseCanonicalName - off</CODE> Apache will use the hostname and port supplied by the - client, if available. - -<DT><STRONG><CODE>SERVER_VERSION</CODE> definition abstracted, and server - build date added</STRONG> -<DD>In earlier versions, the Apache server version was available to - modules through the <CODE>#define</CODE>d value for - <CODE>SERVER_VERSION</CODE>. In order to keep this value - consistent when modules and the core server are compiled at - different times, this information is now available through the - core API routine <CODE>ap_get_server_version()</CODE>. The use of - the <CODE>SERVER_VERSION</CODE> symbol is deprecated. Also, - <CODE>ap_get_server_built()</CODE> returns a string representing - the time the core server was linked. - -<DT><A HREF="mod/core.html#servertokens"><STRONG>Including the operating - system in the server identity</STRONG></A><BR> -<DD>A new directive, <CODE>ServerTokens</CODE>, allows the Webmaster - to change the value of the <CODE>Server</CODE> response header - field which is sent back to clients. The <CODE>ServerTokens</CODE> - directive controls whether the server will include a non-specific - note in the server identity about the type of operating system on - which the server is running as well as included module information. - As of Apache 1.3, this additional information is included by default. - -</DL> - -<DT><STRONG>Support for Netscape style SHA1 encrypted passwords</STRONG><BR> -<DD>To facilitate migration or integration of BasicAuth password - schemes where the password is encrypted using SHA1 (as opposed - to apache's build in MD5 and/or the OS specific crypt(3) function - ) passwords prefixed with with <CODE>{SHA1}</CODE> are taken - as Base64 encoded SHA1 passwords. More information and - some utilities to convert Netscape ldap/ldif entries can be - found in support/SHA1. - -<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/process-model.html b/usr.sbin/httpd/htdocs/manual/process-model.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/process-model.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/programs/apachectl.html b/usr.sbin/httpd/htdocs/manual/programs/apachectl.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/programs/apachectl.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/programs/htpasswd.html b/usr.sbin/httpd/htdocs/manual/programs/htpasswd.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/programs/htpasswd.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/programs/httpd.html b/usr.sbin/httpd/htdocs/manual/programs/httpd.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/programs/httpd.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/programs/suexec.html b/usr.sbin/httpd/htdocs/manual/programs/suexec.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/programs/suexec.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/sections.html b/usr.sbin/httpd/htdocs/manual/sections.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/sections.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/vhosts/fd-limits.html b/usr.sbin/httpd/htdocs/manual/vhosts/fd-limits.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/vhosts/fd-limits.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/vhosts/index.html b/usr.sbin/httpd/htdocs/manual/vhosts/index.html deleted file mode 100644 index 3dc45872da6..00000000000 --- a/usr.sbin/httpd/htdocs/manual/vhosts/index.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<HTML> -<HEAD> -<TITLE>Apache Virtual Host documentation</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">Apache Virtual Host documentation</H1> - -<P>The term <CITE>Virtual Host</CITE> refers to the practice of maintaining -more than one server on one machine, as differentiated by their apparent -hostname. For example, it is often desirable for companies sharing a -web server to have their own domains, with web servers accessible as -<SAMP>www.company1.com</SAMP> and <SAMP>www.company2.com</SAMP>, -without requiring the user to know any extra path information.</P> - -<P>Apache was one of the first servers to support IP-based -virtual hosts right out of the box. Versions 1.1 and later of -Apache support both, IP-based and name-based virtual hosts (vhosts). -The latter variant of virtual hosts is sometimes also called host-based or -non-IP virtual hosts.</P> - -<P>Below is a list of documentation pages which explain all details -of virtual host support in Apache version 1.3 and later.</P> - -<HR> - -<H2>Virtual Host Support</H2> - -<UL> -<LI><A HREF="name-based.html">Name-based Virtual Hosts</A> -<LI><A HREF="ip-based.html">IP-based Virtual Hosts</A> -<LI><A HREF="examples.html">Virtual Host examples for common setups</A> -<LI><A HREF="details.html">In-Depth Discussion of Virtual Host Matching</A> -<LI><A HREF="fd-limits.html">File Descriptor Limits</A> -<LI><A HREF="mass.html">Dynamically Configured Mass Virtual Hosting</A> -</UL> - -<H2>Configuration directives</H2> - -<UL> -<LI><A HREF="../mod/core.html#virtualhost"><VirtualHost></A> -<LI><A HREF="../mod/core.html#namevirtualhost">NameVirtualHost</A> -<LI><A HREF="../mod/core.html#servername">ServerName</A> -<LI><A HREF="../mod/core.html#serveralias">ServerAlias</A> -<LI><A HREF="../mod/core.html#serverpath">ServerPath</A> -</UL> - -<P>Folks trying to debug their virtual host configuration may find the -Apache <CODE>-S</CODE> command line switch useful. It will dump out a -description of how Apache parsed the configuration file. Careful -examination of the IP addresses and server names may help uncover -configuration mistakes. - -<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> - -</BODY> -</HTML> diff --git a/usr.sbin/httpd/htdocs/manual/win_compiling.html b/usr.sbin/httpd/htdocs/manual/win_compiling.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/win_compiling.html +++ /dev/null diff --git a/usr.sbin/httpd/htdocs/manual/windows.html b/usr.sbin/httpd/htdocs/manual/windows.html deleted file mode 100644 index e69de29bb2d..00000000000 --- a/usr.sbin/httpd/htdocs/manual/windows.html +++ /dev/null |