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.1.0-2004-09-30-10:38:49 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-09-30 06:38:49 +00:00
parent ff8da91784
commit 6d2eb20711
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
auto/summary
View File

@ -45,9 +45,9 @@ echo
if [ $HTTP_REWRITE = YES ]; then if [ $HTTP_REWRITE = YES ]; then
if [ $PCRE = NONE -o $PCRE = NO ]; then if [ $PCRE = NONE -o $PCRE = NO ]; then
echo "$0: error: HTTP rewrite module requires PCRE library." echo "$0: error: HTTP rewrite module requires PCRE library."
echo $ngx_n "You can disable the module by using" $ngx_c echo $ngx_n "You can disable the module by using " $ngx_c
echo "--without-http_rewrite_module option" echo "--without-http_rewrite_module option"
echo "or you have to enable PCRE support" echo "or you have to enable PCRE support."
echo echo
exit 1 exit 1
@ -58,9 +58,9 @@ fi
if [ $HTTP_GZIP = YES ]; then if [ $HTTP_GZIP = YES ]; then
if [ $ZLIB = NONE -o $ZLIB = NO ]; then if [ $ZLIB = NONE -o $ZLIB = NO ]; then
echo "$0: error: HTTP gzip module requires zlib library." echo "$0: error: HTTP gzip module requires zlib library."
echo $ngx_n "You can disable the module by using" $ngx_c echo $ngx_n "You can disable the module by using " $ngx_c
echo "--without-http_gzip_module option" echo "--without-http_gzip_module option"
echo "or you have to enable zlib support" echo "or you have to enable zlib support."
echo echo
exit 1 exit 1

1
src/core/ngx_core.h
View File

@ -58,7 +58,6 @@ typedef void (*ngx_event_handler_pt)(ngx_event_t *ev);
#include <ngx_regex.h> #include <ngx_regex.h>
#endif #endif
#include <ngx_rbtree.h> #include <ngx_rbtree.h>
#include <ngx_radix_tree.h>
#include <ngx_times.h> #include <ngx_times.h>
#include <ngx_inet.h> #include <ngx_inet.h>
#include <ngx_cycle.h> #include <ngx_cycle.h>

14
src/core/ngx_log.c
View File

@ -253,10 +253,11 @@ ngx_log_t *ngx_log_init_errlog()
#endif #endif
ngx_log.file = &ngx_stderr; ngx_log.file = &ngx_stderr;
ngx_log.log_level = NGX_LOG_ERR;
#ifdef NGX_ERROR_LOG_PATH #ifdef NGX_ERROR_LOG_PATH
ngx_log.log_level = NGX_LOG_ERR;
fd = ngx_open_file(NGX_ERROR_LOG_PATH, NGX_FILE_RDWR, fd = ngx_open_file(NGX_ERROR_LOG_PATH, NGX_FILE_RDWR,
NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND); NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND);
@ -285,6 +286,10 @@ ngx_log_t *ngx_log_init_errlog()
#endif #endif
#else
ngx_log.log_level = NGX_LOG_INFO;
#endif #endif
return &ngx_log; return &ngx_log;
@ -375,6 +380,12 @@ static char *ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
value = cf->args->elts; value = cf->args->elts;
if (value[1].len == 6 && ngx_strcmp(value[1].data, "stderr") == 0) {
cf->cycle->new_log->file->fd = ngx_stderr.fd;
cf->cycle->new_log->file->name.len = 0;
cf->cycle->new_log->file->name.data = NULL;
} else {
cf->cycle->new_log->file->name = value[1]; cf->cycle->new_log->file->name = value[1];
if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name) if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name)
@ -382,6 +393,7 @@ static char *ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
}
return ngx_set_error_log_levels(cf, cf->cycle->new_log); return ngx_set_error_log_levels(cf, cf->cycle->new_log);
} }

12
src/event/ngx_event_openssl.c
View File

@ -82,11 +82,14 @@ ngx_int_t ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
return NGX_AGAIN; return NGX_AGAIN;
} }
#if 0
if (sslerr == SSL_ERROR_WANT_WRITE) { if (sslerr == SSL_ERROR_WANT_WRITE) {
ngx_log_error(NGX_LOG_ALERT, c->log, err,
"SSL wants to write%s", handshake);
return NGX_ERROR;
#if 0
return NGX_AGAIN; return NGX_AGAIN;
}
#endif #endif
}
if (!SSL_is_init_finished(c->ssl->ssl)) { if (!SSL_is_init_finished(c->ssl->ssl)) {
handshake = "in SSL handshake"; handshake = "in SSL handshake";
@ -261,8 +264,11 @@ static ngx_int_t ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size)
return NGX_AGAIN; return NGX_AGAIN;
} }
#if 0
if (sslerr == SSL_ERROR_WANT_READ) { if (sslerr == SSL_ERROR_WANT_READ) {
ngx_log_error(NGX_LOG_ALERT, c->log, err,
"SSL wants to read%s", handshake);
return NGX_ERROR;
#if 0
return NGX_AGAIN; return NGX_AGAIN;
} }
#endif #endif