{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1750742246, "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":"00aed6a67e63422c4099ad21c53b7c56", "commit": {"type":"commit", "time": 1493115219, "time_ofs": 60, "oid_tree": { "oid": "7d89b2cede300dbf3c34ec416e9f1da393f9b5ab", "alias": []}, "oid":{ "oid": "c4666bfa13480c1e700a0d487300da2a56e889af", "alias": []}, "msg": "Ask libssl if we should retry not the socket", "sig_commit": { "git_time": { "time": 1493115219, "offset": 60 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }, "sig_author": { "git_time": { "time": 1492695933, "offset": 60 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }}, "body": "Ask libssl if we should retry not the socket\n\ns_server was asking the underlying socket if it is a retryable error rather\nthan libssl which has more information.\n\nReviewed-by: Richard Levitte \u003clevitte@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/3286)" , "diff": "diff --git a/apps/s_server.c b/apps/s_server.c\nindex 81c3973..7fb7772 100644\n--- a/apps/s_server.c\n+++ b/apps/s_server.c\n@@ -2646,7 +2646,7 @@ static int init_ssl_connection(SSL *con)\n i \u003d SSL_accept(con);\n \n if (i \u003c\u003d 0)\n- retry \u003d BIO_sock_should_retry(i);\n+ retry \u003d !SSL_want_nothing(con);\n #ifdef CERT_CB_TEST_RETRY\n {\n while (i \u003c\u003d 0\n@@ -2656,7 +2656,7 @@ static int init_ssl_connection(SSL *con)\n \u0022LOOKUP from certificate callback during accept\u005cn\u0022);\n i \u003d SSL_accept(con);\n if (i \u003c\u003d 0)\n- retry \u003d BIO_sock_should_retry(i);\n+ retry \u003d !SSL_want_nothing(con);\n }\n }\n #endif\n@@ -2677,7 +2677,7 @@ static int init_ssl_connection(SSL *con)\n BIO_printf(bio_s_out, \u0022LOOKUP not successful\u005cn\u0022);\n i \u003d SSL_accept(con);\n if (i \u003c\u003d 0)\n- retry \u003d BIO_sock_should_retry(i);\n+ retry \u003d !SSL_want_nothing(con);\n }\n #endif\n } while (i \u003c 0 \u0026\u0026 SSL_waiting_for_async(con));\n","s":{"c":1750742246,"u": 31070}} ],"g": 31843,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}