Mercurial > hg > nginx
changeset 14:f8a0d0f31a24
nginx-0.0.1-2002-09-17-21:49:32 import
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Tue, 17 Sep 2002 17:49:32 +0000 |
| parents | 2aba961a1d34 |
| children | cbb38b60495c |
| files | src/event/modules/ngx_kqueue_module.c src/http/modules/ngx_http_ssi_filter.c src/http/ngx_http.c |
| diffstat | 3 files changed, 295 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -101,7 +101,7 @@ int ngx_kqueue_process_events(ngx_log_t { int events, i; u_int timer = 0, delta = 0; - ngx_event_t *ev, *nx; + ngx_event_t *ev; struct timeval tv; struct timespec ts, *tp = NULL; @@ -137,17 +137,17 @@ int ngx_kqueue_process_events(ngx_log_t if (timer) { if (delta >= timer) { - for (ev = timer_queue.timer_next; - ev != &timer_queue && delta >= ev->timer_delta; - /* void */) - { + for ( ;; ) { + ev = timer_queue.timer_next; + + if (ev == &timer_queue || delta < ev->timer_delta) + break; + delta -= ev->timer_delta; - nx = ev->timer_next; ngx_del_timer(ev); ev->timedout = 1; if (ev->event_handler(ev) == NGX_ERROR) ev->close_handler(ev); - ev = nx; } } else {
new file mode 100644 --- /dev/null +++ b/src/http/modules/ngx_http_ssi_filter.c @@ -0,0 +1,287 @@ + +#include <ngx_config.h> +#include <ngx_core.h> +#include <ngx_hunk.h> +#include <ngx_event_write.h> +#include <ngx_http.h> +#include <ngx_http_config.h> + + +static ngx_command_t ngx_http_ssi_filter_commands[]; + +static void *ngx_http_ssi_filter_create_conf(ngx_pool_t *pool); + +ngx_http_module_t ngx_http_ssi_filter_module = { + NGX_HTTP_MODULE, + NULL, /* create server config */ + ngx_http_ssi_filter_create_conf, /* create location config */ + ngx_http_ssi_filter_commands, /* module directives */ + NULL, /* init module */ + NULL /* init output body filter */ +}; + + +static ngx_command_t ngx_http_ssi_filter_commands[] = { + + {"ssi", ngx_conf_set_size_slot, + offsetof(ngx_http_write_filter_conf_t, buffer_output), + NGX_HTTP_LOC_CONF, NGX_CONF_TAKE1, + "set write filter size to buffer output"}, + + {NULL} + +}; + + +int ngx_http_ssi_filter(ngx_http_request_t *r, ngx_chain_t *in) +{ + int last; + off_t size, flush; + ngx_chain_t *ch, **prev, *chain; + ngx_http_ssi_filter_ctx_t *ctx; + ngx_http_ssi_filter_conf_t *conf; + + ctx = (ngx_http_ssi_filter_ctx_t *) + ngx_get_module_ctx(r->main ? r->main : r, + ngx_http_ssi_filter_module); + if (ctx == NULL) { + ngx_http_create_ctx(r, ctx, + ngx_http_ssi_filter_module, + sizeof(ngx_http_ssi_filter_ctx_t)); + + ctx->state = &ssi_start; + } + + state = ctx->state; + + ch = in; + p = ch->hunk->pos.mem; + + for ( ;; ) { + + if (state == ssi_start_state) { + for (/* void */ ; p < ch->hunk->last.mem; p++) { + if (*p == '<') { + state = ssi_exclam_state; + saved_pos = p; + saved_chain = ch; + break; + } + } + } + + for (/* void */ ; + p < ch->hunk->last.mem && state > ssi_start_state; + p++) + { + + if (*p == '<') { + state = ssi_exclam_state; + saved_pos = p; + saved_chain = ch; + continue; + } + + switch (state) { + + case ssi_exclam_state: + if (*p == '!') { + state = ssi_dash1_state; + + else { + state = ssi_ssi_state; + saved_pos = NULL; + saved_chain = NULL; + } + + break; + + case ssi_dash1_state: + if (*p == '-') { + state = ssi_dash2_state; + + else { + state = ssi_ssi_state; + saved_pos = NULL; + saved_chain = NULL; + } + + break; + + case ssi_dash2_state: + if (*p == '-') { + state = ssi_sharp_state; + + else { + state = ssi_ssi_state; + saved_pos = NULL; + saved_chain = NULL; + } + + break; + + case ssi_sharp_state: + switch (*p) { + case '#': + state = ssi_command_state; + break; + + case ' ': + case '\t': + case CR: + case LF: + break; + + default: + state = ssi_ssi_state; + saved_pos = NULL; + saved_chain = NULL; + break; + } + + break; + } + } + + ch = ch->next; + if (ch == NULL) { + ctx->state = state; + break; + } + + p = ch->hunk->pos.mem; + } + + for (p = saved_pos, ch = saved_chain; + ch; + ch = ch->next, p = ch->hunk->pos.mem) + { + ngx_memcpy(saved_line, p, ch->hunk->last.mem - p); + saved_size += ch->hunk->last.mem - p; + if (ch->next == NULL) + break; + } + + + + + + + + + + + + + + + for (/* void */; in; in = in->next) { + + for (p = in->hunk->pos.mem; + in->hunk->pos.mem < in->hunk->last.mem; + p++) + { + switch (state) { + + case ssi_start_state: + if (*p == '<') { + state = ssi_exclam_state; + save_line = p; + } + break; + + case ssi_exclam_state: + } + } + } + + + + + + + + + + + + + + + + + + + + size = flush = 0; + last = 0; + prev = &ctx->out; + + /* find size, flush point and last link of saved chain */ + for (ch = ctx->out; ch; ch = ch->next) { + prev = &ch->next; + size += ch->hunk->last.file - ch->hunk->pos.file; + + ngx_log_debug(r->connection->log, "old chunk: %x " QX_FMT " " QD_FMT _ + ch->hunk->type _ ch->hunk->pos.file _ + ch->hunk->last.file - ch->hunk->pos.file); + + if (ch->hunk->type & NGX_HUNK_FLUSH|NGX_HUNK_RECYCLED) + flush = size; + + if (ch->hunk->type & NGX_HUNK_LAST) + last = 1; + } + + /* add new chain to existent one */ + for (/* void */; in; in = in->next) { + ngx_test_null(ch, ngx_palloc(r->pool, sizeof(ngx_chain_t)), NGX_ERROR); + + ch->hunk = in->hunk; + ch->next = NULL; + *prev = ch; + prev = &ch->next; + size += ch->hunk->last.file - ch->hunk->pos.file; + + ngx_log_debug(r->connection->log, "new chunk: %x " QX_FMT " " QD_FMT _ + ch->hunk->type _ ch->hunk->pos.file _ + ch->hunk->last.file - ch->hunk->pos.file); + + if (ch->hunk->type & NGX_HUNK_FLUSH|NGX_HUNK_RECYCLED) + flush = size; + + if (ch->hunk->type & NGX_HUNK_LAST) + last = 1; + } + + conf = (ngx_http_write_filter_conf_t *) + ngx_get_module_loc_conf(r->main ? r->main : r, + ngx_http_write_filter_module); + + if (!last && flush == 0 && size < conf->buffer_output) + return NGX_OK; + + chain = ngx_event_write(r->connection, ctx->out, flush); + if (chain == (ngx_chain_t *) -1) + return NGX_ERROR; + + ctx->out = chain; + + ngx_log_debug(r->connection->log, "write filter %x" _ chain); + + return (chain ? NGX_AGAIN : NGX_OK); +} + + +static void *ngx_http_ssi_filter_create_conf(ngx_pool_t *pool) +{ + ngx_http_ssi_filter_conf_t *conf; + + ngx_test_null(conf, + ngx_palloc(pool, sizeof(ngx_http_ssi_filter_conf_t)), + NULL); + + conf->buffer_output = NGX_CONF_UNSET; + + return conf; +}
--- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -31,8 +31,8 @@ int ngx_http_init(ngx_pool_t *pool, ngx_ #if (WIN32) ngx_http_server.doc_root = "html"; #else + ngx_http_server.doc_root = "/home/is/dox/"; ngx_http_server.doc_root = "/home/is/work/xml/site-1.0.0/html"; - ngx_http_server.doc_root = "/home/is/dox/"; #endif ngx_http_server.doc_root_len = strlen(ngx_http_server.doc_root) + 1;