mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-27 15:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

nginx-0.0.1-2004-01-28-18:22:37 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-01-28 15:22:37 +00:00
parent ba90f581f4
commit cada4ee47d
9 changed files with 284 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/types/sizeof
View File

@ -7,8 +7,10 @@ ngx_bytes=
cat << END > $NGX_AUTOTEST.c
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
$NGX_UNISTD_H
$NGX_INTTYPES_H
$NGX_AUTO_CONFIG

2
src/core/ngx_config.h
View File

@ -52,8 +52,6 @@ typedef int ngx_flag_t;
/* STUB: autoconf */
#define PTR_FMT "%08X"
/* STUB: autoconf */
#define ngx_setproctitle setproctitle
#include <ngx_auto_config.h>

3
src/core/ngx_connection.c
View File

@ -48,7 +48,10 @@ ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle)
return NGX_ERROR;
}
/* STUB: autoconf & set sin_len in ls[i].sockaddr in ngx_http.c */
#if __FreeBSD__
addr_in->sin_len = 0;
#endif
ls[i].family = addr_in->sin_family;
ls[i].addr_text.len = ngx_sock_ntop(ls[i].family, ls[i].sockaddr,

4
src/event/modules/ngx_kqueue_module.c
View File

@ -496,6 +496,8 @@ static int ngx_kqueue_process_events(ngx_log_t *log)
}
#if 0
static void ngx_kqueue_thread_handler(ngx_event_t *ev, ngx_log_t *log)
{
ngx_int_t instance;
@ -518,6 +520,8 @@ static void ngx_kqueue_thread_handler(ngx_event_t *ev, ngx_log_t *log)
}
#endif
static void *ngx_kqueue_create_conf(ngx_cycle_t *cycle)
{

2
src/event/ngx_event.h
View File

@ -202,7 +202,7 @@ extern ngx_event_actions_t ngx_event_actions;
/*
* The event filter has kqueue features - the eof flag, errno,
* available data, etc
* available data, etc.
*/
#define NGX_HAVE_KQUEUE_EVENT 0x00000008

312
src/http/modules/ngx_http_ssi_filter.c
View File

@ -20,6 +20,10 @@ typedef struct {
} ngx_http_ssi_conf_t;
typedef struct {
} ngx_http_ssi_command_t;
typedef struct {
ngx_hunk_t *buf;
@ -38,10 +42,18 @@ typedef struct {
int state;
size_t saved;
ngx_int_t err;
} ngx_http_ssi_ctx_t;
typedef ngx_int_t (*ngx_http_ssi_opcode_pt) (ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx);
typedef struct {
ngx_str_t name;
ngx_http_ssi_opcode_pt op;
} ngx_http_ssi_op_t;
typedef enum {
ssi_start_state = 0,
ssi_tag_state,
@ -58,20 +70,34 @@ typedef enum {
ssi_double_quoted_value_quote_state,
ssi_quoted_value_state,
ssi_quoted_value_quote_state,
ssi_error_state,
ssi_comment_end0_state,
ssi_comment_end1_state
ssi_comment_end1_state,
ssi_error_state,
ssi_error_end0_state,
ssi_error_end1_state
} ngx_http_ssi_state_e;
static ngx_int_t ngx_http_ssi_error(ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx);
static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx);
static ngx_int_t ngx_http_ssi_echo(ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx);
static void *ngx_http_ssi_create_conf(ngx_conf_t *cf);
static char *ngx_http_ssi_merge_conf(ngx_conf_t *cf,
void *parent, void *child);
static int ngx_http_ssi_filter_init(ngx_cycle_t *cycle);
static ngx_http_ssi_op_t ngx_http_ssi_commands[] = {
{ ngx_string("echo"), ngx_http_ssi_echo },
{ ngx_null_string, NULL }
};
static ngx_command_t ngx_http_ssi_filter_commands[] = {
{ ngx_string("ssi"),
@ -111,13 +137,14 @@ ngx_module_t ngx_http_ssi_filter_module = {
static int (*ngx_http_next_header_filter) (ngx_http_request_t *r);
static int (*ngx_http_next_body_filter) (ngx_http_request_t *r, ngx_chain_t *in);
static int (*ngx_http_next_body_filter) (ngx_http_request_t *r,
ngx_chain_t *in);
static char ssi_string[] = "<!--#";
static char error_string[] = "[an error occurred while processing "
"the directive]";
static char stub_string[] = "[a stub ssi string]";
static int ngx_http_ssi_header_filter(ngx_http_request_t *r)
@ -157,9 +184,10 @@ static int ngx_http_ssi_header_filter(ngx_http_request_t *r)
static int ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
{
size_t len;
ngx_int_t rc;
ngx_int_t rc, found;
ngx_hunk_t *hunk;
ngx_chain_t *cl, *tl;
ngx_http_ssi_op_t *cmd;
ngx_http_ssi_ctx_t *ctx;
ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module);
@ -209,12 +237,18 @@ static int ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
while (ctx->pos < ctx->buf->last) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"saved: %d", ctx->saved);
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"saved: %d state: %d", ctx->saved, ctx->state);
rc = ngx_http_ssi_parse(r, ctx);
if (rc == NGX_ERROR) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"parse: %d", rc);
if (rc == NGX_AGAIN) {
continue;
} else if (rc == NGX_ERROR) {
return rc;
} else if (rc == NGX_HTTP_SSI_COPY) {
@ -261,6 +295,28 @@ static int ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
continue;
} else if (rc >= NGX_HTTP_SSI_INVALID_COMMAND) {
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"saved: %d error: %d",
ctx->saved, rc);
if (ngx_http_ssi_error(r, ctx) == NGX_ERROR) {
return NGX_ERROR;
}
if (rc == NGX_HTTP_SSI_INVALID_COMMAND) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"invalid SSI command \"%s\" found",
ctx->command.data);
} else if (rc == NGX_HTTP_SSI_INVALID_PARAM) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"invalid parameter \"%s\" found "
"in SSI command \"%s\"",
ctx->param->key.data, ctx->command.data);
}
#if 0
} else if (rc == NGX_HTTP_SSI_INVALID_COMMAND) {
} else if (rc == NGX_HTTP_SSI_INVALID_PARAM) {
@ -269,18 +325,47 @@ static int ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
#endif
} else {
found = 0;
for (cmd = ngx_http_ssi_commands; cmd->name.len; cmd++) {
if (ctx->command.len != cmd->name.len) {
continue;
}
if (ngx_strncmp(ctx->command.data, cmd->name.data,
cmd->name.len) != 0)
{
continue;
}
found = 1;
if (cmd->op(r, ctx) == NGX_ERROR) {
return NGX_ERROR;
}
}
if (!found) {
if (ngx_http_ssi_error(r, ctx) == NGX_ERROR) {
return NGX_ERROR;
}
}
#if 0
if (!(hunk = ngx_calloc_hunk(r->pool))) {
return NGX_ERROR;
}
hunk->type = NGX_HUNK_IN_MEMORY|NGX_HUNK_TEMP;
hunk->pos = error_string;
hunk->last = error_string + sizeof(error_string) - 1;
hunk->pos = stub_string;
hunk->last = stub_string + sizeof(stub_string) - 1;
ngx_alloc_link_and_set_hunk(cl, hunk, r->pool, NGX_ERROR);
*ctx->last_out = cl;
ctx->last_out = &cl->next;
#endif
}
}
@ -312,8 +397,16 @@ static int ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
break;
}
if (ctx->busy->hunk->shadow) {
ctx->busy->hunk->shadow->pos = ctx->busy->hunk->pos;
/* TODO: NGX_HUNK_ZEROCOPY_BUSY */
hunk = ctx->busy->hunk->shadow;
if (hunk) {
hunk->pos = ctx->busy->hunk->pos;
len = hunk->last - hunk->pos;
if (len < 5 && ngx_strncmp(hunk->pos, ssi_string, len) == 0) {
hunk->pos = hunk->last;
}
}
ctx->busy = ctx->busy->next;
@ -324,6 +417,29 @@ static int ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
}
static ngx_int_t ngx_http_ssi_error(ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx)
{
ngx_hunk_t *hunk;
ngx_chain_t *cl;
if (!(hunk = ngx_calloc_hunk(r->pool))) {
return NGX_ERROR;
}
hunk->type = NGX_HUNK_IN_MEMORY|NGX_HUNK_TEMP;
hunk->pos = error_string;
hunk->last = error_string + sizeof(error_string) - 1;
ngx_alloc_link_and_set_hunk(cl, hunk, r->pool, NGX_ERROR);
*ctx->last_out = cl;
ctx->last_out = &cl->next;
return NGX_OK;
}
#if 0
static int ngx_http_ssi_copy_opcode(ngx_http_request_t *r,
@ -522,7 +638,6 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
ctx->command.data[0] = ch;
ctx->command.len = 1;
ctx->err = NGX_OK;
state = ssi_command_state;
break;
}
@ -546,9 +661,13 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
default:
if (ctx->command.len >= NGX_HTTP_SSI_COMMAND_LEN) {
ctx->err = NGX_HTTP_SSI_INVALID_COMMAND;
state = ssi_error_state;
break;
ctx->command.data[NGX_HTTP_SSI_COMMAND_LEN] = 0;
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_INVALID_COMMAND;
}
ctx->command.data[ctx->command.len++] = ch;
@ -569,6 +688,11 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
break;
default:
if (ctx->params.elts == NULL) {
ngx_init_array(ctx->params, r->pool,
5, sizeof(ngx_table_elt_t), NGX_ERROR);
}
if (!(ctx->param = ngx_push_array(&ctx->params))) {
return NGX_ERROR;
}
@ -609,11 +733,22 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
state = ssi_prevalue_state;
break;
case '-':
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_end0_state;
return NGX_HTTP_SSI_INVALID_PARAM;
default:
if (ctx->param->key.len >= NGX_HTTP_SSI_PARAM_LEN) {
ctx->err = NGX_HTTP_SSI_INVALID_PARAM;
state = ssi_error_state;
break;
ctx->param->key.data[NGX_HTTP_SSI_PARAM_LEN] = 0;
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_INVALID_PARAM;
}
ctx->param->key.data[ctx->param->key.len++] = ch;
@ -633,10 +768,19 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
state = ssi_prevalue_state;
break;
case '-':
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_end0_state;
return NGX_HTTP_SSI_INVALID_PARAM;
default:
ctx->err = NGX_HTTP_SSI_INVALID_PARAM;
state = ssi_error_state;
break;
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_INVALID_PARAM;
}
break;
@ -657,10 +801,19 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
state = ssi_quoted_value_state;
break;
case '-':
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_end0_state;
return NGX_HTTP_SSI_INVALID_VALUE;
default:
ctx->err = NGX_HTTP_SSI_INVALID_VALUE;
state = ssi_error_state;
break;
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_INVALID_VALUE;
}
break;
@ -677,9 +830,11 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
default:
if ((ssize_t) ctx->param->value.len >= conf->value_len) {
ctx->err = NGX_HTTP_SSI_LONG_VALUE;
state = ssi_error_state;
break;
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_LONG_VALUE;
}
ctx->param->value.data[ctx->param->value.len++] = ch;
@ -689,9 +844,11 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
case ssi_double_quoted_value_quote_state:
if ((ssize_t) ctx->param->value.len >= conf->value_len) {
ctx->err = NGX_HTTP_SSI_LONG_VALUE;
state = ssi_error_state;
break;
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_LONG_VALUE;
}
ctx->param->value.data[ctx->param->value.len++] = ch;
@ -711,9 +868,11 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
default:
if ((ssize_t) ctx->param->value.len >= conf->value_len) {
ctx->err = NGX_HTTP_SSI_LONG_VALUE;
state = ssi_error_state;
break;
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_LONG_VALUE;
}
ctx->param->value.data[ctx->param->value.len++] = ch;
@ -723,9 +882,11 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
case ssi_quoted_value_quote_state:
if ((ssize_t) ctx->param->value.len >= conf->value_len) {
ctx->err = NGX_HTTP_SSI_LONG_VALUE;
state = ssi_error_state;
break;
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_LONG_VALUE;
}
ctx->param->value.data[ctx->param->value.len++] = ch;
@ -733,18 +894,6 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
state = ssi_quoted_value_state;
break;
case ssi_error_state:
switch (ch) {
case '-':
state = ssi_comment_end1_state;
break;
default:
break;
}
break;
case ssi_comment_end0_state:
switch (ch) {
case '-':
@ -752,9 +901,11 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
break;
default:
ctx->err = NGX_HTTP_SSI_INVALID_COMMAND;
state = ssi_error_state;
break;
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_INVALID_COMMAND;
}
break;
@ -765,10 +916,54 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
ctx->state = ssi_start_state;
ctx->start = p;
ctx->pos = p;
return ctx->err;
return NGX_OK;
default:
ctx->last = last;
ctx->pos = p;
ctx->state = ssi_error_state;
return NGX_HTTP_SSI_INVALID_COMMAND;
}
break;
case ssi_error_state:
switch (ch) {
case '-':
state = ssi_error_end0_state;
break;
default:
break;
}
break;
case ssi_error_end0_state:
switch (ch) {
case '-':
state = ssi_error_end1_state;
break;
default:
state = ssi_error_state;
break;
}
break;
case ssi_error_end1_state:
switch (ch) {
case '>':
ctx->state = ssi_start_state;
ctx->start = p;
ctx->pos = p;
return NGX_AGAIN;
default:
ctx->err = NGX_HTTP_SSI_INVALID_COMMAND;
state = ssi_error_state;
break;
}
@ -785,6 +980,13 @@ static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
}
static ngx_int_t ngx_http_ssi_echo(ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx)
{
return NGX_OK;
}
static void *ngx_http_ssi_create_conf(ngx_conf_t *cf)
{
ngx_http_ssi_conf_t *conf;

8
src/os/unix/ngx_freebsd_config.h
View File

@ -21,11 +21,11 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h> /* TCP_NOPUSH */
#include <dirent.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <pwd.h>
#include <grp.h>
#include <netdb.h>
#include <dirent.h>
#include <osreldate.h>
@ -77,6 +77,10 @@
#endif
/* STUB: autoconf */
#define ngx_setproctitle setproctitle
/* STUB */
#define HAVE_LITTLE_ENDIAN 1

7
src/os/unix/ngx_linux_config.h
View File

@ -36,8 +36,10 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size);
#include <netinet/in.h>
#include <netinet/tcp.h> /* TCP_CORK */
#include <arpa/inet.h>
#include <dirent.h>
#include <pwd.h>
#include <grp.h>
#include <netdb.h>
#include <dirent.h>
@ -74,4 +76,7 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size);
#endif
#define ngx_setproctitle(title)
#endif /* _NGX_LINUX_CONFIG_H_INCLUDED_ */

5
src/os/unix/ngx_solaris_config.h
View File

@ -27,6 +27,8 @@
#include <sys/systeminfo.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <pwd.h>
#include <grp.h>
#include <netdb.h>
#include <dirent.h>
@ -65,4 +67,7 @@
#endif
#define ngx_setproctitle(title)
#endif /* _NGX_SOLARIS_CONFIG_H_INCLUDED_ */