nginx-0.0.7-2004-07-18-23:11:20 import
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index b71979b..6c0e7a1 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -124,9 +124,24 @@
} ngx_http_err_page_t;
-typedef struct {
+typedef struct ngx_http_core_loc_conf_s ngx_http_core_loc_conf_t;
+
+struct ngx_http_core_loc_conf_s {
ngx_str_t name; /* location name */
- void **loc_conf ; /* pointer to the modules' loc_conf */
+
+#if (HAVE_PCRE)
+ ngx_regex_t *regex;
+#endif
+
+ unsigned exact_match:1;
+ unsigned auto_redirect:1;
+ unsigned alias:1;
+
+ /* array of inclusive ngx_http_core_loc_conf_t */
+ ngx_array_t locations;
+
+ /* pointer to the modules' loc_conf */
+ void **loc_conf ;
ngx_http_handler_pt handler;
@@ -157,16 +172,10 @@
ngx_http_cache_hash_t *open_files;
-#if (HAVE_PCRE)
- ngx_regex_t *regex;
-#endif
-
- unsigned exact_match:1;
- unsigned auto_redirect:1;
- unsigned alias:1;
-
ngx_log_t *err_log;
-} ngx_http_core_loc_conf_t;
+
+ ngx_http_core_loc_conf_t *prev_location;
+};
extern ngx_http_module_t ngx_http_core_module_ctx;