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

nginx-0.0.2-2004-02-20-19:48:59 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-02-20 16:48:59 +00:00
parent bb1ba3fa6d
commit 0ee5d3c106
8 changed files with 63 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
auto/lib/md5/conf
View File

@ -37,6 +37,7 @@ ngx_lib_inc="#include <sys/types.h>
if [ $ngx_found = yes ]; then if [ $ngx_found = yes ]; then
CORE_LIBS="$CORE_LIBS $ngx_libs" CORE_LIBS="$CORE_LIBS $ngx_libs"
MD5=YES MD5=YES
MD5_LIB=md5
ngx_found=no ngx_found=no
else else
@ -51,19 +52,24 @@ ngx_lib_inc="#include <sys/types.h>
if [ $ngx_found = yes ]; then if [ $ngx_found = yes ]; then
CORE_LIBS="$CORE_LIBS $ngx_libs" CORE_LIBS="$CORE_LIBS $ngx_libs"
MD5=YES MD5=YES
MD5_LIB=md
ngx_found=no ngx_found=no
else else
ngx_lib="OpenSSL md5" ngx_lib_inc="#include <sys/types.h>
#include <openssl/md5.h>"
ngx_lib="OpenSSL md5 crypto"
ngx_lib_test="MD5_CTX md5; MD5_Init(&md5)" ngx_lib_test="MD5_CTX md5; MD5_Init(&md5)"
ngx_libs=-lmd5 ngx_libs=-lcrypto
. auto/lib/test . auto/lib/test
fi fi
if [ $ngx_found = yes ]; then if [ $ngx_found = yes ]; then
have=HAVE_OPENSSL_MD5 . auto/have have=HAVE_OPENSSL_MD5 . auto/have
have=HAVE_OPENSSL_MD5_H . auto/have
CORE_LIBS="$CORE_LIBS $ngx_libs" CORE_LIBS="$CORE_LIBS $ngx_libs"
MD5=YES MD5=YES
MD5_LIB=crypto
fi fi
fi fi

6
auto/lib/test
View File

@ -1,5 +1,5 @@
echo "checking for $ngx_lib library" echo $ngx_n "checking for $ngx_lib library ..." $ngx_c
echo >> $NGX_ERR echo >> $NGX_ERR
echo "checking for $ngx_lib library" >> $NGX_ERR echo "checking for $ngx_lib library" >> $NGX_ERR
@ -12,12 +12,12 @@ eval "$CC $cc_test_flags -o $NGX_AUTOTEST $NGX_AUTOTEST.c $ngx_libs \
>> $NGX_ERR 2>&1" >> $NGX_ERR 2>&1"
if [ -x $NGX_AUTOTEST ]; then if [ -x $NGX_AUTOTEST ]; then
echo " + $ngx_lib found" echo " found"
ngx_found=yes ngx_found=yes
else else
echo " + $ngx_lib not found" echo " not found"
fi fi
rm $NGX_AUTOTEST* rm $NGX_AUTOTEST*

18
auto/summary
View File

@ -2,15 +2,19 @@
echo echo
echo "Configuration summary" echo "Configuration summary"
case $PCRE in if [ $USE_PCRE = DISABLED ]; then
YES) echo " + using system PCRE library" ;; echo " + PCRE library is disabled"
NONE) echo " + PCRE library is not used" ;;
NO) echo " + PCRE library is not found" ;; else
*) echo " + using PCRE library: $PCRE" ;; case $PCRE in
esac YES) echo " + using system PCRE library" ;;
NO) echo " + PCRE library is not found" ;;
*) echo " + using PCRE library: $PCRE" ;;
esac
fi
case $MD5 in case $MD5 in
YES) echo " + using system md5 library" ;; YES) echo " + md5: using system $MD5_LIB library" ;;
NONE) echo " + md5 library is not used" ;; NONE) echo " + md5 library is not used" ;;
NO) echo " + md5 library is not found" ;; NO) echo " + md5 library is not found" ;;
*) echo " + using md5 library: $MD5" ;; *) echo " + using md5 library: $MD5" ;;

58
src/core/ngx_conf_file.c
View File

@ -582,11 +582,11 @@ char *ngx_conf_set_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
char *p = conf; char *p = conf;
int flag; ngx_flag_t flag;
ngx_str_t *value; ngx_str_t *value;
if (*(int *) (p + cmd->offset) != NGX_CONF_UNSET) { if (*(ngx_flag_t *) (p + cmd->offset) != NGX_CONF_UNSET) {
return "is duplicate"; return "is duplicate";
} }
@ -606,7 +606,7 @@ char *ngx_conf_set_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
*(int *) (p + cmd->offset) = flag; *(ngx_flag_t *) (p + cmd->offset) = flag;
return NGX_CONF_OK; return NGX_CONF_OK;
} }
@ -636,12 +636,12 @@ char *ngx_conf_set_num_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
char *p = conf; char *p = conf;
int *np; ngx_int_t *np;
ngx_str_t *value; ngx_str_t *value;
ngx_conf_post_t *post; ngx_conf_post_t *post;
np = (int *) (p + cmd->offset); np = (ngx_int_t *) (p + cmd->offset);
if (*np != NGX_CONF_UNSET) { if (*np != NGX_CONF_UNSET) {
return "is duplicate"; return "is duplicate";
@ -666,26 +666,26 @@ char *ngx_conf_set_size_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
char *p = conf; char *p = conf;
int *np; ssize_t *sp;
ngx_str_t *value; ngx_str_t *value;
ngx_conf_post_t *post; ngx_conf_post_t *post;
np = (int *) (p + cmd->offset); sp = (ssize_t *) (p + cmd->offset);
if (*np != NGX_CONF_UNSET) { if (*sp != NGX_CONF_UNSET) {
return "is duplicate"; return "is duplicate";
} }
value = (ngx_str_t *) cf->args->elts; value = (ngx_str_t *) cf->args->elts;
*np = ngx_parse_size(&value[1]); *sp = ngx_parse_size(&value[1]);
if (*np == NGX_ERROR) { if (*sp == NGX_ERROR) {
return "invalid value"; return "invalid value";
} }
if (cmd->post) { if (cmd->post) {
post = cmd->post; post = cmd->post;
return post->post_handler(cf, post, np); return post->post_handler(cf, post, sp);
} }
return NGX_CONF_OK; return NGX_CONF_OK;
@ -696,30 +696,30 @@ char *ngx_conf_set_msec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
char *p = conf; char *p = conf;
int *np; ngx_msec_t *msp;
ngx_str_t *value; ngx_str_t *value;
ngx_conf_post_t *post; ngx_conf_post_t *post;
np = (int *) (p + cmd->offset); msp = (ngx_msec_t *) (p + cmd->offset);
if (*np != NGX_CONF_UNSET) { if (*msp != (ngx_msec_t) NGX_CONF_UNSET) {
return "is duplicate"; return "is duplicate";
} }
value = (ngx_str_t *) cf->args->elts; value = (ngx_str_t *) cf->args->elts;
*np = ngx_parse_time(&value[1], 0); *msp = ngx_parse_time(&value[1], 0);
if (*np == NGX_ERROR) { if (*msp == (ngx_msec_t) NGX_ERROR) {
return "invalid value"; return "invalid value";
} }
if (*np == NGX_PARSE_LARGE_TIME) { if (*msp == (ngx_msec_t) NGX_PARSE_LARGE_TIME) {
return "value must be less than 597 hours"; return "value must be less than 597 hours";
} }
if (cmd->post) { if (cmd->post) {
post = cmd->post; post = cmd->post;
return post->post_handler(cf, post, np); return post->post_handler(cf, post, msp);
} }
return NGX_CONF_OK; return NGX_CONF_OK;
@ -730,30 +730,30 @@ char *ngx_conf_set_sec_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
char *p = conf; char *p = conf;
int *np; time_t *sp;
ngx_str_t *value; ngx_str_t *value;
ngx_conf_post_t *post; ngx_conf_post_t *post;
np = (int *) (p + cmd->offset); sp = (time_t *) (p + cmd->offset);
if (*np != NGX_CONF_UNSET) { if (*sp != NGX_CONF_UNSET) {
return "is duplicate"; return "is duplicate";
} }
value = (ngx_str_t *) cf->args->elts; value = (ngx_str_t *) cf->args->elts;
*np = ngx_parse_time(&value[1], 1); *sp = ngx_parse_time(&value[1], 1);
if (*np == NGX_ERROR) { if (*sp == NGX_ERROR) {
return "invalid value"; return "invalid value";
} }
if (*np == NGX_PARSE_LARGE_TIME) { if (*sp == NGX_PARSE_LARGE_TIME) {
return "value must be less than 68 years"; return "value must be less than 68 years";
} }
if (cmd->post) { if (cmd->post) {
post = cmd->post; post = cmd->post;
return post->post_handler(cf, post, np); return post->post_handler(cf, post, sp);
} }
return NGX_CONF_OK; return NGX_CONF_OK;
@ -793,12 +793,12 @@ char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
char *p = conf; char *p = conf;
int *np, i, m; ngx_int_t *np, i, m;
ngx_str_t *value; ngx_str_t *value;
ngx_conf_bitmask_t *mask; ngx_conf_bitmask_t *mask;
np = (int *) (p + cmd->offset); np = (ngx_int_t *) (p + cmd->offset);
value = (ngx_str_t *) cf->args->elts; value = (ngx_str_t *) cf->args->elts;
mask = cmd->post; mask = cmd->post;
@ -843,7 +843,7 @@ char *ngx_conf_unsupported(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data) char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data)
{ {
ngx_conf_num_bounds_t *bounds = post; ngx_conf_num_bounds_t *bounds = post;
int *np = data; ngx_int_t *np = data;
if (bounds->high == -1) { if (bounds->high == -1) {
if (*np >= bounds->low) { if (*np >= bounds->low) {

9
src/http/modules/ngx_http_gzip_filter.c
View File

@ -10,8 +10,8 @@ typedef struct {
int enable; int enable;
ngx_bufs_t bufs; ngx_bufs_t bufs;
int level; int level;
int wbits; ssize_t wbits;
int memlevel; ssize_t memlevel;
int no_buffer; int no_buffer;
} ngx_http_gzip_conf_t; } ngx_http_gzip_conf_t;
@ -667,8 +667,9 @@ static char *ngx_http_gzip_merge_conf(ngx_conf_t *cf,
ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 4, ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 4,
/* STUB: PAGE_SIZE */ 4096); /* STUB: PAGE_SIZE */ 4096);
ngx_conf_merge_value(conf->level, prev->level, 1); ngx_conf_merge_value(conf->level, prev->level, 1);
ngx_conf_merge_value(conf->wbits, prev->wbits, MAX_WBITS); ngx_conf_merge_size_value(conf->wbits, prev->wbits, MAX_WBITS);
ngx_conf_merge_value(conf->memlevel, prev->memlevel, MAX_MEM_LEVEL - 1); ngx_conf_merge_size_value(conf->memlevel, prev->memlevel,
MAX_MEM_LEVEL - 1);
ngx_conf_merge_value(conf->no_buffer, prev->no_buffer, 0); ngx_conf_merge_value(conf->no_buffer, prev->no_buffer, 0);
return NGX_CONF_OK; return NGX_CONF_OK;

2
src/http/modules/proxy/ngx_http_proxy_handler.h
View File

@ -65,7 +65,7 @@ typedef struct {
int ignore_expires; int ignore_expires;
int lm_factor; int lm_factor;
int default_expires; time_t default_expires;
int next_upstream; int next_upstream;
int use_stale; int use_stale;

4
src/http/ngx_http_file_cache.c
View File

@ -4,7 +4,11 @@
#include <ngx_http.h> #include <ngx_http.h>
#if (HAVE_OPENSSL_MD5_H)
#include <openssl/md5.h>
#else
#include <md5.h> #include <md5.h>
#endif
#if (HAVE_OPENSSL_MD5) #if (HAVE_OPENSSL_MD5)
#define MD5Init MD5_Init #define MD5Init MD5_Init

3
src/os/unix/ngx_freebsd_sendfile_chain.c
View File

@ -28,7 +28,8 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in)
int rc; int rc;
char *prev; char *prev;
off_t sent, fprev; off_t sent, fprev;
size_t hsize, fsize, size; size_t hsize, fsize;
ssize_t size;
ngx_int_t eintr, eagain; ngx_int_t eintr, eagain;
struct iovec *iov; struct iovec *iov;
struct sf_hdtr hdtr; struct sf_hdtr hdtr;