diff options
| author | Micael Karlberg <[email protected]> | 2011-03-28 11:37:36 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-28 11:37:36 +0200 |
| commit | 117d7f67b394928755e607afe97e21dca3c060a7 (patch) | |
| tree | 03731c35f03b865b001bd3a86332887a0cb02107 /lib/inets/doc/src | |
| parent | 3b9072a22c8050215c3d72e46c31e73c2a95532d (diff) | |
| parent | eea0a7bdf77179c98e41f867398253c4c6f0811f (diff) | |
| download | otp-117d7f67b394928755e607afe97e21dca3c060a7.tar.gz otp-117d7f67b394928755e607afe97e21dca3c060a7.tar.bz2 otp-117d7f67b394928755e607afe97e21dca3c060a7.zip | |
Merge branch 'bd/mod_esi_timeout_fix' into bmk/inets/inet56_integration
OTP-9158
Diffstat (limited to 'lib/inets/doc/src')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 5adbfbade8..f9411fed2a 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -98,6 +98,16 @@ <p>Garrett Smith</p> <p>Own Id: OTP-9131</p> </item> + + <item> + <p>[httpd] Fix timeout message generated by mod_esi. + When a mod_esi request times out, the code to send a + timeout response was incorrect and generated an + internal server error as well as an invalid response + line. </p> + <p>Bernard Duggan</p> + <p>Own Id: OTP-9158</p> + </item> </list> </section> |