diff options
| author | Micael Karlberg <[email protected]> | 2012-01-05 12:35:40 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-05 12:35:40 +0100 |
| commit | b1d6a39529229a98ce57f2121cbe080702e82adc (patch) | |
| tree | 0ee418b0af3052590a893247888b1dc3cadc197e /lib/inets/doc | |
| parent | be7a927e000c0b772fefa43343b7a14d9070d871 (diff) | |
| parent | 5edcd0d6372d73124e4160a2bbc5b81853642fc5 (diff) | |
| download | otp-b1d6a39529229a98ce57f2121cbe080702e82adc.tar.gz otp-b1d6a39529229a98ce57f2121cbe080702e82adc.tar.bz2 otp-b1d6a39529229a98ce57f2121cbe080702e82adc.zip | |
Merge branch 'bmk/inets/httpc/bad_keep_alive_mode/r14/OTP-9847' into bmk/inets/inets573_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/doc')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index ae2557b44e..34f93586e1 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2002</year><year>2011</year> + <year>2002</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -62,6 +62,13 @@ <p>Aux Id: Seq 11970 </p> </item> + <item> + <p>[httpc] Bad Keep Alive Mode. When selecting a session, + the "state" of the session (specifically if the server has + responded) was not taken into account. </p> + <p>Own Id: OTP-9847</p> + </item> + </list> </section> |