You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by jo...@apache.org on 2005/09/19 19:53:27 UTC

svn commit: r290216 - /apr/apr/trunk/CHANGES

Author: jorton
Date: Mon Sep 19 10:53:24 2005
New Revision: 290216

URL: http://svn.apache.org/viewcvs?rev=290216&view=rev
Log:
Synch with 1.2.x branch.

Modified:
    apr/apr/trunk/CHANGES

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/CHANGES?rev=290216&r1=290215&r2=290216&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES (original)
+++ apr/apr/trunk/CHANGES Mon Sep 19 10:53:24 2005
@@ -26,6 +26,12 @@
 
 Changes for APR 1.2.2
 
+  *) Fix apr_socket_opt_set() issue where TCP_NODELAY would be
+     set when TCP_DEFER_ACCEPT was set.  [Brian Pane]
+
+  *) Allow TCP_NODELAY and TCP_CORK to be set concurrently on
+     Linux 2.6 and later.  [Joe Orton]
+
   *) Fix apr_socket_addr_get(,APR_REMOTE,) after a non-blocking
      connection is completed.  PR 32737.  [Joe Orton]