otp.git/lib/ssl, branch OTP-21.3.4 Mirror of Erlang/OTP repository. Prepare release 2019-03-18T17:02:35+00:00 Erlang/OTP otp@erlang.org 2019-03-18T17:02:35+00:00 48eedeb93db5552164bb3675f139377f5dd2fd7d 






Merge branch 'ingela/ssl/recv-timeout-bug/ERL-884/ERL-883/OTP-14701' into maint-21
2019-03-18T17:02:32+00:00

Erlang/OTP
otp@erlang.org

2019-03-18T17:02:32+00:00

18940986f9539370efb6e3a2be53ec312c6445bf

* ingela/ssl/recv-timeout-bug/ERL-884/ERL-883/OTP-14701:
  ssl: Cancel recv timer in all places





* ingela/ssl/recv-timeout-bug/ERL-884/ERL-883/OTP-14701:
  ssl: Cancel recv timer in all places







Merge branch 'ingela/ssl/transport-transparance/ERL-861/OTP-15679' into maint-21
2019-03-18T17:02:32+00:00

Erlang/OTP
otp@erlang.org

2019-03-18T17:02:32+00:00

7b4f3319aa8cbe242c5e0ad7ef9730a3727a1333

* ingela/ssl/transport-transparance/ERL-861/OTP-15679:
  ssl: Fix transport transparancy





* ingela/ssl/transport-transparance/ERL-861/OTP-15679:
  ssl: Fix transport transparancy







ssl: Cancel recv timer in all places
2019-03-16T21:59:41+00:00

Ingela Anderton Andin
ingela@erlang.org

2019-03-16T21:59:41+00:00

18e8014fe2afa454ed644a731f7ddf820b79bb16

Would cause connection to crash although all data was delivered to ssl:recv





Would cause connection to crash although all data was delivered to ssl:recv







Prepare release
2019-03-11T10:52:56+00:00

Erlang/OTP
otp@erlang.org

2019-03-11T10:52:56+00:00

9780184b2cf76eced1ef987408073e96cc29f3bb












ssl: Fix transport transparancy
2019-03-11T10:25:47+00:00

Ingela Anderton Andin
ingela@erlang.org

2019-03-06T11:54:03+00:00

5a7cfb2d571d95829848cfa6e20066d19c9a4800












ssl: Correct active once emulation
2019-03-08T08:01:51+00:00

Ingela Anderton Andin
ingela@erlang.org

2019-03-07T19:44:46+00:00

ca46b31327072c88140e5434b29fa826fc3d47ad

Conflicts:
	lib/ftp/test/ftp_SUITE.erl





Conflicts:
	lib/ftp/test/ftp_SUITE.erl







Merge branch 'essen/ssl-active-n' into maint
2019-03-04T10:57:14+00:00

Raimo Niskanen
raimo@erlang.org

2019-03-04T10:57:14+00:00

df25e742f1ab87f8dbb290eed8e24ec919c3780a

* essen/ssl-active-n:
  fixup! ssl: Add support for {active,N}
  ssl: Use common fonction to update {active,N}
  ssl: Document {active,N}
  ssl: Add support for {active,N}

Conflicts:
	lib/ssl/src/ssl.erl





* essen/ssl-active-n:
  fixup! ssl: Add support for {active,N}
  ssl: Use common fonction to update {active,N}
  ssl: Document {active,N}
  ssl: Add support for {active,N}

Conflicts:
	lib/ssl/src/ssl.erl







Merge branch ssl-active-n of essen:erlang/otp into essen/ssl-active-n
2019-02-22T10:10:57+00:00

Raimo Niskanen
raimo@erlang.org

2019-02-22T10:05:48+00:00

73587632918cefc05d4112db74548b6770b35f9c

* essen:erlang/otp:
  fixup! ssl: Add support for {active,N}
  ssl: Use common fonction to update {active,N}
  ssl: Document {active,N}
  ssl: Add support for {active,N}

Conflicts:
	lib/ssl/src/ssl_connection.erl





* essen:erlang/otp:
  fixup! ssl: Add support for {active,N}
  ssl: Use common fonction to update {active,N}
  ssl: Document {active,N}
  ssl: Add support for {active,N}

Conflicts:
	lib/ssl/src/ssl_connection.erl







Merge branch 'ingela/ssl/doc-enhancements' into maint
2019-02-22T09:18:49+00:00

Ingela Anderton Andin
ingela@erlang.org

2019-02-22T09:18:49+00:00

53dea65ae6665d5d14c0d313c1f639637a3f0405

* ingela/ssl/doc-enhancements:
  ssl: Enhance documentation after "use-spec-rewrite"





* ingela/ssl/doc-enhancements:
  ssl: Enhance documentation after "use-spec-rewrite"