|
Lines 751-765
Link Here
|
| 751 |
|
751 |
|
| 752 |
ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain; |
752 |
ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain; |
| 753 |
ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt; |
753 |
ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt; |
|
|
754 |
ps->viaopt_set = overrides->viaopt_set || base->viaopt_set; |
| 754 |
ps->req = (overrides->req_set == 0) ? base->req : overrides->req; |
755 |
ps->req = (overrides->req_set == 0) ? base->req : overrides->req; |
|
|
756 |
ps->req_set = overrides->req_set || base->req_set; |
| 755 |
ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size; |
757 |
ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size; |
|
|
758 |
ps->recv_buffer_size_set = overrides->recv_buffer_size_set || base->recv_buffer_size_set; |
| 756 |
ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size; |
759 |
ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size; |
|
|
760 |
ps->io_buffer_size_set = overrides->io_buffer_size_set || base->io_buffer_size_set; |
| 757 |
ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd; |
761 |
ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd; |
|
|
762 |
ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set; |
| 758 |
ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override; |
763 |
ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override; |
|
|
764 |
ps->error_override_set = overrides->error_override_set || base->error_override_set; |
| 759 |
ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host; |
765 |
ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host; |
|
|
766 |
ps->preserve_host_set = overrides->preserve_host_set || base->preserve_host_set; |
| 760 |
ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout; |
767 |
ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout; |
|
|
768 |
ps->timeout_set = overrides->timeout_set || base->timeout_set; |
| 761 |
ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt; |
769 |
ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt; |
|
|
770 |
ps->badopt_set = overrides->badopt_set || base->badopt_set; |
| 762 |
ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status; |
771 |
ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status; |
|
|
772 |
ps->proxy_status_set = overrides->proxy_status_set || base->proxy_status_set; |
| 763 |
ps->pool = p; |
773 |
ps->pool = p; |
| 764 |
return ps; |
774 |
return ps; |
| 765 |
} |
775 |
} |