aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/utils
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-02-22 14:41:55 +0100
committerIngela Anderton Andin <[email protected]>2013-02-22 14:41:55 +0100
commit5c7fe21f434f15a1005cb0529a64ca8461c83172 (patch)
tree6e79aa7bbe1a72eff14e57ef260d371365de9191 /erts/emulator/utils
parent5b1d51fedf10ebc6cccaa4f43396f98c644f3ba9 (diff)
parentda3797589463002f28fc42ef27872650fe1de938 (diff)
downloadotp-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 'erts/emulator/utils')
0 files changed, 0 insertions, 0 deletions