{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1753412974, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"4ef730880c12fbd43bf8c3dc02d51205", "commit": {"type":"commit", "time": 1523607267, "time_ofs": 120, "oid_tree": { "oid": "e1cefe48115073690458a6f7bddd1791fd8e079b", "alias": []}, "oid":{ "oid": "b4c1950d8914775db503d8ab931735325032a40d", "alias": []}, "msg": "TLSProxy/Proxy.pm: handle \u0022impossible\u0022 failure to connect to s_server.", "sig_commit": { "git_time": { "time": 1523607267, "offset": 120 }, "name": "Andy Polyakov", "email": "appro@openssl.org", "md5": "50bd64fa2a792cbbf679fa16213a3b2a" }, "sig_author": { "git_time": { "time": 1523451397, "offset": 120 }, "name": "Andy Polyakov", "email": "appro@openssl.org", "md5": "50bd64fa2a792cbbf679fa16213a3b2a" }}, "body": "TLSProxy/Proxy.pm: handle \u0022impossible\u0022 failure to connect to s_server.\n\nThe failure is \u0022impossible\u0022, because we have confirmation that s_server\nlistens, yet Mac OS X fails to connect. This avoids 10 minutes timeout\non Travis CI.\n\nReviewed-by: Bernd Edlinger \u003cbernd.edlinger@hotmail.de\u003e\nReviewed-by: Rich Salz \u003crsalz@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/5907)\n" , "diff": "diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm\nindex 19b09a4..45d88bf 100644\n--- a/util/perl/TLSProxy/Proxy.pm\n+++ b/util/perl/TLSProxy/Proxy.pm\n@@ -189,10 +189,16 @@ sub connect_to_server\n \n $servaddr \u003d~ s/[\u005c[\u005c]]//g; # Remove [ and ]\n \n- $self-\u003e{server_sock} \u003d $IP_factory-\u003e(PeerAddr \u003d\u003e $servaddr,\n- PeerPort \u003d\u003e $self-\u003e{server_port},\n- Proto \u003d\u003e 'tcp')\n- or die \u0022unable to connect: $!\u005cn\u0022;\n+ my $sock \u003d $IP_factory-\u003e(PeerAddr \u003d\u003e $servaddr,\n+ PeerPort \u003d\u003e $self-\u003e{server_port},\n+ Proto \u003d\u003e 'tcp');\n+ if (!defined($sock)) {\n+ my $err \u003d $!;\n+ kill(3, $self-\u003e{real_serverpid});\n+ die \u0022unable to connect: $err\u005cn\u0022;\n+ }\n+\n+ $self-\u003e{server_sock} \u003d $sock;\n }\n \n sub start\n","s":{"c":1753412974,"u": 35860}} ],"g": 37274,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}