diff options
| author | Haibo Huang <hhb@google.com> | 2019-01-08 14:27:10 -0800 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2019-01-14 23:02:29 +0000 |
| commit | 21926d584a5b118cbff81a9fb4329059011f87c6 (patch) | |
| tree | 421b037a92a6d5209e8e4c30e8a830c262abe6d4 /tests/secureserver.pl | |
| parent | 98caa6f514b401764e3ac76041ff7e006f109e8c (diff) | |
| download | external_curl-21926d584a5b118cbff81a9fb4329059011f87c6.tar.gz external_curl-21926d584a5b118cbff81a9fb4329059011f87c6.tar.bz2 external_curl-21926d584a5b118cbff81a9fb4329059011f87c6.zip | |
Upgrade curl from 7.62.0 to 7.63.0
Test: build, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: Iecd6120501e7a6d2c8b83c2891de62163a30f08a
Diffstat (limited to 'tests/secureserver.pl')
| -rwxr-xr-x | tests/secureserver.pl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/secureserver.pl b/tests/secureserver.pl index c897ee5f..969fb17b 100755 --- a/tests/secureserver.pl +++ b/tests/secureserver.pl @@ -264,6 +264,11 @@ if($stunnel_version < 400) { # if($stunnel_version >= 400) { $socketopt = "a:SO_REUSEADDR=1"; + if(($stunnel_version >= 534) && $tstunnel_windows) { + # SO_EXCLUSIVEADDRUSE is on by default on Vista or newer, + # but does not work together with SO_REUSEADDR being on. + $socketopt .= "\nsocket = a:SO_EXCLUSIVEADDRUSE=0"; + } $cmd = "$stunnel $conffile "; $cmd .= ">$logfile 2>&1"; # setup signal handler |