mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.1-2002-12-27-19:22:50 import

Browse Source
This commit is contained in:
Igor Sysoev 2002-12-27 16:22:50 +00:00
parent 6b5c0f70d7
commit c1817846d2
12 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/nginx.c
View File

@ -2,6 +2,7 @@
#include <nginx.h> #include <nginx.h>
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_string.h> #include <ngx_string.h>
#include <ngx_errno.h> #include <ngx_errno.h>
#include <ngx_time.h> #include <ngx_time.h>
@ -12,6 +13,7 @@
#include <ngx_server.h> #include <ngx_server.h>
#include <ngx_connection.h> #include <ngx_connection.h>
#include <ngx_listen.h> #include <ngx_listen.h>
#include <ngx_conf_file.h>
/* STUB */ /* STUB */
#include <ngx_http.h> #include <ngx_http.h>
@ -62,6 +64,7 @@ int main(int argc, char *const *argv)
ngx_create_array(ngx_pool, 10, sizeof(ngx_str_t)), 1); ngx_create_array(ngx_pool, 10, sizeof(ngx_str_t)), 1);
conf.pool = ngx_pool; conf.pool = ngx_pool;
conf.log = &ngx_log; conf.log = &ngx_log;
conf.type = NGX_CORE_MODULE_TYPE;
conf_file.len = sizeof("nginx.conf") - 1; conf_file.len = sizeof("nginx.conf") - 1;
conf_file.data = "nginx.conf"; conf_file.data = "nginx.conf";

8
src/core/ngx_config_file.c → src/core/ngx_conf_file.c
View File

@ -1,7 +1,7 @@
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_config_file.h> #include <ngx_conf_file.h>
static int argument_number[] = { static int argument_number[] = {
@ -75,7 +75,9 @@ int ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
name = (ngx_str_t *) cf->args->elts; name = (ngx_str_t *) cf->args->elts;
for (i = 0; ngx_modules[i]; i++) { for (i = 0; ngx_modules[i]; i++) {
if (cf->type != ngx_modules[i]->type) { if (ngx_modules[i]->type != NULL
&& ngx_modules[i]->type != cf->type)
{
continue; continue;
} }
@ -88,7 +90,9 @@ int ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
if (name->len == cmd->name.len if (name->len == cmd->name.len
&& ngx_strcmp(name->data, cmd->name.data) == 0) && ngx_strcmp(name->data, cmd->name.data) == 0)
{ {
ngx_log_debug(cf->log, "command '%s'" _ cmd->name.data); ngx_log_debug(cf->log, "command '%s'" _ cmd->name.data);
cmd->set(cf, cmd, NULL); cmd->set(cf, cmd, NULL);
} }

24
src/core/ngx_config_file.h → src/core/ngx_conf_file.h
View File

@ -1,5 +1,5 @@
#ifndef _NGX_HTTP_CONFIG_FILE_H_INCLUDED_ #ifndef _NGX_HTTP_CONF_FILE_H_INCLUDED_
#define _NGX_HTTP_CONFIG_FILE_H_INCLUDED_ #define _NGX_HTTP_CONF_FILE_H_INCLUDED_
#include <ngx_config.h> #include <ngx_config.h>
@ -12,21 +12,25 @@
#include <ngx_array.h> #include <ngx_array.h>
#define NGX_CONF_NOARGS 1 #define NGX_CONF_NOARGS 1
#define NGX_CONF_TAKE1 2 #define NGX_CONF_TAKE1 2
#define NGX_CONF_TAKE2 4 #define NGX_CONF_TAKE2 4
#define NGX_CONF_ARGS_NUMBER 0x0ffff
#define NGX_CONF_ANY 0x10000
#define NGX_CONF_BLOCK 0x20000
#define NGX_CONF_ANY 0x10000
#define NGX_CONF_BLOCK 0x20000
#define NGX_CONF_UNSET -1 #define NGX_CONF_UNSET -1
#define NGX_CONF_ERROR (char *) -1
#define NGX_CONF_BLOCK_DONE 1 #define NGX_CONF_BLOCK_DONE 1
#define NGX_CONF_FILE_DONE 2 #define NGX_CONF_FILE_DONE 2
#define NGX_CONF_ERROR (char *) -1 #define NGX_CORE_MODULE_TYPE 0x45524f43 /* "CORE" */
typedef struct ngx_conf_s ngx_conf_t; typedef struct ngx_conf_s ngx_conf_t;
@ -80,4 +84,4 @@ char *ngx_conf_set_time_slot(ngx_conf_t *cf, ngx_command_t *cmd, char *conf);
extern ngx_module_t *ngx_modules[]; extern ngx_module_t *ngx_modules[];
#endif _NGX_HTTP_CONFIG_FILE_H_INCLUDED_ #endif _NGX_HTTP_CONF_FILE_H_INCLUDED_

2
src/core/ngx_modules.c
View File

@ -1,7 +1,7 @@
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_config_file.h> #include <ngx_conf_file.h>
extern ngx_module_t ngx_http_header_filter_module; extern ngx_module_t ngx_http_header_filter_module;

4
src/http/modules/ngx_http_index_handler.c
View File

@ -1,10 +1,12 @@
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_errno.h> #include <ngx_errno.h>
#include <ngx_string.h> #include <ngx_string.h>
#include <ngx_files.h> #include <ngx_files.h>
#include <ngx_config_file.h> #include <ngx_conf_file.h>
#include <ngx_http.h> #include <ngx_http.h>
#include <ngx_http_config.h> #include <ngx_http_config.h>
#include <ngx_http_index_handler.h> #include <ngx_http_index_handler.h>

3
src/http/ngx_http.h
View File

@ -3,13 +3,14 @@
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_types.h> #include <ngx_types.h>
#include <ngx_string.h> #include <ngx_string.h>
#include <ngx_table.h> #include <ngx_table.h>
#include <ngx_hunk.h> #include <ngx_hunk.h>
#include <ngx_files.h> #include <ngx_files.h>
#include <ngx_connection.h> #include <ngx_connection.h>
#include <ngx_config_file.h> #include <ngx_conf_file.h>
#define NGX_HTTP_VERSION_10 1000 #define NGX_HTTP_VERSION_10 1000

21
src/http/ngx_http_config.c
View File

@ -1,7 +1,13 @@
/* TODO:
ngx_http_conf_ctx_t ctx; on stack or in pool ? */
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_config_file.h> #include <ngx_conf_file.h>
#include <ngx_http.h> #include <ngx_http.h>
#include <ngx_http_core.h> #include <ngx_http_core.h>
#include <ngx_http_config.h> #include <ngx_http_config.h>
@ -38,10 +44,11 @@ static ngx_command_t ngx_http_commands[] = {
ngx_module_t ngx_http_module = { ngx_module_t ngx_http_module = {
NULL, /* module context */ NULL, /* module context */
ngx_http_commands, /* module directives */ ngx_http_commands, /* module directives */
0, /* module type */ NGX_CORE_MODULE_TYPE, /* module type */
NULL /* init module */ NULL /* init module */
}; };
static ngx_command_t ngx_http_core_commands[] = { static ngx_command_t ngx_http_core_commands[] = {
{ngx_string("server"), {ngx_string("server"),
@ -83,7 +90,7 @@ static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, char *dummy)
{ {
int i; int i;
ngx_http_module_t *module; ngx_http_module_t *module;
ngx_http_conf_ctx_t *ctx; ngx_http_conf_ctx_t ctx;
for (i = 0; ngx_modules[i]; i++) { for (i = 0; ngx_modules[i]; i++) {
if (ngx_modules[i]->type != NGX_HTTP_MODULE_TYPE) { if (ngx_modules[i]->type != NGX_HTTP_MODULE_TYPE) {
@ -98,9 +105,9 @@ static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, char *dummy)
ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module), ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module),
NGX_CONF_ERROR); NGX_CONF_ERROR);
ctx->srv_conf = NULL; ctx.srv_conf = NULL;
ctx->loc_conf = null_loc_conf; ctx.loc_conf = null_loc_conf;
ctx->locations = NULL; ctx.locations = NULL;
for (i = 0; ngx_modules[i]; i++) { for (i = 0; ngx_modules[i]; i++) {
if (ngx_modules[i]->type != NGX_HTTP_MODULE_TYPE) { if (ngx_modules[i]->type != NGX_HTTP_MODULE_TYPE) {
@ -116,7 +123,7 @@ static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, char *dummy)
} }
} }
cf->ctx = ctx; cf->ctx = &ctx;
cf->type = NGX_HTTP_MODULE_TYPE; cf->type = NGX_HTTP_MODULE_TYPE;
return ngx_conf_parse(cf, NULL); return ngx_conf_parse(cf, NULL);
} }

4
src/http/ngx_http_core.c
View File

@ -1,7 +1,9 @@
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_config_file.h> #include <ngx_conf_file.h>
#include <ngx_http.h> #include <ngx_http.h>
#include <ngx_http_core.h> #include <ngx_http_core.h>
#include <ngx_http_config.h> #include <ngx_http_config.h>

4
src/http/ngx_http_header_filter.c
View File

@ -2,11 +2,13 @@
#include <nginx.h> #include <nginx.h>
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_string.h> #include <ngx_string.h>
#include <ngx_table.h> #include <ngx_table.h>
#include <ngx_hunk.h> #include <ngx_hunk.h>
#include <ngx_config_file.h> #include <ngx_conf_file.h>
#include <ngx_http.h> #include <ngx_http.h>
#include <ngx_http_write_filter.h> #include <ngx_http_write_filter.h>

4
src/http/ngx_http_output_filter.c
View File

@ -1,10 +1,12 @@
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_files.h> #include <ngx_files.h>
#include <ngx_string.h> #include <ngx_string.h>
#include <ngx_hunk.h> #include <ngx_hunk.h>
#include <ngx_config_file.h> #include <ngx_conf_file.h>
#include <ngx_http.h> #include <ngx_http.h>
#include <ngx_http_config.h> #include <ngx_http_config.h>
#include <ngx_http_output_filter.h> #include <ngx_http_output_filter.h>

1
src/http/ngx_http_output_filter.h
View File

@ -3,6 +3,7 @@
#include <ngx_hunk.h> #include <ngx_hunk.h>
#include <ngx_conf_file.h>
#include <ngx_http.h> #include <ngx_http.h>

4
src/http/ngx_http_write_filter.c
View File

@ -1,8 +1,12 @@
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_hunk.h> #include <ngx_hunk.h>
#include <ngx_conf_file.h>
#include <ngx_event_write.h> #include <ngx_event_write.h>
#include <ngx_http.h> #include <ngx_http.h>
#include <ngx_http_config.h> #include <ngx_http_config.h>
#include <ngx_http_write_filter.h> #include <ngx_http_write_filter.h>