diff options
author | Ingela Anderton Andin <[email protected]> | 2013-02-22 14:41:55 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-02-22 14:41:55 +0100 |
commit | 5c7fe21f434f15a1005cb0529a64ca8461c83172 (patch) | |
tree | 6e79aa7bbe1a72eff14e57ef260d371365de9191 /lib/common_test/src/ct_master_event.erl | |
parent | 5b1d51fedf10ebc6cccaa4f43396f98c644f3ba9 (diff) | |
parent | da3797589463002f28fc42ef27872650fe1de938 (diff) | |
download | otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.tar.gz otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.tar.bz2 otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.zip |
Merge branch 'ia/inets/httpc-pipelin-vs-persisten-and-httpd-ssl-conf'
* ia/inets/httpc-pipelin-vs-persisten-and-httpd-ssl-conf:
inets httpd: Handle ipfamily option correctly when listning to port 0
inets: Improve ssl handling
inets httpd: The option modules now defaults to its documented default value.
inets httpc: Corrected separation of pipelining and persisten connections
Diffstat (limited to 'lib/common_test/src/ct_master_event.erl')
0 files changed, 0 insertions, 0 deletions