mjc 96/04/02 02:20:50
Modified: src http_core.c CHANGES
Log:
Allow "ErrorDocument" directive within .htaccess files. Uses FileInfo
override flag for now.
Revision Changes Path
1.9 +3 -4 apache/src/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C3 -r1.8 -r1.9
*** http_core.c 1996/03/30 07:16:40 1.8
--- http_core.c 1996/04/02 10:20:48 1.9
***************
*** 697,705 ****
return NULL;
}
! /* Note --- change the mask below, and ErrorDocument will work from
! * .htaccess files. The question is, what AllowOverride should webmasters
! * have to turn it off?
*/
command_rec core_cmds[] = {
--- 697,704 ----
return NULL;
}
! /* Note --- ErrorDocument will now work from .htaccess files.
! * The AllowOverride of Fileinfo allows webmasters to turn it off
*/
command_rec core_cmds[] = {
***************
*** 720,726 ****
{ "AccessFileName", set_access_name, NULL, RSRC_CONF, TAKE1, NULL },
{ "DocumentRoot", set_document_root, NULL, RSRC_CONF, TAKE1, NULL },
! { "ErrorDocument", set_error_document, NULL, RSRC_CONF, RAW_ARGS, NULL },
{ "AllowOverride", set_override, NULL, ACCESS_CONF, RAW_ARGS, NULL },
{ "Options", set_options, NULL, OR_OPTIONS, RAW_ARGS, NULL },
{ "DefaultType", set_string_slot,
--- 719,725 ----
{ "AccessFileName", set_access_name, NULL, RSRC_CONF, TAKE1, NULL },
{ "DocumentRoot", set_document_root, NULL, RSRC_CONF, TAKE1, NULL },
! { "ErrorDocument", set_error_document, NULL, OR_FILEINFO, RAW_ARGS, NULL },
{ "AllowOverride", set_override, NULL, ACCESS_CONF, RAW_ARGS, NULL },
{ "Options", set_options, NULL, OR_OPTIONS, RAW_ARGS, NULL },
{ "DefaultType", set_string_slot,
1.20 +5 -1 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.19
retrieving revision 1.20
diff -C3 -r1.19 -r1.20
*** CHANGES 1996/03/31 01:06:58 1.19
--- CHANGES 1996/04/02 10:20:49 1.20
***************
*** 1,3 ****
--- 1,7 ----
+ *) Allow ErrorDocument directive to also be used from .htaccess files.
+ This is enabled/disabled by using the FileInfo flag with
+ AllowOverrides [Mark Cox]
+
*) Add AddHandler command, which allows content-type-independent
"handlers" to be defined for file extensions. These can be either
built into Apache (such as CGI scripts or server-side includes, or
***************
*** 19,25 ****
"ScriptAlias foo.bar.net *.foo.com foo.com" [Alexei Kosut]
*) Added Status module with preliminary documentation available
! http://www.apache.org/docs/1.1/mod_status.html
*) Added simple and complex instrumentation to Apache to allow a
instantaneous status screen to be displayed. Since the complex
--- 23,29 ----
"ScriptAlias foo.bar.net *.foo.com foo.com" [Alexei Kosut]
*) Added Status module with preliminary documentation available
! http://www.apache.org/docs/1.1/mod_status.html [Mark Cox]
*) Added simple and complex instrumentation to Apache to allow a
instantaneous status screen to be displayed. Since the complex
