Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 2388:722b5aff05ae
use "!= NGX_OK" instead of "== NGX_ERROR"
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 09 Dec 2008 17:27:48 +0000 |
parents | 3b89b17bcd9c |
children | d1a7203a8a44 |
comparison
equal
deleted
inserted
replaced
2387:7a1478c02415 | 2388:722b5aff05ae |
---|---|
213 return; | 213 return; |
214 } | 214 } |
215 | 215 |
216 ngx_add_timer(rev, c->listening->post_accept_timeout); | 216 ngx_add_timer(rev, c->listening->post_accept_timeout); |
217 | 217 |
218 if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { | 218 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
219 #if (NGX_STAT_STUB) | 219 #if (NGX_STAT_STUB) |
220 ngx_atomic_fetch_add(ngx_stat_reading, -1); | 220 ngx_atomic_fetch_add(ngx_stat_reading, -1); |
221 #endif | 221 #endif |
222 ngx_http_close_connection(c); | 222 ngx_http_close_connection(c); |
223 return; | 223 return; |
502 | 502 |
503 if (!rev->timer_set) { | 503 if (!rev->timer_set) { |
504 ngx_add_timer(rev, c->listening->post_accept_timeout); | 504 ngx_add_timer(rev, c->listening->post_accept_timeout); |
505 } | 505 } |
506 | 506 |
507 if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { | 507 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
508 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | 508 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
509 } | 509 } |
510 | 510 |
511 return; | 511 return; |
512 } | 512 } |
1036 if (!rev->timer_set) { | 1036 if (!rev->timer_set) { |
1037 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); | 1037 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); |
1038 ngx_add_timer(rev, cscf->client_header_timeout); | 1038 ngx_add_timer(rev, cscf->client_header_timeout); |
1039 } | 1039 } |
1040 | 1040 |
1041 if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { | 1041 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
1042 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | 1042 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
1043 return NGX_ERROR; | 1043 return NGX_ERROR; |
1044 } | 1044 } |
1045 | 1045 |
1046 return NGX_AGAIN; | 1046 return NGX_AGAIN; |
1969 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); | 1969 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
1970 if (!wev->delayed) { | 1970 if (!wev->delayed) { |
1971 ngx_add_timer(wev, clcf->send_timeout); | 1971 ngx_add_timer(wev, clcf->send_timeout); |
1972 } | 1972 } |
1973 | 1973 |
1974 if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) { | 1974 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { |
1975 ngx_http_close_request(r, 0); | 1975 ngx_http_close_request(r, 0); |
1976 return NGX_ERROR; | 1976 return NGX_ERROR; |
1977 } | 1977 } |
1978 | 1978 |
1979 return NGX_OK; | 1979 return NGX_OK; |
2010 wev->delayed = 0; | 2010 wev->delayed = 0; |
2011 | 2011 |
2012 if (!wev->ready) { | 2012 if (!wev->ready) { |
2013 ngx_add_timer(wev, clcf->send_timeout); | 2013 ngx_add_timer(wev, clcf->send_timeout); |
2014 | 2014 |
2015 if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) { | 2015 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { |
2016 ngx_http_close_request(r, 0); | 2016 ngx_http_close_request(r, 0); |
2017 } | 2017 } |
2018 | 2018 |
2019 return; | 2019 return; |
2020 } | 2020 } |
2022 } else { | 2022 } else { |
2023 if (wev->delayed) { | 2023 if (wev->delayed) { |
2024 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, | 2024 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, |
2025 "http writer delayed"); | 2025 "http writer delayed"); |
2026 | 2026 |
2027 if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) { | 2027 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { |
2028 ngx_http_close_request(r, 0); | 2028 ngx_http_close_request(r, 0); |
2029 } | 2029 } |
2030 | 2030 |
2031 return; | 2031 return; |
2032 } | 2032 } |
2046 | 2046 |
2047 if (!wev->ready && !wev->delayed) { | 2047 if (!wev->ready && !wev->delayed) { |
2048 ngx_add_timer(wev, clcf->send_timeout); | 2048 ngx_add_timer(wev, clcf->send_timeout); |
2049 } | 2049 } |
2050 | 2050 |
2051 if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) { | 2051 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { |
2052 ngx_http_close_request(r, 0); | 2052 ngx_http_close_request(r, 0); |
2053 } | 2053 } |
2054 | 2054 |
2055 return; | 2055 return; |
2056 } | 2056 } |
2081 /* aio does not call this handler */ | 2081 /* aio does not call this handler */ |
2082 | 2082 |
2083 if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) | 2083 if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) |
2084 && r->connection->read->active) | 2084 && r->connection->read->active) |
2085 { | 2085 { |
2086 if (ngx_del_event(r->connection->read, NGX_READ_EVENT, 0) | 2086 if (ngx_del_event(r->connection->read, NGX_READ_EVENT, 0) != NGX_OK) { |
2087 == NGX_ERROR) | |
2088 { | |
2089 ngx_http_close_request(r, 0); | 2087 ngx_http_close_request(r, 0); |
2090 } | 2088 } |
2091 } | 2089 } |
2092 } | 2090 } |
2093 | 2091 |
2145 | 2143 |
2146 /* aio does not call this handler */ | 2144 /* aio does not call this handler */ |
2147 | 2145 |
2148 if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && rev->active) { | 2146 if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && rev->active) { |
2149 | 2147 |
2150 if (ngx_del_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) { | 2148 if (ngx_del_event(rev, NGX_READ_EVENT, 0) != NGX_OK) { |
2151 ngx_http_close_request(r, 0); | 2149 ngx_http_close_request(r, 0); |
2152 } | 2150 } |
2153 } | 2151 } |
2154 | 2152 |
2155 return; | 2153 return; |
2239 | 2237 |
2240 c->data = hc; | 2238 c->data = hc; |
2241 | 2239 |
2242 ngx_add_timer(rev, clcf->keepalive_timeout); | 2240 ngx_add_timer(rev, clcf->keepalive_timeout); |
2243 | 2241 |
2244 if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { | 2242 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
2245 ngx_http_close_connection(c); | 2243 ngx_http_close_connection(c); |
2246 return; | 2244 return; |
2247 } | 2245 } |
2248 | 2246 |
2249 wev = c->write; | 2247 wev = c->write; |
2326 #endif | 2324 #endif |
2327 | 2325 |
2328 rev->handler = ngx_http_keepalive_handler; | 2326 rev->handler = ngx_http_keepalive_handler; |
2329 | 2327 |
2330 if (wev->active && (ngx_event_flags & NGX_USE_LEVEL_EVENT)) { | 2328 if (wev->active && (ngx_event_flags & NGX_USE_LEVEL_EVENT)) { |
2331 if (ngx_del_event(wev, NGX_WRITE_EVENT, 0) == NGX_ERROR) { | 2329 if (ngx_del_event(wev, NGX_WRITE_EVENT, 0) != NGX_OK) { |
2332 ngx_http_close_connection(c); | 2330 ngx_http_close_connection(c); |
2333 return; | 2331 return; |
2334 } | 2332 } |
2335 } | 2333 } |
2336 | 2334 |
2451 | 2449 |
2452 n = c->recv(c, b->last, size); | 2450 n = c->recv(c, b->last, size); |
2453 c->log_error = NGX_ERROR_INFO; | 2451 c->log_error = NGX_ERROR_INFO; |
2454 | 2452 |
2455 if (n == NGX_AGAIN) { | 2453 if (n == NGX_AGAIN) { |
2456 if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { | 2454 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
2457 ngx_http_close_connection(c); | 2455 ngx_http_close_connection(c); |
2458 } | 2456 } |
2459 | 2457 |
2460 return; | 2458 return; |
2461 } | 2459 } |
2504 rev->handler = ngx_http_lingering_close_handler; | 2502 rev->handler = ngx_http_lingering_close_handler; |
2505 | 2503 |
2506 r->lingering_time = ngx_time() + (time_t) (clcf->lingering_time / 1000); | 2504 r->lingering_time = ngx_time() + (time_t) (clcf->lingering_time / 1000); |
2507 ngx_add_timer(rev, clcf->lingering_timeout); | 2505 ngx_add_timer(rev, clcf->lingering_timeout); |
2508 | 2506 |
2509 if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { | 2507 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
2510 ngx_http_close_request(r, 0); | 2508 ngx_http_close_request(r, 0); |
2511 return; | 2509 return; |
2512 } | 2510 } |
2513 | 2511 |
2514 wev = c->write; | 2512 wev = c->write; |
2515 wev->handler = ngx_http_empty_handler; | 2513 wev->handler = ngx_http_empty_handler; |
2516 | 2514 |
2517 if (wev->active && (ngx_event_flags & NGX_USE_LEVEL_EVENT)) { | 2515 if (wev->active && (ngx_event_flags & NGX_USE_LEVEL_EVENT)) { |
2518 if (ngx_del_event(wev, NGX_WRITE_EVENT, 0) == NGX_ERROR) { | 2516 if (ngx_del_event(wev, NGX_WRITE_EVENT, 0) != NGX_OK) { |
2519 ngx_http_close_request(r, 0); | 2517 ngx_http_close_request(r, 0); |
2520 return; | 2518 return; |
2521 } | 2519 } |
2522 } | 2520 } |
2523 | 2521 |
2572 return; | 2570 return; |
2573 } | 2571 } |
2574 | 2572 |
2575 } while (rev->ready); | 2573 } while (rev->ready); |
2576 | 2574 |
2577 if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { | 2575 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
2578 ngx_http_close_request(r, 0); | 2576 ngx_http_close_request(r, 0); |
2579 return; | 2577 return; |
2580 } | 2578 } |
2581 | 2579 |
2582 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); | 2580 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |