|
Lines 481-494
Link Here
|
| 481 |
|
481 |
|
| 482 |
ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain; |
482 |
ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain; |
| 483 |
ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt; |
483 |
ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt; |
|
|
484 |
ps->viaopt_set = overrides->viaopt_set || base->viaopt_set; |
| 484 |
ps->req = (overrides->req_set == 0) ? base->req : overrides->req; |
485 |
ps->req = (overrides->req_set == 0) ? base->req : overrides->req; |
|
|
486 |
ps->req_set = overrides->req_set || base->req_set; |
| 485 |
ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size; |
487 |
ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size; |
|
|
488 |
ps->recv_buffer_size_set = overrides->recv_buffer_size_set || base->recv_buffer_size_set; |
| 486 |
ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size; |
489 |
ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size; |
|
|
490 |
ps->io_buffer_size_set = overrides->io_buffer_size_set || base->io_buffer_size_set; |
| 487 |
ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd; |
491 |
ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd; |
|
|
492 |
ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set; |
| 488 |
ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override; |
493 |
ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override; |
|
|
494 |
ps->error_override_set = overrides->error_override_set || base->error_override_set; |
| 489 |
ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host; |
495 |
ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host; |
|
|
496 |
ps->preserve_host_set = overrides->preserve_host_set || base->preserve_host_set; |
| 490 |
ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout; |
497 |
ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout; |
|
|
498 |
ps->timeout_set = overrides->timeout_set || base->timeout_set; |
| 491 |
ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt; |
499 |
ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt; |
|
|
500 |
ps->badopt_set = overrides->badopt_set || base->badopt_set; |
| 492 |
|
501 |
|
| 493 |
return ps; |
502 |
return ps; |
| 494 |
} |
503 |
} |