diff options
author | Ingela Anderton Andin <[email protected]> | 2015-12-01 10:01:16 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-12-01 10:01:16 +0100 |
commit | 552818fd16f1a842e5d206d43bb442de685356da (patch) | |
tree | 24f9bbb61dd8bc1700b49fc6dcbf8b381f04d04c /erts/emulator/Makefile.in | |
parent | 16801311ad52b6d50b4c462da26b3d34f0736e48 (diff) | |
parent | ebbbd714ad2398858b09065bce82830d8affe2a4 (diff) | |
download | otp-552818fd16f1a842e5d206d43bb442de685356da.tar.gz otp-552818fd16f1a842e5d206d43bb442de685356da.tar.bz2 otp-552818fd16f1a842e5d206d43bb442de685356da.zip |
Merge branch 'ia/inets/esi-timeout/OTP-13110' into maint
* ia/inets/esi-timeout/OTP-13110:
inets: Add warning header in "chunk trailer" when mod_esi callback times out or fails
inets: Remove exit that generates an incorrect internal server error
Diffstat (limited to 'erts/emulator/Makefile.in')
0 files changed, 0 insertions, 0 deletions