jim 96/06/08 07:01:38
Modified: src http_core.c
Log:
back-out ConfigDir stuff until we figure out what we want to do
Revision Changes Path
1.16 +0 -40 apache/src/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** http_core.c 1996/06/07 22:47:21 1.15
--- http_core.c 1996/06/08 14:01:36 1.16
***************
*** 612,656 ****
return errmsg;
}
- char *read_configdir (cmd_parms *cmd, void *dummy, char *arg)
- {
- DIR *vdir;
- struct DIR_TYPE *vdir_entry;
- char *dirname, *fname, *p;
-
- dirname = server_root_relative (cmd->pool, arg);
-
- if (!is_directory (dirname))
- log_error ("ConfigDir must be a valid directory", cmd->server);
-
- vdir = opendir (dirname);
-
- if (vdir == NULL) {
- return NULL;
- }
-
- if ((p = strrchr (dirname, '\0')))
- {
- if (*--p != '/')
- dirname = pstrcat (cmd->pool, dirname, "/", NULL);
- }
-
- while ((vdir_entry = readdir (vdir))) {
-
- if ((strstr(vdir_entry->d_name, ".conf")) != NULL)
- {
- fname = pstrcat (cmd->pool, dirname, vdir_entry->d_name, NULL);
- process_resource_config (cmd->server, fname,
- cmd->pool, cmd->temp_pool);
- }
- else
- continue;
- }
-
- closedir (vdir);
- return NULL;
- }
-
char *set_server_string_slot (cmd_parms *cmd, void *dummy, char *arg)
{
/* This one's pretty generic... */
--- 612,617 ----
***************
*** 880,886 ****
"a port number or a numeric IP address and a port number"},
{ "<VirtualHost", virtualhost_section, NULL, RSRC_CONF, RAW_ARGS, NULL },
{ "</VirtualHost>", end_virtualhost_section, NULL, RSRC_CONF, NO_ARGS, NULL
},
- { "ConfigDir", read_configdir, NULL, RSRC_CONF, TAKE1, "directory
containing config files" },
{ NULL },
};
--- 841,846 ----
