Mercurial > hg > nginx-vendor-0-6
comparison src/core/ngx_connection.c @ 90:71c46860eb55 NGINX_0_1_45
nginx 0.1.45
*) Change: the "ssl_engine" directive was canceled in the
ngx_http_ssl_module and now is introduced at global level.
*) Bugfix: the responses with SSI subrequests did not transferred via
SSL connection.
*) Various bug fixes in the IMAP/POP3 proxy.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 08 Sep 2005 00:00:00 +0400 |
parents | 962c43960644 |
children | 45945fa8b8ba |
comparison
equal
deleted
inserted
replaced
89:7ed9767f1c4e | 90:71c46860eb55 |
---|---|
65 size_t len; | 65 size_t len; |
66 ngx_uint_t i; | 66 ngx_uint_t i; |
67 ngx_listening_t *ls; | 67 ngx_listening_t *ls; |
68 struct sockaddr_in *sin; | 68 struct sockaddr_in *sin; |
69 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) | 69 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) |
70 ngx_err_t err; | |
70 socklen_t aflen; | 71 socklen_t aflen; |
71 struct accept_filter_arg af; | 72 struct accept_filter_arg af; |
72 #endif | 73 #endif |
73 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) | 74 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) |
74 socklen_t tlen; | 75 socklen_t tlen; |
131 aflen = sizeof(struct accept_filter_arg); | 132 aflen = sizeof(struct accept_filter_arg); |
132 | 133 |
133 if (getsockopt(ls[i].fd, SOL_SOCKET, SO_ACCEPTFILTER, &af, &aflen) | 134 if (getsockopt(ls[i].fd, SOL_SOCKET, SO_ACCEPTFILTER, &af, &aflen) |
134 == -1) | 135 == -1) |
135 { | 136 { |
136 ngx_log_error(NGX_LOG_NOTICE, cycle->log, ngx_errno, | 137 err = ngx_errno; |
138 | |
139 if (err == NGX_EINVAL) { | |
140 continue; | |
141 } | |
142 | |
143 ngx_log_error(NGX_LOG_NOTICE, cycle->log, err, | |
137 "getsockopt(SO_ACCEPTFILTER) for %V failed, ignored", | 144 "getsockopt(SO_ACCEPTFILTER) for %V failed, ignored", |
138 &ls[i].addr_text); | 145 &ls[i].addr_text); |
139 continue; | 146 continue; |
140 } | 147 } |
141 | 148 |