Mercurial > hg > nginx-vendor-current

comparison src/event/ngx_event_connect.c @ 660:d0f7a625f27c NGINX_1_1_14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.14 *) Feature: multiple "limit_req" limits may be used simultaneously. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "proxy_redirect" directives might not be correctly inherited. *) Bugfix: memory leak during reconfiguration if the "pcre_jit" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Mon, 30 Jan 2012 00:00:00 +0400
parents 5c576ea5dbd9
children
comparison
equal deleted inserted replaced
659:d48f991d7bd0 660:d0f7a625f27c
1 1
2 /* 2 /*
3 * Copyright (C) Igor Sysoev 3 * Copyright (C) Igor Sysoev
4 * Copyright (C) Nginx, Inc.
4 */ 5 */
5 6
6 7
7 #include <ngx_config.h> 8 #include <ngx_config.h>
8 #include <ngx_core.h> 9 #include <ngx_core.h>
157 } 158 }
158 159
159 ngx_log_error(level, c->log, err, "connect() to %V failed", 160 ngx_log_error(level, c->log, err, "connect() to %V failed",
160 pc->name); 161 pc->name);
161 162
163 ngx_close_connection(c);
164 pc->connection = NULL;
165
162 return NGX_DECLINED; 166 return NGX_DECLINED;
163 } 167 }
164 } 168 }
165 169
166 if (ngx_add_conn) { 170 if (ngx_add_conn) {
238 242
239 return NGX_OK; 243 return NGX_OK;
240 244
241 failed: 245 failed:
242 246
243 ngx_free_connection(c); 247 ngx_close_connection(c);
244 248 pc->connection = NULL;
245 if (ngx_close_socket(s) == -1) {
246 ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
247 ngx_close_socket_n " failed");
248 }
249 249
250 return NGX_ERROR; 250 return NGX_ERROR;
251 } 251 }
252 252
253 253