aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2018-07-11Merge branch 'maint'Ingela Anderton Andin
2018-07-11Merge pull request #1869 from IngelaAndin/ingela/ssl/unexpected-call/ERL-664/...Ingela Andin
2018-07-10Merge branch 'sverker/erts/cpool-simplify'Sverker Eriksson
2018-07-10ssl: Make sure tls_ssl_accept_timeout has a clean startIngela Anderton Andin
2018-07-09ssl: Improve error handlingIngela Anderton Andin
2018-07-09Merge branch 'maint'Péter Dimitrov
2018-07-09Merge pull request #1862 from rschlaikjer/rschlaikjer-httpc-ssl-redirect-bugPéter Dimitrov
2018-07-09Merge branch 'lukas/travis/fix-doc-deploy' of github.com:garazdawi/otpBjörn Gustavsson
2018-07-07travis: Only deploy in erlang/otpLukas Larsson
2018-07-06Merge branch 'maint'Ingela Anderton Andin
2018-07-06Merge pull request #1867 from IngelaAndin/ingela/ssl/no-ca-sign-restriction-T...Ingela Andin
2018-07-06Don't modify URI, explicitly pass scheme to get_portRoss Schlaikjer
2018-07-06Update scheme on redirect URI and accumulatorRoss Schlaikjer
2018-07-06Fix accidental Port assertion in resolve_authorityRoss Schlaikjer
2018-07-06Add test case on relative redirects with portsRoss Schlaikjer
2018-07-06Do not assert that new URI port is same as old portRoss Schlaikjer
2018-07-06Add mixed test group, http -> https redirect testRoss Schlaikjer
2018-07-06diffable: Don't define VSN for the ssl appBjörn Gustavsson
2018-07-06Merge branch 'maint'Hans Bolinder
2018-07-06Merge branch 'hasse/erts/correct_absform' into maintHans Bolinder
2018-07-06Merge branch 'maint'Björn Gustavsson
2018-07-06Merge branch 'bjorn/compiler/cuddle-with-tests' into maintBjörn Gustavsson
2018-07-06Merge branch 'bjorn/erts/fix-disassembler' into maintBjörn Gustavsson
2018-07-06Call test_lib:recompile/1 from init_per_suite/1Björn Gustavsson
2018-07-05Merge branch 'maint'Ingela Anderton Andin
2018-07-05Merge branch 'ingela/cuddle/basic_SUITE' into maintIngela Anderton Andin
2018-07-05erts: Correct The Abstract FormatHans Bolinder
2018-07-05ssl: Fix test case to only check relevant info for the testIngela Anderton Andin
2018-07-05ssl: Correct connection_information on ECC-curvesIngela Anderton Andin
2018-07-05ssl: No cipher suite sign restriction in TLS-1.2Ingela Anderton Andin
2018-07-05Merge branch 'maint'Ingela Anderton Andin
2018-07-05Merge pull request #1866 from IngelaAndin/ingela/ssl/PSK-hash-sign-selection/...Ingela Andin
2018-07-05beam_debug: Fix printing of floating point registersBjörn Gustavsson
2018-07-05Merge branch 'john/tools/cuddle-instrument-suite'John Högberg
2018-07-05Make instrument suite more stable after PR-1854John Högberg
2018-07-05Merge branch 'sverker/master/purge-vfork'Sverker Eriksson
2018-07-05Merge branch 'maint'Sverker Eriksson
2018-07-05Merge branch 'sverker/purge-vfork' into maintSverker Eriksson
2018-07-05erts: Simplify calc of allctr->cpool.abandon_limitSverker Eriksson
2018-07-05erts: Simplify cpool_fetchSverker Eriksson
2018-07-05Merge branch 'peterdmv/ssl/use_logger/OTP-15055'Péter Dimitrov
2018-07-04Merge pull request #1859 from josevalim/patch-9Péter Dimitrov
2018-07-04Merge branch 'maint'Sverker Eriksson
2018-07-04Merge branch 'sverker/kernel/silence-dialyzer/OTP-15170' into maintSverker Eriksson
2018-07-04ssl: Do not use legacy formatIngela Anderton Andin
2018-07-04ssl: Add connection information on new cipher_suite formatIngela Anderton Andin
2018-07-04ssl: Add psk as anonymous key exchange in ssl_handshake:select_hashsign/5Ingela Anderton Andin
2018-07-04Merge branch 'maint'John Högberg
2018-07-04Merge branch 'maint-21' into maintJohn Högberg
2018-07-03Merge branch 'maint'Raimo Niskanen