| 1 | diff -r nginx-1.2.7/src/core/ngx_resolver.c nginx-1.2.7-patched/src/core/ngx_resolver.c
|
|---|
| 2 | 885,888c885,888
|
|---|
| 3 | < uc->log = *r->log;
|
|---|
| 4 | < uc->log.handler = ngx_resolver_log_error;
|
|---|
| 5 | < uc->log.data = uc;
|
|---|
| 6 | < uc->log.action = "resolving";
|
|---|
| 7 | ---
|
|---|
| 8 | > uc->log = r->log;
|
|---|
| 9 | > uc->log->handler = ngx_resolver_log_error;
|
|---|
| 10 | > uc->log->data = uc;
|
|---|
| 11 | > uc->log->action = "resolving";
|
|---|
| 12 | 906c906
|
|---|
| 13 | < ngx_log_error(NGX_LOG_CRIT, &uc->log, 0, "send() incomplete");
|
|---|
| 14 | ---
|
|---|
| 15 | > ngx_log_error(NGX_LOG_CRIT, uc->log, 0, "send() incomplete");
|
|---|
| 16 | 2222c2222
|
|---|
| 17 | < ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &uc->log, 0, "UDP socket %d", s);
|
|---|
| 18 | ---
|
|---|
| 19 | > ngx_log_debug1(NGX_LOG_DEBUG_EVENT, uc->log, 0, "UDP socket %d", s);
|
|---|
| 20 | 2225c2225
|
|---|
| 21 | < ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
|
|---|
| 22 | ---
|
|---|
| 23 | > ngx_log_error(NGX_LOG_ALERT, uc->log, ngx_socket_errno,
|
|---|
| 24 | 2230c2230
|
|---|
| 25 | < c = ngx_get_connection(s, &uc->log);
|
|---|
| 26 | ---
|
|---|
| 27 | > c = ngx_get_connection(s, uc->log);
|
|---|
| 28 | 2234c2234
|
|---|
| 29 | < ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
|
|---|
| 30 | ---
|
|---|
| 31 | > ngx_log_error(NGX_LOG_ALERT, uc->log, ngx_socket_errno,
|
|---|
| 32 | 2242c2242
|
|---|
| 33 | < ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
|
|---|
| 34 | ---
|
|---|
| 35 | > ngx_log_error(NGX_LOG_ALERT, uc->log, ngx_socket_errno,
|
|---|
| 36 | 2248c2248
|
|---|
| 37 | < ngx_log_error(NGX_LOG_ALERT, &uc->log, ngx_socket_errno,
|
|---|
| 38 | ---
|
|---|
| 39 | > ngx_log_error(NGX_LOG_ALERT, uc->log, ngx_socket_errno,
|
|---|
| 40 | 2258,2259c2258,2259
|
|---|
| 41 | < rev->log = &uc->log;
|
|---|
| 42 | < wev->log = &uc->log;
|
|---|
| 43 | ---
|
|---|
| 44 | > rev->log = uc->log;
|
|---|
| 45 | > wev->log = uc->log;
|
|---|
| 46 | 2276c2276
|
|---|
| 47 | < ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &uc->log, 0,
|
|---|
| 48 | ---
|
|---|
| 49 | > ngx_log_debug3(NGX_LOG_DEBUG_EVENT, uc->log, 0,
|
|---|
| 50 | 2284c2284
|
|---|
| 51 | < ngx_log_error(NGX_LOG_CRIT, &uc->log, ngx_socket_errno,
|
|---|
| 52 | ---
|
|---|
| 53 | > ngx_log_error(NGX_LOG_CRIT, uc->log, ngx_socket_errno,
|
|---|
| 54 | diff -r nginx-1.2.7/src/core/ngx_resolver.h nginx-1.2.7-patched/src/core/ngx_resolver.h
|
|---|
| 55 | 41c41
|
|---|
| 56 | < ngx_log_t log;
|
|---|
| 57 | ---
|
|---|
| 58 | > ngx_log_t *log;
|
|---|
