From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 28 Jun 2009 22:24:31 +0000 (+0000)
Subject: Blocked revisions 73272,73546 via svnmerge
X-Git-Tag: v3.2a1~2949
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97479ad6075e647e600b1699678ad039a667b554;p=python

Blocked revisions 73272,73546 via svnmerge

........
  r73272 | kristjan.jonsson | 2009-06-07 11:43:23 -0500 (Sun, 07 Jun 2009) | 2 lines

  http://bugs.python.org/issue6192
  Add a feature to disable the Nagle algorithm on sockets in TCPServer
........
  r73546 | kristjan.jonsson | 2009-06-24 04:17:04 -0500 (Wed, 24 Jun 2009) | 2 lines

  http://bugs.python.org/issue6192
  Move the newly introduced disable_nagle_algorithm flag into the StreamRequestHandler, where it is more appropriate.
........
---