|
Lines 972-986
Link Here
|
| 972 |
|
972 |
|
| 973 |
ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain; |
973 |
ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain; |
| 974 |
ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt; |
974 |
ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt; |
|
|
975 |
ps->viaopt_set = overrides->viaopt_set || base->viaopt_set; |
| 975 |
ps->req = (overrides->req_set == 0) ? base->req : overrides->req; |
976 |
ps->req = (overrides->req_set == 0) ? base->req : overrides->req; |
|
|
977 |
ps->req_set = overrides->req_set || base->req_set; |
| 976 |
ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size; |
978 |
ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size; |
|
|
979 |
ps->recv_buffer_size_set = overrides->recv_buffer_size_set || base->recv_buffer_size_set; |
| 977 |
ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size; |
980 |
ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size; |
|
|
981 |
ps->io_buffer_size_set = overrides->io_buffer_size_set || base->io_buffer_size_set; |
| 978 |
ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd; |
982 |
ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd; |
|
|
983 |
ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set; |
| 979 |
ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override; |
984 |
ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override; |
|
|
985 |
ps->error_override_set = overrides->error_override_set || base->error_override_set; |
| 980 |
ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host; |
986 |
ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host; |
|
|
987 |
ps->preserve_host_set = overrides->preserve_host_set || base->preserve_host_set; |
| 981 |
ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout; |
988 |
ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout; |
|
|
989 |
ps->timeout_set = overrides->timeout_set || base->timeout_set; |
| 982 |
ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt; |
990 |
ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt; |
|
|
991 |
ps->badopt_set = overrides->badopt_set || base->badopt_set; |
| 983 |
ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status; |
992 |
ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status; |
|
|
993 |
ps->proxy_status_set = overrides->proxy_status_set || base->proxy_status_set; |
| 984 |
ps->pool = p; |
994 |
ps->pool = p; |
| 985 |
return ps; |
995 |
return ps; |
| 986 |
} |
996 |
} |