commit 43f131923f25600c771e014a7eebf74d407776a7
author Igor Sysoev <igor@sysoev.ru> Mon Apr 12 16:38:09 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Apr 12 16:38:09 2004 +0000
tree 19e9a678f68d0d434fbcc13c52c9507bfc66eb28
parent 076498e356546713a4b40edea95bcc1a30c45a98

nginx-0.0.3-2004-04-12-20:38:09 import

src/core/ngx_conf_file.c

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 8f409ea..76a665d 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -13,9 +13,7 @@
     NGX_CONF_TAKE4,
     NGX_CONF_TAKE5,
     NGX_CONF_TAKE6,
-    NGX_CONF_TAKE7,
-    NGX_CONF_TAKE8,
-    NGX_CONF_TAKE9,
+    NGX_CONF_TAKE7
 };
 
 static int ngx_conf_read_token(ngx_conf_t *cf);
@@ -204,7 +202,10 @@
 
                     conf = NULL;
 
-                    if (cf->module_type == NGX_CORE_MODULE) {
+                    if (cmd->type & NGX_DIRECT_CONF) {
+                        conf = ((void **) cf->ctx)[ngx_modules[m]->index];
+
+                    } else if (cmd->type & NGX_MAIN_CONF) {
                         conf = &(((void **) cf->ctx)[ngx_modules[m]->index]);
 
                     } else if (cf->ctx) {
@@ -564,27 +565,6 @@
 }
 
 
-char *ngx_conf_set_core_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd,
-                                  void *conf)
-{
-    return ngx_conf_set_flag_slot(cf, cmd, *(void **)conf);
-}
-
-
-char *ngx_conf_set_core_num_slot(ngx_conf_t *cf, ngx_command_t *cmd,
-                                 void *conf)
-{
-    return ngx_conf_set_num_slot(cf, cmd, *(void **)conf);
-}
-
-
-char *ngx_conf_set_core_str_slot(ngx_conf_t *cf, ngx_command_t *cmd,
-                                 void *conf)
-{
-    return ngx_conf_set_str_slot(cf, cmd, *(void **)conf);
-}
-
-
 char *ngx_conf_set_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     char  *p = conf;