httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@hyperreal.org>
Subject cvs commit: apachen/src/core http_core.c
Date Sat, 23 Aug 1997 01:52:54 GMT
randy       97/08/22 18:52:53

  Modified:    src      CHANGES
               src/core http_core.c
  Log:
  Add 'Include' directive.
  
  Revision  Changes    Path
  1.407     +3 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.406
  retrieving revision 1.407
  diff -u -r1.406 -r1.407
  --- CHANGES	1997/08/22 08:10:11	1.406
  +++ CHANGES	1997/08/23 01:52:37	1.407
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3a2
   
  +  *) Add 'Include' directive to allow inclusion of configuration
  +     files within configuration files. [Randy Terbush]
  +
     *) Proxy errors on connect() are logged to the error_log (nothing
        new); now they include the IP address and port that failed
        (*that's* new).  PR#352  [Ken Coar, Marc Slemko]
  
  
  
  1.113     +10 -0     apachen/src/core/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/core/http_core.c,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- http_core.c	1997/08/18 07:19:34	1.112
  +++ http_core.c	1997/08/23 01:52:51	1.113
  @@ -1363,6 +1363,15 @@
       return NULL;
   }
   
  +const char *include_config (cmd_parms *cmd, void *dummy, char *name)
  +{
  +    name = server_root_relative(cmd->pool, name);
  +    
  +    process_resource_config(cmd->server, name, cmd->pool, cmd->temp_pool);
  +
  +    return NULL;
  +}
  +
   /* Note --- ErrorDocument will now work from .htaccess files.  
    * The AllowOverride of Fileinfo allows webmasters to turn it off
    */
  @@ -1488,6 +1497,7 @@
   { "ExcessRequestsPerChild", set_excess_requests, NULL, RSRC_CONF, TAKE1, "Maximum number
of requests a particular child serves after it is ready to die." },
   { "ListenBacklog", set_listenbacklog, NULL, RSRC_CONF, TAKE1, "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, "config file to be included" },
   { NULL },
   };
   
  
  
  

Mime
View raw message