mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.1-2002-12-17-18:48:27 import

Browse Source
This commit is contained in:
Igor Sysoev 2002-12-17 15:48:27 +00:00
parent 5eef618ed6
commit 5518aba253
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/ngx_config.h
View File

@ -107,6 +107,7 @@
#define HAVE_INHERITED_NONBLOCK 1 #define HAVE_INHERITED_NONBLOCK 1
#endif #endif
/* FreeBSD sendfile */
#if __FreeBSD_version >= 300007 #if __FreeBSD_version >= 300007
#ifndef HAVE_FREEBSD_SENDFILE #ifndef HAVE_FREEBSD_SENDFILE
@ -117,8 +118,9 @@
#define HAVE_FREEBSD_SENDFILE_NBYTES_BUG 2 #define HAVE_FREEBSD_SENDFILE_NBYTES_BUG 2
#endif #endif
#endif #endif /* FreeBSD sendfile */
/* FreeBSD sendfile nbytes bug */
#if (__FreeBSD__ == 4 && __FreeBSD_version >= 460100) \ #if (__FreeBSD__ == 4 && __FreeBSD_version >= 460100) \
|| __FreeBSD_version == 460001 || __FreeBSD_version == 460001
|| __FreeBSD_version >= 500029 || __FreeBSD_version >= 500029
@ -127,13 +129,14 @@
#define HAVE_FREEBSD_SENDFILE_NBYTES_BUG 0 #define HAVE_FREEBSD_SENDFILE_NBYTES_BUG 0
#endif #endif
#endif #endif /* FreeBSD sendfile nbytes bug */
#if (HAVE_FREEBSD_SENDFILE) #if (HAVE_FREEBSD_SENDFILE)
#define HAVE_SENDFILE 1 #define HAVE_SENDFILE 1
#endif #endif
/* FreeBSD kqueue */
#if (__FreeBSD__ == 4 && __FreeBSD_version >= 410000) \ #if (__FreeBSD__ == 4 && __FreeBSD_version >= 410000) \
|| __FreeBSD_version >= 500011 || __FreeBSD_version >= 500011
@ -142,7 +145,7 @@
#include <sys/event.h> #include <sys/event.h>
#endif #endif
#endif #endif /* FreeBSD kqueue */
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */

5
src/core/ngx_sendfile.c
View File

@ -1,5 +1,8 @@
#include <ngx_config.h> #include <ngx_config.h>
#if !(HAVE_SENDFILE)
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_log.h> #include <ngx_log.h>
#include <ngx_socket.h> #include <ngx_socket.h>
@ -18,3 +21,5 @@ int ngx_sendfile(ngx_socket_t s,
return NGX_ERROR; return NGX_ERROR;
} }
#endif

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

@ -19,7 +19,7 @@ static char *ngx_http_index_set_index(ngx_pool_t *p, void *conf,
static ngx_command_t ngx_http_index_commands[] = { static ngx_command_t ngx_http_index_commands[] = {
{"index", ngx_http_index_set_index, NULL, {"index", ngx_http_index_set_index, 0,
NGX_HTTP_LOC_CONF, NGX_CONF_ITERATE, NGX_HTTP_LOC_CONF, NGX_CONF_ITERATE,
"set index files"}, "set index files"},

10
src/http/ngx_http_event.c
View File

@ -104,11 +104,11 @@ int ngx_http_init_connection(ngx_connection_t *c)
ngx_test_null(c->addr_text.data, ngx_palloc(c->pool, c->addr_text.len), ngx_test_null(c->addr_text.data, ngx_palloc(c->pool, c->addr_text.len),
NGX_ERROR); NGX_ERROR);
ngx_test_null(c->addr_text.len, c->addr_text.len = ngx_inet_ntop(c->family,
ngx_inet_ntop(c->family, (char *)c->sockaddr + c->addr,
(char *)c->sockaddr + c->addr, c->addr_text.data, c->addr_text.len);
c->addr_text.data, c->addr_text.len), if (c->addr_text.len = 0)
NGX_ERROR); return NGX_ERROR;
ngx_test_null(ctx, ngx_pcalloc(c->pool, sizeof(ngx_http_log_ctx_t)), ngx_test_null(ctx, ngx_pcalloc(c->pool, sizeof(ngx_http_log_ctx_t)),
NGX_ERROR); NGX_ERROR);

2
src/http/ngx_http_parse_time.c
View File

@ -207,7 +207,7 @@ time_t ngx_http_parse_time(char *value, size_t len)
month += 12; month += 12;
year -= 1; year -= 1;
} }
/* Gauss's formula for days from 1 March 1 BC */ /* Gauss's formula for Grigorian days from 1 March 1 BC */
return (365 * year + year / 4 - year / 100 + year / 400 return (365 * year + year / 4 - year / 100 + year / 400
+ 367 * month / 12 + day - 31 + 367 * month / 12 + day - 31
/* 719527 days are between 1 March 1 BC and 1 March 1970, /* 719527 days are between 1 March 1 BC and 1 March 1970,

7
src/os/unix/freebsd/ngx_sendfile.c
View File

@ -1,5 +1,8 @@
#include <ngx_config.h> #include <ngx_config.h>
#if (HAVE_FREEBSD_SENDFILE)
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_types.h> #include <ngx_types.h>
#include <ngx_file.h> #include <ngx_file.h>
@ -10,12 +13,10 @@
#include <ngx_sendfile.h> #include <ngx_sendfile.h>
/* /*
TODO: CHECK:
FreeBSD:
check sent if errno == EINTR then should return right sent. check sent if errno == EINTR then should return right sent.
*/ */
#if (HAVE_FREEBSD_SENDFILE)
int ngx_sendfile(ngx_socket_t s, int ngx_sendfile(ngx_socket_t s,
ngx_iovec_t *headers, int hdr_cnt, ngx_iovec_t *headers, int hdr_cnt,