cvs commit: apache-1.3/src/modules/standard mod_actions.c mod_autoindex.c mod_expires.c mod_include.c mod_log_config.c mod_status.c
jim 00/02/02 12:44:16
Modified:htdocs/manual/mod core.html mod_include.html
src CHANGES
src/include http_core.h httpd.h
src/main http_core.c http_log.c http_protocol.c util.c
src/modules/proxy proxy_util.c
src/modules/standard mod_actions.c mod_autoindex.c
mod_expires.c mod_include.c mod_log_config.c
mod_status.c
Log:
Marc's CSS patch!
Revision ChangesPath
1.163 +38 -0 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- core.html 2000/01/18 19:32:49 1.162
+++ core.html 2000/02/02 20:43:11 1.163
@@ -23,6 +23,8 @@
UL
LIA HREF=#accessconfigAccessConfig/A
LIA HREF=#accessfilenameAccessFileName/A
+LIA HREF=#adddefaultcharsetAddDefaultCharset/A
+LIA HREF=#adddefaultcharsetnameAddDefaultCharsetName/A
LIA HREF=#addmoduleAddModule/A
LIA HREF=#allowoverrideAllowOverride/A
LIA HREF=#authnameAuthName/A
@@ -162,6 +164,42 @@
lt;Directory /gt;BR
AllowOverride NoneBR
lt;/Directorygt;/CODE/BLOCKQUOTEPHR
+
+H2A NAME=adddefaultcharsetAddDefaultCharset directive/A/H2
+A HREF=directive-dict.html#Syntax REL=HelpSTRONGSyntax:/STRONG/A
+AddDefaultCharset EMon / off/EMBR
+A HREF=directive-dict.html#Context REL=Help
STRONGContext:/STRONG/A
+allBR
+A HREF=directive-dict.html#Status REL=Help
STRONGStatus:/STRONG/A
+coreBR
+A HREF=directive-dict.html#Default
REL=HelpSTRONGDefault:/STRONG/A
+CODEAddDefaultCharset off/CODEBR
+A HREF=directive-dict.html#Compatibility REL=HelpSTRONGCompatibility:
+/STRONG/A AddDefaultCharset is only available in Apache 1.3.12 and
laterP
+If enabled, any response that does not have any parameter on the content
+type in the HTTP headers will have a charset parameter added specifying
+the character set the client should use for the document. This will
+override any character set specified in the body of the document via a
+CODEMETA/CODE tag. The character set added is specified by the
+CODEAddDefaultCharsetName/CODE directive.
+PHR
+
+H2A NAME=adddefaultcharsetnameAddDefaultCharsetName directive/A/H2
+A HREF=directive-dict.html#Syntax REL=HelpSTRONGSyntax:/STRONG/A
+AddDefaultCharsetName EMcharset/EMBR
+A HREF=directive-dict.html#Context REL=Help
STRONGContext:/STRONG/A
+allBR
+A HREF=directive-dict.html#Status REL=Help
STRONGStatus:/STRONG/A
+coreBR
+A HREF=directive-dict.html#Default
REL=HelpSTRONGDefault:/STRONG/A
+CODEAddDefaultCharsetName iso-8859-1/CODEBR
+A HREF=directive-dict.html#Compatibility REL=HelpSTRONGCompatibility:
+/STRONG/A AddDefaultCharsetName is only available in Apache 1.3.12 and
+laterP
+This directive specifies the name of the character set that will be added
+if the A HREF=#adddefaultcharsetAddDefaultCharset/A directive is
+enabled.
+PHR
H2A NAME=addmoduleAddModule directive/A/H2
!--%plaintext lt;?INDEX {\tt AddModule} directivegt; --
1.24 +22 -1 apache-1.3/htdocs/manual/mod/mod_include.html
Index: mod_include.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_include.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_include.html 1998/09/17 12:06:40 1.23
+++ mod_include.html 2000/02/02 20:43:16 1.24
@@ -89,15 +89,34 @@
routine when printing dates.
/DL
+A NAME=echo
DTSTRONGecho/STRONG
DD
This command prints one of the include variables, defined below.
If the variable is unset, it is printed as CODE(none)/CODE.
Any dates printed are subject to the currently configured
CODEtimefmt/CODE.
+
Attributes:
DL
DTvar
DDThe value is the name of the variable to print.
+DTencoding
+DDSpecifies how Apache should encode special characters contained
+in the variable before outputting them. If set to none, no encoding
+will be done. If set to url, then URL encoding (also known as
+%-encoding; this is appropriate for use within URLs in links, etc.)
+will be performed. At the start of an CODEecho/CODE element,
+the default is set to entity, resulting in entity encoding (which
+is appropriate in the context of a block-level HTML element, eg.
+a paragraph of text). This can be changed by adding an
+CODEencoding/CODE attribute, which will remain in effect until
+the next CODEencoding/CODE attribute is encountered or the
+element ends, whichever comes first. Note that only special
+characters as defined in the ISO-8859-1 character encoding will be
+encoded. This encoding process may not have the desired result if
+a
cvs commit: apache-1.3/src/modules/standard mod_actions.c
ben 00/01/11 06:23:04
Modified:src CHANGES
src/modules/standard mod_actions.c
Log:
Make Action work when Location doesn't exist.
Submitted by: Manoj
Reviewed by: Ben
Revision ChangesPath
1.1492+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1491
retrieving revision 1.1492
diff -u -r1.1491 -r1.1492
--- CHANGES 2000/01/11 14:13:37 1.1491
+++ CHANGES 2000/01/11 14:22:59 1.1492
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) An Action set for a Location that didn't correspond to a file didn't
+ work. Fixed.
+ [Manoj Kasichainula, Ben Laurie]
+
*) ProxyPass erroneously converted authentication requests to proxy
authentication requests. Fixed.
[Ben Laurie]
1.33 +0 -5 apache-1.3/src/modules/standard/mod_actions.c
Index: mod_actions.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_actions.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_actions.c 1999/12/08 19:01:48 1.32
+++ mod_actions.c 2000/01/11 14:23:03 1.33
@@ -245,11 +245,6 @@
if ((t = ap_table_get(conf-action_types,
action ? action : ap_default_type(r {
script = t;
- if (r-finfo.st_mode == 0) {
- ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
- File does not exist: %s, r-filename);
- return NOT_FOUND;
- }
}
if (script == NULL) {
cvs commit: apache-1.3/src/modules/standard mod_actions.c mod_alias.c mod_dir.c mod_include.c mod_negotiation.c mod_rewrite.c
rse 99/01/01 09:18:03
Modified:src CHANGES
src/include ap_mmn.h httpd.h
src/main http_request.c util.c util_script.c
src/modules/standard mod_actions.c mod_alias.c mod_dir.c
mod_include.c mod_negotiation.c mod_rewrite.c
Log:
Renamed the API macro escape_uri() to ap_escape_uri() which was
forgotten (because it was a macro) in the symbol renaming process.
Revision ChangesPath
1.1186+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1185
retrieving revision 1.1186
diff -u -r1.1185 -r1.1186
--- CHANGES 1999/01/01 17:03:09 1.1185
+++ CHANGES 1999/01/01 17:17:54 1.1186
@@ -1,4 +1,8 @@
Changes with Apache 1.3.4
+
+ *) Renamed the macro escape_uri() to ap_escape_uri() which was
+ forgotten (because it was a macro) in the symbol renaming process.
+ [Ralf S. Engelschall]
*) Fix some inconsistencies related to the scopes of directives. The only
user visible change is that the directives `UseCanonicalName' and
1.15 +2 -1 apache-1.3/src/include/ap_mmn.h
Index: ap_mmn.h
===
RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ap_mmn.h 1998/12/29 09:46:15 1.14
+++ ap_mmn.h 1999/01/01 17:17:57 1.15
@@ -192,10 +192,11 @@
*-- added ap_single_module_init()
* 19981229 - mod_negotiation overhaul -- added ap_make_etag()
*and added vlist_validator to request_rec.
+ * 19990101 - renamed macro escape_uri() to ap_escape_uri()
*/
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 19981229
+#define MODULE_MAGIC_NUMBER_MAJOR 19990101
#endif
#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward
compat */
1.255 +1 -1 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- httpd.h 1998/12/29 09:46:15 1.254
+++ httpd.h 1999/01/01 17:17:57 1.255
@@ -943,7 +943,7 @@
API_EXPORT(void) ap_getparents(char *name);
API_EXPORT(char *) ap_escape_path_segment(pool *p, const char *s);
API_EXPORT(char *) ap_os_escape_path(pool *p, const char *path, int partial);
-#define escape_uri(ppool,path) ap_os_escape_path(ppool,path,1)
+#define ap_escape_uri(ppool,path) ap_os_escape_path(ppool,path,1)
API_EXPORT(char *) ap_escape_html(pool *p, const char *s);
API_EXPORT(char *) ap_construct_server(pool *p, const char *hostname,
unsigned port, const request_rec *r);
1.139 +1 -1 apache-1.3/src/main/http_request.c
Index: http_request.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- http_request.c1998/12/29 09:46:17 1.138
+++ http_request.c1999/01/01 17:17:58 1.139
@@ -717,7 +717,7 @@
ap_parse_uri(rnew, new_file);
else {
udir = ap_make_dirstr_parent(rnew-pool, r-uri);
-udir = escape_uri(rnew-pool, udir);/* re-escape it */
+udir = ap_escape_uri(rnew-pool, udir);/* re-escape it */
ap_parse_uri(rnew, ap_make_full_path(rnew-pool, udir, new_file));
}
1.142 +1 -1 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- util.c1998/12/02 00:00:07 1.141
+++ util.c1999/01/01 17:17:58 1.142
@@ -1253,7 +1253,7 @@
return copy;
}
-/* escape_uri is now a macro for os_escape_path */
+/* ap_escape_uri is now a macro for os_escape_path */
API_EXPORT(char *) ap_escape_html(pool *p, const char *s)
{
1.136 +1 -1 apache-1.3/src/main/util_script.c
Index: util_script.c
===
RCS file: /home/cvs/apache-1.3/src/main/util_script.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- util_script.c 1998/11/01 08:45:29 1.135
+++ util_script.c 1999/01/01 17:17:59 1.136
@@ -396,7 +396,7
cvs commit: apache-1.3/src/modules/standard mod_actions.c
fielding98/11/08 01:51:12 Modified:src CHANGES src/include ap_mmn.h http_protocol.h httpd.h src/main http_core.c http_protocol.c src/modules/standard mod_actions.c Log: Enabled all of the WebDAV method names for use by third-party modules, Limit, and Script directives. That includes PATCH, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, and UNLOCK. Improved mod_actions.c so that it can use any of the methods defined in httpd.h. Added ap_method_number_of(method) for getting the internal method number. I would have preferred to use a configurable table for new methods, but the current API is too dependent on methods being represented as a bitmask. We need to rethink this in the next major server version. Revision ChangesPath 1.1140+7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1139 retrieving revision 1.1140 diff -u -r1.1139 -r1.1140 --- CHANGES 1998/11/07 14:31:21 1.1139 +++ CHANGES 1998/11/08 09:51:07 1.1140 @@ -1,5 +1,12 @@ Changes with Apache 1.3.4 + *) Enabled all of the WebDAV method names for use by third-party + modules, Limit, and Script directives. That includes PATCH, + PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, and UNLOCK. + Improved mod_actions.c so that it can use any of the methods + defined in httpd.h. Added ap_method_number_of(method) for + getting the internal method number. [Roy Fielding] + *) PORT: Add a port to the TPF OS. [Joe Moenich [EMAIL PROTECTED] and others at IBM] 1.10 +3 -1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ap_mmn.h 1998/10/03 18:46:01 1.9 +++ ap_mmn.h 1998/11/08 09:51:09 1.10 @@ -181,10 +181,12 @@ *(for implementing better error reporting). * 19980906 (1.3.2-dev) - added ap_md5_binary() * 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 */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 19980917 +#define MODULE_MAGIC_NUMBER_MAJOR 19981108 #endif #define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ 1.46 +5 -0 apache-1.3/src/include/http_protocol.h Index: http_protocol.h === RCS file: /home/cvs/apache-1.3/src/include/http_protocol.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- http_protocol.h 1998/08/09 14:33:10 1.45 +++ http_protocol.h 1998/11/08 09:51:09 1.46 @@ -209,6 +209,11 @@ CORE_EXPORT(void) ap_parse_uri(request_rec *r, const char *uri); +/* Get the method number associated with the given string, assumed to + * contain an HTTP method. Returns M_INVALID if not recognized. + */ +API_EXPORT(int) ap_method_number_of(const char *method); + #ifdef __cplusplus } #endif 1.251 +21 -9 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- httpd.h 1998/11/05 20:07:51 1.250 +++ httpd.h 1998/11/08 09:51:09 1.251 @@ -531,16 +531,28 @@ ((x) == HTTP_SERVICE_UNAVAILABLE) || \ ((x) == HTTP_NOT_IMPLEMENTED)) +/* Methods recognized (but not necessarily handled) by the server. + * These constants are used in bit shifting masks of size int, so it is + * unsafe to have more methods than bits in an int. HEAD == M_GET. + */ +#define M_GET0 +#define M_PUT1 +#define M_POST 2 +#define M_DELETE 3 +#define M_CONNECT4 +#define M_OPTIONS5 +#define M_TRACE 6 +#define M_PATCH 7 +#define M_PROPFIND 8 +#define M_PROPPATCH 9 +#define M_MKCOL 10 +#define M_COPY 11 +#define M_MOVE 12 +#define M_LOCK 13 +#define M_UNLOCK14 -#define METHODS 8 -#define M_GET 0 -#define M_PUT 1 -#define M_POST 2 -#define M_DELETE 3 -#define M_CONNECT 4 -#define M_OPTIONS 5 -#define M_TRACE 6 -#define M_INVALID 7 +#define METHODS 15 +#define M_INVALID 31 #define
cvs commit: apache-1.3/src/modules/standard mod_actions.c mod_auth.c mod_headers.c mod_log_config.c mod_mime.c mod_setenvif.c mod_userdir.c
dgaudet 98/03/12 03:13:28
Modified:src/modules/standard mod_actions.c mod_auth.c mod_headers.c
mod_log_config.c mod_mime.c mod_setenvif.c
mod_userdir.c
Log:
save more memory! table_set - table_setn transformations for those cases
where there's no need to pstrdup the arguments.
Revision ChangesPath
1.23 +1 -1 apache-1.3/src/modules/standard/mod_actions.c
Index: mod_actions.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_actions.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_actions.c 1998/03/12 11:02:59 1.22
+++ mod_actions.c 1998/03/12 11:13:23 1.23
@@ -121,7 +121,7 @@
static const char *add_action(cmd_parms *cmd, action_dir_config * m, char
*type,
char *script)
{
-table_set(m-action_types, type, script);
+table_setn(m-action_types, type, script);
return NULL;
}
1.32 +1 -1 apache-1.3/src/modules/standard/mod_auth.c
Index: mod_auth.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_auth.c1998/01/07 16:46:43 1.31
+++ mod_auth.c1998/03/12 11:13:23 1.32
@@ -168,7 +168,7 @@
while (ll[0]) {
w = getword_conf(sp, ll);
if (!strcmp(w, user)) {
- table_set(grps, group_name, in);
+ table_setn(grps, pstrdup(p, group_name), in);
break;
}
}
1.14 +3 -3 apache-1.3/src/modules/standard/mod_headers.c
Index: mod_headers.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_headers.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_headers.c 1998/03/12 11:03:02 1.13
+++ mod_headers.c 1998/03/12 11:13:24 1.14
@@ -206,13 +206,13 @@
header_entry *hdr = ((header_entry *) (headers-elts))[i];
switch (hdr-action) {
case hdr_add:
-table_add(r-headers_out, hdr-header, hdr-value);
+table_addn(r-headers_out, hdr-header, hdr-value);
break;
case hdr_append:
-table_merge(r-headers_out, hdr-header, hdr-value);
+table_mergen(r-headers_out, hdr-header, hdr-value);
break;
case hdr_set:
-table_set(r-headers_out, hdr-header, hdr-value);
+table_setn(r-headers_out, hdr-header, hdr-value);
break;
case hdr_unset:
table_unset(r-headers_out, hdr-header);
1.48 +1 -1 apache-1.3/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mod_log_config.c 1998/03/03 08:31:28 1.47
+++ mod_log_config.c 1998/03/12 11:13:25 1.48
@@ -828,7 +828,7 @@
if (name != NULL) {
parse_log_string(cmd-pool, fmt, err_string);
if (err_string == NULL) {
-table_set(mls-formats, name, fmt);
+table_setn(mls-formats, name, fmt);
}
}
else {
1.33 +1 -1 apache-1.3/src/modules/standard/mod_mime.c
Index: mod_mime.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_mime.c1998/03/12 10:29:05 1.32
+++ mod_mime.c1998/03/12 11:13:25 1.33
@@ -228,7 +228,7 @@
while (ll[0]) {
char *ext = getword_conf(p, ll);
str_tolower(ext); /* ??? */
-table_set(hash_buckets[hash(ext[0])], ext, ct);
+table_setn(hash_buckets[hash(ext[0])], ext, ct);
}
}
cfg_closefile(f);
1.17 +3 -3 apache-1.3/src/modules/standard/mod_setenvif.c
Index: mod_setenvif.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_setenvif.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_setenvif.c1998/02/23 10:53:31 1.16
+++ mod_setenvif.c1998/03/12 11:13:26 1.17
@@ -204,13 +204,13 @@
var = getword(cmd-pool, feature, '=');
if (*feature) {
-
