cvs commit: apache-1.3/src/main http_core.c
dougm 98/11/20 13:17:30
Modified:.STATUS
src CHANGES
src/include ap_mmn.h http_core.h
src/main http_core.c
Log:
ap_exists_config_define() function is now "public"
Submitted by: Doug MacEachern
Reviewed by: Jim, Ben Hyde
Revision ChangesPath
1.543 +0 -4 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -r1.542 -r1.543
--- STATUS1998/11/19 17:46:40 1.542
+++ STATUS1998/11/20 21:17:20 1.543
@@ -318,10 +318,6 @@
PR #1120
Brian: +1
-* un-static-ize ap_exists_config_define() in http_core.c for
- everybody to use
- Doug: +1
-
Win32 specific issues:
Important
1.1149+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1148
retrieving revision 1.1149
diff -u -r1.1148 -r1.1149
--- CHANGES 1998/11/18 09:15:25 1.1148
+++ CHANGES 1998/11/20 21:17:21 1.1149
@@ -1,5 +1,7 @@
Changes with Apache 1.3.4
+ *) ap_exists_config_define() function is now "public"
+
*) Fix documentation of `Action' directive: It can activate a CGI script
when either a handler or a MIME content type is triggered by the
request.
[Andrew Pimlott <[EMAIL PROTECTED]>] PR#3340
1.11 +3 -1 apache-1.3/src/include/ap_mmn.h
Index: ap_mmn.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ap_mmn.h 1998/11/08 09:51:09 1.10
+++ ap_mmn.h 1998/11/20 21:17:25 1.11
@@ -183,12 +183,14 @@
* 19980917 (1.3.2-dev) - bs2000: changed os_set_authfile() to
os_set_account()
* 19981108 (1.3.4-dev) - added ap_method_number_of()
* - changed value of M_INVALID and added WebDAV methods
+ * 19981108.1 - ap_exists_config_define() is now public (minor
bump)
+ *
*/
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 19981108
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward
compat */
/* Useful for testing for features. */
1.51 +1 -0 apache-1.3/src/include/http_core.h
Index: http_core.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- http_core.h 1998/10/16 07:04:45 1.50
+++ http_core.h 1998/11/20 21:17:26 1.51
@@ -133,6 +133,7 @@
API_EXPORT(unsigned) ap_get_server_port(const request_rec *r);
API_EXPORT(unsigned long) ap_get_limit_req_body(const request_rec *r);
API_EXPORT(void) ap_custom_response(request_rec *r, int status, char
*string);
+API_EXPORT(int) ap_exists_config_define(char *name);
/* Authentication stuff. This is one of the places where compatibility
* with the old config files *really* hurts; they don't discriminate at
1.241 +1 -1 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- http_core.c 1998/11/14 00:35:54 1.240
+++ http_core.c 1998/11/20 21:17:28 1.241
@@ -1421,7 +1421,7 @@
return NULL;
}
-static int ap_exists_config_define(char *name)
+API_EXPORT(int) ap_exists_config_define(char *name)
{
char **defines;
int i;
cvs commit: apache-1.3/htdocs/manual/mod mod_alias.html
pcs 98/11/20 09:07:40 Modified:htdocs/manual/mod mod_alias.html Log: Note that Redirect* require FileInfo override. PR: 3346 Revision ChangesPath 1.22 +16 -0 apache-1.3/htdocs/manual/mod/mod_alias.html Index: mod_alias.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_alias.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_alias.html1998/09/17 12:06:39 1.21 +++ mod_alias.html1998/11/20 17:07:38 1.22 @@ -139,6 +139,10 @@ >Context: server config, virtual host, directory, .htaccess Override: FileInfo +Status: Base @@ -219,6 +223,10 @@ REL="Help" >Context: server config, virtual host Override: FileInfo +Status: Base @@ -259,6 +267,10 @@ >Context: server config, virtual host, directory, .htaccess Override: FileInfo +Status: Base @@ -290,6 +302,10 @@ REL="Help" >Context: server config, virtual host, directory, .htaccess +Override: FileInfo
cvs commit: apache-1.3/htdocs/manual install.html invoking.html stopping.html
pcs 98/11/20 08:39:05 Modified:htdocs/manual install.html invoking.html stopping.html Log: Make documentation clearer for Windows users: state when descriptions apply only to Unix; add links to Windows and TPF instructions. Where defaults are different in OS/2 or Windows, show them. Add the -k command line option (Windows only). Revision ChangesPath 1.25 +8 -0 apache-1.3/htdocs/manual/install.html Index: install.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/install.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- install.html 1998/09/17 14:14:48 1.24 +++ install.html 1998/11/20 16:39:03 1.25 @@ -16,6 +16,14 @@ Compiling and Installing Apache 1.3 +This document covers compilation and installation of Apache on Unix +systems only. For compiling and installation on Windows, see Using Apache with Microsoft Windows and for +TPF see Installing the Apache 1.3 HTTP +Server on TPF. + + + UnixWare users will want to consult build notes for various UnixWare versions before compiling. 1.22 +54 -30apache-1.3/htdocs/manual/invoking.html Index: invoking.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/invoking.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- invoking.html 1998/09/17 14:14:48 1.21 +++ invoking.html 1998/11/20 16:39:03 1.22 @@ -16,21 +16,30 @@ Starting Apache Invoking Apache -The httpd program is usually run as a daemon which executes -continuously, handling requests. It is possible to invoke Apache by -the Internet daemon inetd each time a connection to the HTTP -service is made (use the -ServerType directive) -but this is not recommended. +On Unix, the httpd program is usually run as a daemon +which executes continuously, handling requests. It is possible to +invoke Apache by the Internet daemon inetd each time a +connection to the HTTP service is made (use the ServerType directive) but this is +not recommended. + + + +On Windows, Apache is normally run as a service on Windows NT, or as a +console application on Windows 95. See also running Apache for Windows. + Command line options The following options are recognized on the httpd command line: -d serverroot Set the initial value for the ServerRoot variable to -serverroot. This can be overridden by the ServerRoot command in the -configuration file. The default is /usr/local/apache. +serverroot. This can be overridden by the ServerRoot command +in the configuration file. The default is +/usr/local/apache on Unix, /apache on +Windows and /os2httpd on OS/2. -D name Define a name for use in in @@ -86,16 +95,21 @@ errors, display an error message and exit with a non-zero exit status, otherwise display "Syntax OK" and terminate with a zero exit status. +-k option +Windows only: signal Apache to restart or shutdown. option +is one of "shutdown" or "restart". (New in Apache 1.3.3). + -? Print a list of the httpd options, and then exit. Configuration files -The server will read three files for configuration directives. Any directive -may appear in any of these files. The the names of these files are taken -to be relative to the server root; this is set by the -ServerRoot directive, or the --d command line flag. +The server will read three files for configuration directives. Any +directive may appear in any of these files. The the names of these +files are taken to be relative to the server root; this is set by the +ServerRoot directive, the +-d command line flag, or (on Windows only) the registry +(see Running Apache for Windows). Conventionally, the files are: @@ -129,30 +143,40 @@ the consequences; see the security tips document for details. pid file -On daemon startup, it saves the process id of the parent httpd process to -the file logs/httpd.pid. This filename can be changed with the -PidFile directive. The process-id is for -use by the administrator in restarting and terminating the daemon; -A HUP or USR1 signal causes the daemon to re-read its configuration files and -a TERM signal causes it to die gracefully. For more information -see the Stopping and Restarting page. + +On startup, Apache saves the process id of the parent httpd process to +the file logs/httpd.pid. This filename can be changed +with the PidFile 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 th
cvs commit: apache-1.3/htdocs/manual/mod mod_cgi.html
pcs 98/11/20 08:34:17 Modified:htdocs/manual/mod mod_cgi.html Log: Don't assume that filename extension is at the end of the filename PR: 3151 Revision ChangesPath 1.18 +1 -1 apache-1.3/htdocs/manual/mod/mod_cgi.html Index: mod_cgi.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_cgi.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mod_cgi.html 1998/09/13 10:03:57 1.17 +++ mod_cgi.html 1998/11/20 16:34:17 1.18 @@ -28,7 +28,7 @@ or handler cgi-script (Apache 1.1 or later) will be treated as a CGI script, and run by the server, with its output being returned to the client. Files acquire this type either by -having a name ending in an extension defined by the +having a name containing an extension defined by the AddType directive, or by being in a ScriptAlias directory.
cvs commit: apache-1.3/htdocs/manual handler.html
pcs 98/11/20 07:56:35 Modified:htdocs/manual handler.html Log: Add link to description of how files with multiple extensions are handled. At the same time update the descriptions of the directives to make the descriptions in the authoritative file (mod/mod_mime.html). PR: 3151 Revision ChangesPath 1.17 +44 -20apache-1.3/htdocs/manual/handler.html Index: handler.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/handler.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- handler.html 1998/10/29 20:27:13 1.16 +++ handler.html 1998/11/20 15:56:34 1.17 @@ -28,8 +28,11 @@ 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 -and a handler to be associated with a file. +and a handler to be associated with a file (See also +Files with Multiple Extensions) + + Handlers can either be built into the server or to a module, or they can be added with the Action directive. The built-in @@ -78,13 +81,15 @@ Syntax:+>Syntax: AddHandler handler-name extension extension... Context: server config, virtual host, directory, .htaccess +Context: server config, virtual host, directory, - .htaccess +>Override: FileInfo Module: mod_mime +>Module: mod_mime +Compatibility: AddHandler is only available in Apache +1.1 and later + +AddHandler maps the filename extensions extension to the +handler handler-name. This mapping is added to any already +in force, overriding any mappings that already exist for the same +extension. -AddHandler maps the filename extension extension to the -handler handler-name. For example, to activate CGI scripts +For example, to activate CGI scripts with the file extension ".cgi", you might use: AddHandler cgi-script cgi Once that has been put into your srm.conf or httpd.conf file, any -file ending with ".cgi" will be treated as a CGI -program. +file containing the ".cgi" extension will be treated as a +CGI program. + + + +See also: Files with +multiple extensions @@ -112,7 +131,7 @@ Syntax: +>Syntax: SetHandler handler-name Status: Base Module: mod_mime +Module: mod_mime +>Compatibility: SetHandler is only available in Apache +1.1 and later. When placed into an .htaccess file or a - or section, -this directive forces all matching files to be parsed through the -handler given by handler-name. For example, if you had a + or +section, this directive forces all matching files to be parsed through +the handler given by handler-name. 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 -.htaccess file in that directory: +.htaccess file in that directory: SetHandler imap-file + Another example: if you wanted to have the server display a status -report whenever a URL of http://servername/server-status was +report whenever a URL of http://servername/status was called, you might put the following into access.conf: - + SetHandler server-status - - + Programmer's Note
cvs commit: apache-1.3/htdocs/manual/mod mod_mime.html
pcs 98/11/20 07:45:36 Modified:htdocs/manual/mod mod_mime.html Log: Be more careful when documenting the way that extensions are mapped to meta data. Note the effect of multiple extensions in all the Add* directive descriptions, and explain that these directives add or override existing mappings. Remove assumptions that there is only one extension. Add note about how setting both handlers and media types could result in unexpected results. Remove some highly misleading information such as that the type is the extension left "after content-encoding and language extensions have been removed" PR: 3151 Revision ChangesPath 1.25 +91 -41apache-1.3/htdocs/manual/mod/mod_mime.html Index: mod_mime.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_mime.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mod_mime.html 1998/09/17 12:33:07 1.24 +++ mod_mime.html 1998/11/20 15:45:36 1.25 @@ -44,8 +44,14 @@ +Note that changing the type or encoding of a file does not change the +value of the Last-Modified header. Thus, previously cached +copies may still be used by a client or proxy, with the previous headers. + +Files with Multiple Extensions + Files can have more than one extension, and the order of the -extensions is normally irrelevant. For example, if the file +extensions is normally irrelevant. For example, if the file welcome.html.fr maps onto content type text/html and language French then the file welcome.fr.html will map onto exactly the same information. The only exception to this is if an @@ -59,19 +65,26 @@ -Note that changing the type or encoding of a file does not change the -value of the Last-Modified header. Thus, previously cached -copies may still be used by a client or proxy, with the previous headers. +If more than one extension is given which maps onto the same type of +meta-information, then the one to the right will be used. For example, +if ".gif" maps to the MIME-type image/gif and ".html" maps to the +MIME-type text/html, then the file welcome.gif.html will +be associated with the MIME-type "text/html". -Please note that changing a file's type or encoding does not change -the value of the Last-Modified header. Previously cached -copies may still be used by a client or proxy. +Care should be taken when a file with multiple extensions gets +associated with both a MIME-type and a handler. This will usually +result in the request being by the module associated with the +handler. For example, if the .imap extension is mapped to +the handler "imap-file" (from mod_imap) and the .html +extension is mapped to the MIME-type "text/html", then the file +world.imap.html will be associated with both the +"imap-file" handler and "text/html" MIME-type. When it is processed, +the "imap-file" handler will be used, and so it will be treated as a +mod_imap imagemap file. - - - Directives +Directives AddEncoding AddHandler @@ -106,18 +119,20 @@ HREF="directive-dict.html#Module" REL="Help" >Module: mod_mime + +The AddEncoding directive maps the given filename extensions to the +specified encoding type. Mime-enc is the mime encoding to use +for documents containing the extension. This mapping is added +to any already in force, overriding any mappings that already exist +for the same extension. -The AddEncoding directive adds to the list of filename extensions which -filenames may end in for the specified encoding type. Mime-enc -is the mime encoding to use for documents ending in extension. Example: - -AddEncoding x-gzip gz -AddEncoding x-compress Z + AddEncoding x-gzip gz AddEncoding x-compress Z -This will cause files ending in .gz to be marked as encoded using the x-gzip -encoding, and .Z files to be marked as encoded with x-compress. +This will cause filenames containing the .gz extension to be marked as +encoded using the x-gzip encoding, and filenames containing the .Z +extension to be marked as encoded with x-compress. Old clients expect x-gzip and x-compress, however the standard dictates that they're equivalent to gzip @@ -131,6 +146,11 @@ for these two specific encodings. More recent encodings, such as deflate should be specified without the x-. + + +See also: Files with +multiple extensions + AddHandler @@ -162,16 +182,25 @@ 1.1 and later AddHandler maps the filename extensions extension to the -handler -handler-name. For example, to activate CGI scripts +handler handler-name. This +mapping is added to any already in force, overriding any mappings that +already exist for the same extension. + +For example, to activate CGI scripts with the
