summaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/nginx.c12
-rw-r--r--src/core/ngx_config_command.h23
-rw-r--r--src/core/ngx_config_file.c (renamed from src/core/ngx_config_command.c)204
-rw-r--r--src/core/ngx_config_file.h56
4 files changed, 181 insertions, 114 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c
index e654e7e75..3d1d11de6 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -126,7 +126,7 @@ static void ngx_open_listening_sockets(ngx_log_t *log)
ls[i].flags);
if (s == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
- ngx_socket_n " %s falied", ls[i].addr_text);
+ ngx_socket_n " %s falied", ls[i].addr_text.data);
exit(1);
}
@@ -134,7 +134,7 @@ static void ngx_open_listening_sockets(ngx_log_t *log)
(const void *) &reuseaddr, sizeof(int)) == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
"setsockopt(SO_REUSEADDR) %s failed",
- ls[i].addr_text);
+ ls[i].addr_text.data);
exit(1);
}
@@ -144,7 +144,7 @@ static void ngx_open_listening_sockets(ngx_log_t *log)
if (ngx_nonblocking(s) == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
ngx_nonblocking_n " %s failed",
- ls[i].addr_text);
+ ls[i].addr_text.data);
exit(1);
}
}
@@ -152,7 +152,7 @@ static void ngx_open_listening_sockets(ngx_log_t *log)
if (bind(s, ls[i].sockaddr, ls[i].socklen) == -1) {
err = ngx_socket_errno;
ngx_log_error(NGX_LOG_EMERG, log, err,
- "bind() to %s failed", ls[i].addr_text);
+ "bind() to %s failed", ls[i].addr_text.data);
if (err != NGX_EADDRINUSE)
exit(1);
@@ -160,7 +160,7 @@ static void ngx_open_listening_sockets(ngx_log_t *log)
if (ngx_close_socket(s) == -1)
ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
ngx_close_socket_n " %s failed",
- ls[i].addr_text);
+ ls[i].addr_text.data);
failed = 1;
continue;
@@ -168,7 +168,7 @@ static void ngx_open_listening_sockets(ngx_log_t *log)
if (listen(s, ls[i].backlog) == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
- "listen() to %s failed", ls[i].addr_text);
+ "listen() to %s failed", ls[i].addr_text.data);
exit(1);
}
diff --git a/src/core/ngx_config_command.h b/src/core/ngx_config_command.h
deleted file mode 100644
index e0ab9569f..000000000
--- a/src/core/ngx_config_command.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _NGX_HTTP_CONFIG_COMMAND_H_INCLUDED_
-#define _NGX_HTTP_CONFIG_COMMAND_H_INCLUDED_
-
-
-#define NGX_CONF_TAKE1 0
-#define NGX_CONF_ITERATE 0
-
-#define NGX_CONF_UNSET -1
-
-typedef struct {
- char *name;
- char *(*set)();
- int offset;
- int zone;
- int type;
- char *description;
-} ngx_command_t;
-
-char *ngx_conf_set_size_slot(char *conf, int offset, char *value);
-char *ngx_conf_set_time_slot(char *conf, int offset, char *value);
-
-
-#endif _NGX_HTTP_CONFIG_COMMAND_H_INCLUDED_
diff --git a/src/core/ngx_config_command.c b/src/core/ngx_config_file.c
index 26cd26b91..b2b4b8104 100644
--- a/src/core/ngx_config_command.c
+++ b/src/core/ngx_config_file.c
@@ -1,54 +1,67 @@
#include <ngx_config.h>
+#include <ngx_core.h>
-#if 0
-
-typedef struct ngx_conf_file_t {
- ngx_fd_t fd;
- char *name;
- int line;
- char *pos;
-};
-
-typedef struct ngx_conf_t {
- char *name;
- ngx_array_t *args;
+#include <ngx_config_file.h>
- ngx_conf_file_t *file;
- ngx_log_t *log;
-
- void *context; # ngx_http_conf_t
-};
static int argument_number[] = {
NGX_CONF_NOARGS,
NGX_CONF_TAKE1,
- NGX_CONF_TAKE2,
- NGX_CONF_TAKE3
+ NGX_CONF_TAKE2
};
+#if 0
-ngx_conf_parse(cf, container, filename)
+int ngx_conf_parse(ngx_conf_t *cf, char *filename)
{
- create cf;
-
- *conatiner(cf);
+ int rc;
+ char *error;
+ ngx_fd_t fd;
+ ngx_conf_file_t *prev;
if (filename) {
- open;
+
+ fd = ngx_open_file(filename, NGX_FILE_RDONLY);
+ if (fd == NGX_INVALID_FILE) {
+ ngx_log_error(NGX_LOG_EMERG, cf->log, ngx_errno,
+ "ngx_conf_open: "
+ ngx_open_file_n " %s failed", filename);
+ return NGX_ERROR;
+ }
+
+ prev = cf->file;
+ ngx_test_null(cf->file, ngx_palloc(cf->pool, sizeof(ngx_conf_file_t)),
+ NGX_ERROR);
+
+ cf->file->fd = fd;
+ cf->file->name = filename;
+ cf->file->line = 1;
+ cf->file->pos = 0;
}
for ( ;; ) {
rc = ngx_conf_read_token(cf);
-NGX_OK, NGX_ERROR, NGX_CONF_FILE_DONE, NGX_CONF_BLOCK_DONE
+ /* ??? NGX_OK, NGX_ERROR, NGX_CONF_FILE_DONE, NGX_CONF_BLOCK_DONE */
- if (rc != NGX_OK)
+ if (rc != NGX_OK) {
return rc;
+ }
+
+ /* ????
+ "listen address:port;"
+ "location /images/ {" */
+
+ if (cf->handler) {
-"listen address:port;"
-"location /images/ {"
+ if (*(cf->handler)(cf) == NGX_ERROR) {
+ return NGX_ERROR;
+ }
+
+ continue;
+ }
cmd = ngx_conf_find_token(cf);
if (cmd == NULL) {
@@ -58,6 +71,18 @@ NGX_OK, NGX_ERROR, NGX_CONF_FILE_DONE, NGX_CONF_BLOCK_DONE
return NGX_ERROR;
}
+ if (cmd->type & argument_number[cf->args->nelts]) {
+ error = cmd->set(cf, cmd->offset, cf->args);
+
+ if (error) {
+ ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+ "%s in directive \"%s\" in %s:%d",
+ error, cf->name, cf->file->name, cf->file->line);
+ return NGX_ERROR;
+ }
+ }
+
+#if 0
if (cmd->type == NGX_CONF_CONTAINER) {
ngx_conf_parse(cf, cmd->container, NULL);
@@ -109,14 +134,30 @@ NGX_OK, NGX_ERROR, NGX_CONF_FILE_DONE, NGX_CONF_BLOCK_DONE
return NGX_ERROR;
}
}
+#endif
if (filename) {
- close;
+ cf->file = prev;
+
+ if (ngx_close_file(fd) == NGX_FILE_ERROR) {
+ ngx_log_error(NGX_LOG_ERR, cf->log, ngx_errno,
+ ngx_close_file_n " %s failed", cf->name);
+ return NGX_ERROR;
+ }
}
+
+ return NGX_OK;
}
+#endif
+
+#if 0
+
int ngx_conf_read_token(ngx_conf_t *cf)
{
+ char *start, ch, *src, *dst;
+ int n, need_space, last_space, len, quoted, s_quoted, d_quoted;
+ ngx_hunk_t *h;
need_space = 0;
last_space = 1;
@@ -124,13 +165,35 @@ int ngx_conf_read_token(ngx_conf_t *cf)
quoted = s_quoted = d_quoted = 0;
cf->args->nelts = 0;
+ h = cf->conf_file->hunk;
+
+ for (start = h->pos.mem; /* end_of_file */ ; h->pos.mem++) {
+
+ if (h->pos.mem >= h->last.mem) {
+ if (h->pos.mem - start) {
+ ngx_memcpy(h->start, start, h->pos.mem - start);
+ }
+
+ n = ngx_read_file(cf->conf_file->file,
+ h->start + (h->pos.mem - start),
+ h->end - (h->start + (h->pos.mem - start)),
+ cf->conf_file->file.offset);
- for (/* void */ ; cf->pos < cf->end; cf->pos++) {
+ if (n == NGX_ERROR) {
+ return NGX_ERROR;
+ }
- ch = *cf->pos;
+ cf->conf_file.file.offset += n;
+ h->pos.mem = h->start + (h->pos.mem - start);
+ start = h->start;
+ h->last.mem = h->pos.mem + n;
+ }
- if (ch == LF)
- cf->line++;
+ ch = *h->pos.mem;
+
+ if (ch == LF) {
+ cf->conf_file->line++;
+ }
if (quoted) {
quoted = 0;
@@ -139,6 +202,15 @@ int ngx_conf_read_token(ngx_conf_t *cf)
len++;
+ if (last_space) {
+ start = h->pos.mem;
+
+ if (ch == ' ' || ch == '\t' || ch == CR || ch == LF) {
+ start++;
+ continue;
+ }
+ }
+
if (ch = '\\') {
quoted = 1;
continue;
@@ -147,7 +219,7 @@ int ngx_conf_read_token(ngx_conf_t *cf)
if (d_quoted) {
if (ch == '"') {
- d_qouted = 0;
+ d_quoted = 0;
need_space = 1;
last_space = 1;
continue;
@@ -156,7 +228,7 @@ int ngx_conf_read_token(ngx_conf_t *cf)
} else if (s_quoted) {
if (ch == '\'') {
- s_qouted = 0;
+ s_quoted = 0;
need_space = 1;
last_space = 1;
continue;
@@ -165,11 +237,12 @@ int ngx_conf_read_token(ngx_conf_t *cf)
} else {
if (ch == ' ' || ch == '\t' || ch == CR || ch == LF) {
- ngx_test_null(word, ngx_push_array(cf->args), NGX_ERRROR);
- ngx_test_null(*word, ngx_palloc(cf->temp_pool, len + 1),
+ ngx_test_null(word, ngx_push_array(cf->args), NGX_ERROR);
+ ngx_test_null(word->data, ngx_palloc(cf->temp_pool, len + 1),
NGX_ERROR);
+ word->len = len;
- for (dst = *word, src = cf->start; src < cf->pos; /* void */) {
+ for (dst = word->data, src = start; src < h->pos; /* void */) {
if (*src == '\\')
src++;
*dst++ = *src++;
@@ -185,23 +258,26 @@ int ngx_conf_read_token(ngx_conf_t *cf)
return NGX_ERROR;
}
- if (ch == ';')
+ if (ch == ';') {
return NGX_OK;
+ }
- if (ch == '{')
+ if (ch == '{') {
return NGX_OK;
+ }
- if (ch == '}')
+ if (ch == '}') {
return NGX_BLOCK_DONE;
+ }
if (last_space) {
if (ch == '"') {
- d_qouted = 1;
+ d_quoted = 1;
continue;
}
if (ch == '\'') {
- s_qouted = 1;
+ s_quoted = 1;
continue;
}
}
@@ -211,50 +287,8 @@ int ngx_conf_read_token(ngx_conf_t *cf)
}
}
-container
- server
- location
- module
- if
-
-http_conf current server
- current location
-
-
-ngx_conf_t *ngx_conf_open(char *filename, ngx_log_t *log)
-{
- ngx_cf->fd = ngx_open_file(config, NGX_FILE_RDONLY);
- if (ngx_conf->fd == -1) {
- ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
- "ngx_conf_open: "
- ngx_open_file_n " %s failed", filename);
-
- return NULL;
- }
-
- ngx_conf->name = filename;
- ngx_conf->log = log;
- return ngx_conf;
-}
-
-void ngx_conf_close(ngx_conf_t *cf)
-{
- if (ngx_close_file(cf->fd) == -1) {
- ngx_log_error(NGX_LOG_ERR, cf->log, ngx_errno,
- ngx_close_file_n " %s failed", cf->name);
- }
-
- cf->fd = -1;
-}
-
-
-
-
-
-
#endif
-
char *ngx_conf_set_size_slot(char *conf, int offset, char *value)
{
int size;
diff --git a/src/core/ngx_config_file.h b/src/core/ngx_config_file.h
new file mode 100644
index 000000000..8b1d03e8d
--- /dev/null
+++ b/src/core/ngx_config_file.h
@@ -0,0 +1,56 @@
+#ifndef _NGX_HTTP_CONFIG_FILE_H_INCLUDED_
+#define _NGX_HTTP_CONFIG_FILE_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_files.h>
+#include <ngx_log.h>
+#include <ngx_file.h>
+#include <ngx_alloc.h>
+#include <ngx_hunk.h>
+#include <ngx_array.h>
+
+#define NGX_CONF_NOARGS 1
+#define NGX_CONF_TAKE1 2
+#define NGX_CONF_TAKE2 4
+
+#define NGX_CONF_ITERATE 0
+
+#define NGX_CONF_UNSET -1
+
+
+typedef struct {
+ ngx_file_t file;
+ ngx_hunk_t *hunk;
+ int line;
+} ngx_conf_file_t;
+
+typedef struct ngx_conf_s ngx_conf_t;
+struct ngx_conf_s {
+ char *name;
+ ngx_array_t *args;
+
+ ngx_pool_t *pool;
+ ngx_conf_file_t *conf_file;
+ ngx_log_t *log;
+
+ void *ctx;
+ int (*handler)(ngx_conf_t *cf);
+};
+
+
+
+typedef struct {
+ char *name;
+ char *(*set)();
+ int offset;
+ int zone;
+ int type;
+ char *description;
+} ngx_command_t;
+
+char *ngx_conf_set_size_slot(char *conf, int offset, char *value);
+char *ngx_conf_set_time_slot(char *conf, int offset, char *value);
+
+
+#endif _NGX_HTTP_CONFIG_FILE_H_INCLUDED_
generated by cgit (git 2.34.1) at 2025-12-08 00:30:38 +0000