diff options
| author | Erlang/OTP <[email protected]> | 2015-01-30 16:56:49 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-01-30 16:56:49 +0100 |
| commit | 7b8af304c9e45540013eefc5b17ae03f8c36bc85 (patch) | |
| tree | 6009f89882310a22c224313987445ada8fea912d /erts/emulator | |
| parent | af87b1c3d4897840d8247589a88d3611106ecedc (diff) | |
| parent | a0a7d8d312ca1ce329bce1432638096a13a9c52f (diff) | |
| download | otp-7b8af304c9e45540013eefc5b17ae03f8c36bc85.tar.gz otp-7b8af304c9e45540013eefc5b17ae03f8c36bc85.tar.bz2 otp-7b8af304c9e45540013eefc5b17ae03f8c36bc85.zip | |
Merge branch 'ia/maint/inets/invalid-content-length/mod_alias_https/consistent_keep_alive_timeout/OTP-12429/OTP-12436' into maint-17
* ia/maint/inets/invalid-content-length/mod_alias_https/consistent_keep_alive_timeout/OTP-12429/OTP-12436:
inets: Consistent view of configuration parameter keep_alive_timeout
inets: httpd - mod_alias now handles https URIs
inets: httpd - Sanity check of content-length header
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions