Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_connection.h @ 460:bb941a2996a6 NGINX_0_7_42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.42 *) Change: now the "Invalid argument" error returned by setsockopt(TCP_NODELAY) on Solaris, is ignored. *) Change: now if a file specified in a "auth_basic_user_file" directive is absent, then the 405 error is returned instead of the 500 one. *) Feature: the "auth_basic_user_file" directive supports variables. Thanks to Kirill A. Korinskiy. *) Feature: the "listen" directive supports the "ipv6only" parameter. Thanks to Zhang Hua. *) Bugfix: in an "alias" directive with references to captures of regular expressions; the bug had appeared in 0.7.40. *) Bugfix: compatibility with Tru64 UNIX. Thanks to Dustin Marquess. *) Bugfix: nginx could not be built without PCRE library; the bug had appeared in 0.7.41.
author Igor Sysoev <http://sysoev.ru>
date Mon, 16 Mar 2009 00:00:00 +0300
parents 76a79816b771
children ed5e10fb40fc
comparison
equal deleted inserted replaced
459:6ef558ffc0eb 460:bb941a2996a6
54 unsigned listen:1; 54 unsigned listen:1;
55 unsigned nonblocking:1; 55 unsigned nonblocking:1;
56 unsigned shared:1; /* shared between threads or processes */ 56 unsigned shared:1; /* shared between threads or processes */
57 unsigned addr_ntop:1; 57 unsigned addr_ntop:1;
58 58
59 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
60 unsigned ipv6only:2;
61 #endif
62
59 #if (NGX_HAVE_DEFERRED_ACCEPT) 63 #if (NGX_HAVE_DEFERRED_ACCEPT)
60 unsigned deferred_accept:1; 64 unsigned deferred_accept:1;
61 unsigned delete_deferred:1; 65 unsigned delete_deferred:1;
62 unsigned add_deferred:1; 66 unsigned add_deferred:1;
63 #ifdef SO_ACCEPTFILTER 67 #ifdef SO_ACCEPTFILTER
67 71
68 }; 72 };
69 73
70 74
71 typedef enum { 75 typedef enum {
72 NGX_ERROR_CRIT = 0, 76 NGX_ERROR_ALERT = 0,
73 NGX_ERROR_ERR, 77 NGX_ERROR_ERR,
74 NGX_ERROR_INFO, 78 NGX_ERROR_INFO,
75 NGX_ERROR_IGNORE_ECONNRESET 79 NGX_ERROR_IGNORE_ECONNRESET,
80 NGX_ERROR_IGNORE_EINVAL
76 } ngx_connection_log_error_e; 81 } ngx_connection_log_error_e;
77 82
78 83
79 typedef enum { 84 typedef enum {
80 NGX_TCP_NODELAY_UNSET = 0, 85 NGX_TCP_NODELAY_UNSET = 0,
129 134
130 ngx_atomic_uint_t number; 135 ngx_atomic_uint_t number;
131 136
132 unsigned buffered:8; 137 unsigned buffered:8;
133 138
134 unsigned log_error:2; /* ngx_connection_log_error_e */ 139 unsigned log_error:3; /* ngx_connection_log_error_e */
135 140
136 unsigned single_connection:1; 141 unsigned single_connection:1;
137 unsigned unexpected_eof:1; 142 unsigned unexpected_eof:1;
138 unsigned timedout:1; 143 unsigned timedout:1;
139 unsigned error:1; 144 unsigned error:1;