Mercurial > hg > nginx-quic
comparison src/event/ngx_event.c @ 3237:2efa8d2fcde1 stable-0.7
merge r2903, r2911, r2912, r3002:
fix various failures handling
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 15:54:29 +0000 |
parents | 4d62ef39f08b |
children | f9d97311c652 |
comparison
equal
deleted
inserted
replaced
3236:9aa8fd2d5a00 | 3237:2efa8d2fcde1 |
---|---|
1111 { | 1111 { |
1112 ngx_event_conf_t *ecf; | 1112 ngx_event_conf_t *ecf; |
1113 | 1113 |
1114 ecf = ngx_palloc(cycle->pool, sizeof(ngx_event_conf_t)); | 1114 ecf = ngx_palloc(cycle->pool, sizeof(ngx_event_conf_t)); |
1115 if (ecf == NULL) { | 1115 if (ecf == NULL) { |
1116 return NGX_CONF_ERROR; | 1116 return NULL; |
1117 } | 1117 } |
1118 | 1118 |
1119 ecf->connections = NGX_CONF_UNSET_UINT; | 1119 ecf->connections = NGX_CONF_UNSET_UINT; |
1120 ecf->use = NGX_CONF_UNSET_UINT; | 1120 ecf->use = NGX_CONF_UNSET_UINT; |
1121 ecf->multi_accept = NGX_CONF_UNSET; | 1121 ecf->multi_accept = NGX_CONF_UNSET; |
1126 #if (NGX_DEBUG) | 1126 #if (NGX_DEBUG) |
1127 | 1127 |
1128 if (ngx_array_init(&ecf->debug_connection, cycle->pool, 4, | 1128 if (ngx_array_init(&ecf->debug_connection, cycle->pool, 4, |
1129 sizeof(ngx_event_debug_t)) == NGX_ERROR) | 1129 sizeof(ngx_event_debug_t)) == NGX_ERROR) |
1130 { | 1130 { |
1131 return NGX_CONF_ERROR; | 1131 return NULL; |
1132 } | 1132 } |
1133 | 1133 |
1134 #endif | 1134 #endif |
1135 | 1135 |
1136 return ecf; | 1136 return ecf; |