httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@hyperreal.org
Subject cvs commit: apache-1.3/src/main http_core.c
Date Wed, 09 Sep 1998 22:05:33 GMT
coar        98/09/09 15:05:32

  Modified:    src      CHANGES
               src/main http_core.c
  Log:
  	The Include directive added during the 1.3 beta cycle was only
  	valid in the server config files outside <Directory> and
  	<Location> containers.  Ease that restriction a bit and
  	allow it inside them (but not in .htaccess files until we
  	figure out the security ramifications).
  
  PR:		2727
  
  Revision  Changes    Path
  1.1048    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1047
  retrieving revision 1.1048
  diff -u -r1.1047 -r1.1048
  --- CHANGES	1998/09/08 21:15:47	1.1047
  +++ CHANGES	1998/09/09 22:05:23	1.1048
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.2
   
  +  *) Allow "Include" directives anywhere in the server config
  +     files (but not .htaccess files).  [Ken Coar] PR#2727
  +
     *) The proxy was refusing to serve CONNECT requests except to
        port 443 (https://) and 563 (snews://). The new AllowCONNECT
        directive allows the configuration of the ports to which a
  
  
  
  1.228     +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.227
  retrieving revision 1.228
  diff -u -r1.227 -r1.228
  --- http_core.c	1998/09/09 12:34:36	1.227
  +++ http_core.c	1998/09/09 22:05:29	1.228
  @@ -2610,7 +2610,7 @@
     "Maximum length of the queue of pending connections, as used by listen(2)" },
   { "CoreDumpDirectory", set_coredumpdir, NULL, RSRC_CONF, TAKE1,
     "The location of the directory Apache changes to before dumping core" },
  -{ "Include", include_config, NULL, RSRC_CONF, TAKE1,
  +{ "Include", include_config, NULL, (RSRC_CONF | ACCESS_CONF), TAKE1,
     "Name of the config file to be included" },
   { "LogLevel", set_loglevel, NULL, RSRC_CONF, TAKE1,
     "Level of verbosity in error logging" },
  
  
  

Mime
View raw message