aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2002-12-27 07:27:47 +0000
committerIgor Sysoev <igor@sysoev.ru>2002-12-27 07:27:47 +0000
commit6b5c0f70d7cdcc8ac9e63989efcf6911aaf9ab05 (patch)
treeeafd8558e79c67ea1045e9a0bed78f6ba2f92fa8 /src/http/ngx_http.h
parent207ed5a589055899a5841d1a9f3074fc4ff407c5 (diff)
downloadnginx-6b5c0f70d7cdcc8ac9e63989efcf6911aaf9ab05.tar.gz
nginx-6b5c0f70d7cdcc8ac9e63989efcf6911aaf9ab05.zip
nginx-0.0.1-2002-12-27-10:27:47 import
Diffstat (limited to 'src/http/ngx_http.h')
-rw-r--r--src/http/ngx_http.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index 8e94ab9a9..b6bcfe7cc 100644
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -191,7 +191,9 @@ typedef struct {
int index;
void *(*create_srv_conf)(ngx_pool_t *p);
+ void *(*init_srv_conf)(ngx_pool_t *p, void *conf);
void *(*create_loc_conf)(ngx_pool_t *p);
+ void *(*merge_loc_conf)(ngx_pool_t *p, void *prev, void *conf);
int (*translate_handler)(ngx_http_request_t *r);