vendor/nginx/src/event/ngx_event_connect.c in nginxtra-1.4.7.9 vs vendor/nginx/src/event/ngx_event_connect.c in nginxtra-1.6.0.9

- old
+ new

@@ -29,11 +29,11 @@ s = ngx_socket(pc->sockaddr->sa_family, SOCK_STREAM, 0); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0, "socket %d", s); - if (s == -1) { + if (s == (ngx_socket_t) -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ngx_socket_n " failed"); return NGX_ERROR; } @@ -120,10 +120,10 @@ goto failed; } } ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pc->log, 0, - "connect to %V, fd:%d #%d", pc->name, s, c->number); + "connect to %V, fd:%d #%uA", pc->name, s, c->number); rc = connect(s, pc->sockaddr, pc->socklen); if (rc == -1) { err = ngx_socket_errno;