Mercurial > hg > nginx
comparison src/core/ngx_connection.c @ 2653:567028e737cc stable-0.6
r2561 merge:
ignore EINVAL from setsockopt() on Solaris
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 01 Apr 2009 16:42:09 +0000 |
parents | 9f15e5f8ff9e |
children |
comparison
equal
deleted
inserted
replaced
2652:2a06634cd7bf | 2653:567028e737cc |
---|---|
777 ngx_int_t | 777 ngx_int_t |
778 ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) | 778 ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) |
779 { | 779 { |
780 ngx_uint_t level; | 780 ngx_uint_t level; |
781 | 781 |
782 if (err == NGX_ECONNRESET | 782 if (err == NGX_ECONNRESET && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) { |
783 && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) | |
784 { | |
785 return 0; | 783 return 0; |
786 } | 784 } |
785 | |
786 #if (NGX_SOLARIS) | |
787 if (err == NGX_EINVAL && c->log_error == NGX_ERROR_IGNORE_EINVAL) { | |
788 return 0; | |
789 } | |
790 #endif | |
787 | 791 |
788 if (err == 0 | 792 if (err == 0 |
789 || err == NGX_ECONNRESET | 793 || err == NGX_ECONNRESET |
790 #if !(NGX_WIN32) | 794 #if !(NGX_WIN32) |
791 || err == NGX_EPIPE | 795 || err == NGX_EPIPE |
798 || err == NGX_EHOSTDOWN | 802 || err == NGX_EHOSTDOWN |
799 || err == NGX_EHOSTUNREACH) | 803 || err == NGX_EHOSTUNREACH) |
800 { | 804 { |
801 switch (c->log_error) { | 805 switch (c->log_error) { |
802 | 806 |
807 case NGX_ERROR_IGNORE_EINVAL: | |
803 case NGX_ERROR_IGNORE_ECONNRESET: | 808 case NGX_ERROR_IGNORE_ECONNRESET: |
804 case NGX_ERROR_INFO: | 809 case NGX_ERROR_INFO: |
805 level = NGX_LOG_INFO; | 810 level = NGX_LOG_INFO; |
806 break; | 811 break; |
807 | 812 |