Mercurial > hg > nginx
comparison src/event/ngx_event_connect.c @ 577:4d9ea73a627a release-0.3.10
nginx-0.3.10-RELEASE import
*) Change: the "valid_referers" directive and the "$invalid_referer"
variable were moved to the new ngx_http_referer_module from the
ngx_http_rewrite_module.
*) Change: the "$apache_bytes_sent" variable name was changed to
"$body_bytes_sent".
*) Feature: the "$sent_http_..." variables.
*) Feature: the "if" directive supports the "=" and "!=" operations.
*) Feature: the "proxy_pass" directive supports the HTTPS protocol.
*) Feature: the "proxy_set_body" directive.
*) Feature: the "post_action" directive.
*) Feature: the ngx_http_empty_gif_module.
*) Feature: the "worker_cpu_affinity" directive for Linux.
*) Bugfix: the "rewrite" directive did not unescape URI part in
redirect, now it is unescaped except the %00-%25 and %7F-%FF
characters.
*) Bugfix: nginx could not be built by the icc 9.0 compiler.
*) Bugfix: if the SSI was enabled for zero size static file, then the
chunked response was encoded incorrectly.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 15 Nov 2005 13:30:52 +0000 |
parents | 9c2f3ed7a247 |
children | 4e296b7d25bf |
comparison
equal
deleted
inserted
replaced
576:3e0b61c26426 | 577:4d9ea73a627a |
---|---|
171 return NGX_ERROR; | 171 return NGX_ERROR; |
172 } | 172 } |
173 | 173 |
174 c->recv = ngx_recv; | 174 c->recv = ngx_recv; |
175 c->send = ngx_send; | 175 c->send = ngx_send; |
176 c->recv_chain = ngx_recv_chain; | |
176 c->send_chain = ngx_send_chain; | 177 c->send_chain = ngx_send_chain; |
177 | 178 |
178 c->log_error = pc->log_error; | 179 c->log_error = pc->log_error; |
179 | 180 |
180 if (peer->sockaddr->sa_family != AF_INET) { | 181 if (peer->sockaddr->sa_family != AF_INET) { |
210 | 211 |
211 if (ngx_add_conn) { | 212 if (ngx_add_conn) { |
212 if (ngx_add_conn(c) == NGX_ERROR) { | 213 if (ngx_add_conn(c) == NGX_ERROR) { |
213 return NGX_ERROR; | 214 return NGX_ERROR; |
214 } | 215 } |
215 } | 216 } |
216 | 217 |
217 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pc->log, 0, | 218 ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pc->log, 0, |
218 "connect to %V, fd:%d #%d", &peer->name, s, c->number); | 219 "connect to %V, fd:%d #%d", &peer->name, s, c->number); |
219 | 220 |
220 rc = connect(s, peer->sockaddr, peer->socklen); | 221 rc = connect(s, peer->sockaddr, peer->socklen); |
244 | 245 |
245 /* NGX_EINPROGRESS */ | 246 /* NGX_EINPROGRESS */ |
246 | 247 |
247 return NGX_AGAIN; | 248 return NGX_AGAIN; |
248 } | 249 } |
249 | 250 |
250 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pc->log, 0, "connected"); | 251 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pc->log, 0, "connected"); |
251 | 252 |
252 wev->ready = 1; | 253 wev->ready = 1; |
253 | 254 |
254 return NGX_OK; | 255 return NGX_OK; |
268 } | 269 } |
269 | 270 |
270 /* | 271 /* |
271 * FreeBSD's aio allows to post an operation on non-connected socket. | 272 * FreeBSD's aio allows to post an operation on non-connected socket. |
272 * NT does not support it. | 273 * NT does not support it. |
273 * | 274 * |
274 * TODO: check in Win32, etc. As workaround we can use NGX_ONESHOT_EVENT | 275 * TODO: check in Win32, etc. As workaround we can use NGX_ONESHOT_EVENT |
275 */ | 276 */ |
276 | 277 |
277 rev->ready = 1; | 278 rev->ready = 1; |
278 wev->ready = 1; | 279 wev->ready = 1; |
279 | 280 |
280 return NGX_OK; | 281 return NGX_OK; |
281 } | 282 } |