mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-03 21:18:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.1-2003-01-10-20:45:47 import

Browse Source
This commit is contained in:
Igor Sysoev 2003-01-10 17:45:47 +00:00
parent b2620634c5
commit e79c6ac7b2
6 changed files with 119 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ngx_conf_file.c
View File

@ -101,7 +101,9 @@ ngx_log_debug(cf->log, "token %d" _ rc);
ngx_log_debug(cf->log, "command '%s'" _ cmd->name.data);
if (!(cmd->type & argument_number[cf->args->nelts - 1])) {
if (!(cmd->type & NGX_CONF_ANY)
&& !(cmd->type & argument_number[cf->args->nelts - 1]))
{
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"invalid number arguments in "
"directive \"%s\" in %s:%d",

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

@ -13,6 +13,7 @@
#include <ngx_http_index_handler.h>
static int ngx_http_index_test_dir(ngx_http_request_t *r);
static int ngx_http_index_init(ngx_pool_t *pool);
static void *ngx_http_index_create_conf(ngx_pool_t *pool);
static char *ngx_http_index_merge_conf(ngx_pool_t *p,
@ -24,9 +25,9 @@ static char *ngx_http_index_set_index(ngx_conf_t *cf, ngx_command_t *cmd,
static ngx_command_t ngx_http_index_commands[] = {
{ngx_string("index"),
NGX_CONF_ANY,
NGX_HTTP_LOC_CONF|NGX_CONF_BLOCK|NGX_CONF_ANY,
ngx_http_index_set_index,
NGX_HTTP_LOC_CONF,
NGX_HTTP_LOC_CONF_OFFSET,
0},
{ngx_string(""), 0, NULL, 0, 0}
@ -60,9 +61,18 @@ ngx_module_t ngx_http_index_module = {
};
/*
If the first index file is local (i.e. 'index.html', not '/index.html') then
try to open it before the test of the directory existence because
the valid requests should be many more then invalid ones. If open()
is failed then stat() should be more quickly because some data
is already cached in the kernel. Besides Win32 has ERROR_PATH_NOT_FOUND
and Unix has ENOTDIR error (although it less helpfull).
*/
int ngx_http_index_handler(ngx_http_request_t *r)
{
int i, len;
int i, rc, test_dir;
char *name, *file;
ngx_str_t loc, *index;
ngx_err_t err;
@ -72,10 +82,10 @@ int ngx_http_index_handler(ngx_http_request_t *r)
ngx_http_core_loc_conf_t *core_cf;
cf = (ngx_http_index_conf_t *)
ngx_http_get_module_loc_conf(r, ngx_http_index_module_ctx);
ngx_http_get_module_loc_conf(r, ngx_http_index_module);
core_cf = (ngx_http_core_loc_conf_t *)
ngx_http_get_module_loc_conf(r, ngx_http_core_module_ctx);
ngx_http_get_module_loc_conf(r, ngx_http_core_module);
ngx_test_null(r->path.data,
ngx_palloc(r->pool,
@ -88,14 +98,22 @@ int ngx_http_index_handler(ngx_http_request_t *r)
file = ngx_cpystrn(loc.data, r->uri.data, r->uri.len + 1);
r->path.len = file - r->path.data;
if (cf->test_dir) {
rc = ngx_http_index_test_dir(r);
if (rc != NGX_OK) {
return rc;
}
test_dir = 0;
} else {
test_dir = 1;
}
index = (ngx_str_t *) cf->indices->elts;
for (i = 0; i < cf->indices->nelts; i++) {
if (index[i].data[0] != '/') {
if (!r->path_not_found) {
continue;
}
ngx_memcpy(file, index[i].data, index[i].len + 1);
name = r->path.data;
@ -106,20 +124,38 @@ int ngx_http_index_handler(ngx_http_request_t *r)
fd = ngx_open_file(name, NGX_FILE_RDONLY);
if (fd == NGX_INVALID_FILE) {
err = ngx_errno;
ngx_log_error(NGX_LOG_ERR, r->connection->log, err,
ngx_open_file_n " %s failed", name);
#if (WIN32)
if (err == ERROR_PATH_NOT_FOUND) {
#else
if (err == NGX_ENOTDIR) {
#endif
r->path_not_found = 1;
}
if (test_dir) {
if (r->path_not_found) {
return NGX_HTTP_NOT_FOUND;
}
rc = ngx_http_index_test_dir(r);
if (rc != NGX_OK) {
return rc;
}
test_dir = 0;
if (r->path_not_found) {
continue;
}
}
if (err == NGX_ENOENT) {
continue;
}
#if (WIN32)
if (err == ERROR_PATH_NOT_FOUND) {
r->path_not_found = 1;
continue;
}
#else
if (err == NGX_ENOTDIR) {
r->path_not_found = 1;
continue;
}
#endif
ngx_log_error(NGX_LOG_ERR, r->connection->log, err,
ngx_open_file_n " %s failed", name);
@ -148,6 +184,41 @@ int ngx_http_index_handler(ngx_http_request_t *r)
}
static int ngx_http_index_test_dir(ngx_http_request_t *r)
{
ngx_err_t err;
r->path.data[r->path.len - 1] = '\0';
ngx_log_debug(r->connection->log, "IS_DIR: %s" _ r->path.data);
if (ngx_file_type(r->path.data, &r->file.info) == -1) {
err = ngx_errno;
if (err == NGX_ENOENT) {
return NGX_HTTP_NOT_FOUND;
}
if (err == NGX_EACCESS) {
return NGX_HTTP_FORBIDDEN;
}
ngx_log_error(NGX_LOG_ERR, r->connection->log, err,
"ngx_http_index_is_dir: "
"stat() %s failed", r->path.data);
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
if (ngx_is_dir(r->file.info)) {
r->path.data[r->path.len - 1] = '/';
return NGX_OK;
} else {
return NGX_HTTP_NOT_FOUND;
}
}
static int ngx_http_index_init(ngx_pool_t *pool)
{
ngx_http_handler_pt *h;
@ -168,23 +239,28 @@ static void *ngx_http_index_create_conf(ngx_pool_t *pool)
NGX_CONF_ERROR);
ngx_test_null(conf->indices,
ngx_create_array(pool, sizeof(ngx_str_t), 3),
ngx_create_array(pool, 3, sizeof(ngx_str_t)),
NGX_CONF_ERROR);
return conf;
}
/* STUB */
static char *ngx_http_index_merge_conf(ngx_pool_t *p, void *parent, void *child)
{
ngx_http_index_conf_t *prev = (ngx_http_index_conf_t *) parent;
ngx_http_index_conf_t *conf = (ngx_http_index_conf_t *) child;
ngx_str_t *index;
ngx_test_null(index, ngx_push_array(conf->indices), NGX_CONF_ERROR);
index->len = sizeof(NGX_HTTP_INDEX) - 1;
index->data = NGX_HTTP_INDEX;
conf->max_index_len = sizeof(NGX_HTTP_INDEX);
if (conf->max_index_len == 0) {
ngx_test_null(index, ngx_push_array(conf->indices), NGX_CONF_ERROR);
index->len = sizeof(NGX_HTTP_INDEX) - 1;
index->data = NGX_HTTP_INDEX;
conf->max_index_len = sizeof(NGX_HTTP_INDEX);
}
/* TODO: set conf->test_dir if first index is started with '/' */
return NULL;
}
@ -221,7 +297,7 @@ static char *ngx_http_index_set_index(ngx_conf_t *cf, ngx_command_t *cmd,
value = (ngx_str_t *) cf->args->elts;
for (i = 1; i < cf->args->nelts; i++) {
ngx_test_null(index, ngx_push_array(icf->indices), NULL);
ngx_test_null(index, ngx_push_array(icf->indices), NGX_CONF_ERROR);
index->len = value[i].len;
index->data = value[i].data;

1
src/http/modules/ngx_http_index_handler.h
View File

@ -13,6 +13,7 @@
typedef struct {
ngx_array_t *indices;
size_t max_index_len;
int test_dir;
} ngx_http_index_conf_t;

52
src/http/ngx_http_core_module.c
View File

@ -206,10 +206,15 @@ ngx_log_debug(r->connection->log, "trans: %s" _ lcf[i]->name.data);
"ngx_http_core_translate_handler: "
ngx_file_type_n " %s failed", r->file.name.data);
if (err == ERROR_FILE_NOT_FOUND) {
if (err == NGX_ENOENT) {
return NGX_HTTP_NOT_FOUND;
} else if (err == ERROR_PATH_NOT_FOUND) {
return NGX_HTTP_NOT_FOUND;
} else if (err == NGX_EACCESS) {
return NGX_HTTP_FORBIDDEN;
} else {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
@ -236,6 +241,9 @@ ngx_log_debug(r->connection->log, "trans: %s" _ lcf[i]->name.data);
} else if (err == NGX_ENOTDIR) {
return NGX_HTTP_NOT_FOUND;
#endif
} else if (err == NGX_EACCESS) {
return NGX_HTTP_FORBIDDEN;
} else {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
@ -296,8 +304,7 @@ ngx_log_debug(r->connection->log, "trans: %s" _ lcf[i]->name.data);
static int ngx_http_core_index_handler(ngx_http_request_t *r)
{
int i, rc;
ngx_err_t err;
int i, rc;
ngx_http_handler_pt *h;
h = (ngx_http_handler_pt *) ngx_http_index_handlers.elts;
@ -309,44 +316,7 @@ static int ngx_http_core_index_handler(ngx_http_request_t *r)
}
}
#if (WIN32)
if (r->path_not_found) {
return NGX_HTTP_NOT_FOUND;
} else {
return NGX_HTTP_FORBIDDEN;
}
#else
if (r->path_not_found) {
return NGX_HTTP_NOT_FOUND;
}
r->path.data[r->path.len] = '\0';
if (stat(r->path.data, &r->file.info) == -1) {
err = ngx_errno;
if (err == NGX_ENOENT) {
return NGX_HTTP_NOT_FOUND;
}
ngx_log_error(NGX_LOG_ERR, r->connection->log, err,
"ngx_http_core_index_handler: "
"stat() %s failed", r->path.data);
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
if (ngx_is_dir(r->file.info)) {
return NGX_HTTP_FORBIDDEN;
} else {
return NGX_HTTP_NOT_FOUND;
}
#endif
return NGX_HTTP_FORBIDDEN;
}

1
src/os/unix/ngx_errno.h
View File

@ -9,6 +9,7 @@ typedef int ngx_err_t;
#define NGX_ENOENT ENOENT
#define NGX_EINTR EINTR
#define NGX_EACCESS EACCESS
#define NGX_ENOTDIR ENOTDIR
#define NGX_EAGAIN EWOULDBLOCK
#define NGX_EINPROGRESS EINPROGRESS

1
src/os/win32/ngx_errno.h
View File

@ -11,6 +11,7 @@ typedef DWORD ngx_err_t;
#define ngx_set_socket_errno(err) WSASetLastError(err)
#define NGX_ENOENT ERROR_FILE_NOT_FOUND
#define NGX_EACCESS ERROR_ACCESS_DENIED
#define NGX_EAGAIN WSAEWOULDBLOCK
#define NGX_EINPROGRESS WSAEINPROGRESS
#define NGX_EADDRINUSE WSAEADDRINUSE