JBossWeb SVN: r1309 - in branches/2.1.x: webapps/docs and 1 other directory. - jbossweb-commits

Monday, 30 November 2009

Author: jfrederic.clere(a)jboss.com
Date: 2009-11-30 08:57:53 -0500 (Mon, 30 Nov 2009)
New Revision: 1309

Modified:
   branches/2.1.x/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
   branches/2.1.x/webapps/docs/changelog.xml
Log:
Port from trunk.


Modified: branches/2.1.x/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
===================================================================

--- branches/2.1.x/java/org/apache/coyote/http11/InternalAprOutputBuffer.java	2009-11-30
13:21:02 UTC (rev 1308)
+++ branches/2.1.x/java/org/apache/coyote/http11/InternalAprOutputBuffer.java	2009-11-30
13:57:53 UTC (rev 1309)
@@ -718,7 +718,7 @@
                 int end = bbuf.position();
                 int res = 0;
                 while (pos < end) {
-                    res = Socket.sendibb(socket, pos, bbuf.position());
+                    res = Socket.sendibb(socket, pos, end - pos);
                     if (res > 0) {
                         pos += res;
                     } else {
@@ -750,7 +750,7 @@
         int end = bbuf.position();
         int res = 0;
         while (pos < end) {
-            res = Socket.sendibb(socket, pos, bbuf.position());
+            res = Socket.sendibb(socket, pos, end - pos);
             if (res > 0) {
                 pos += res;
             } else {
@@ -812,7 +812,7 @@
                 int pos = 0;
                 int end = bbuf.position();
                 while (pos < end) {
-                    res = Socket.sendibb(socket, pos, end);
+                    res = Socket.sendibb(socket, pos, end - pos);
                     if (res > 0) {
                         pos += res;
                     } else {

Modified: branches/2.1.x/webapps/docs/changelog.xml
===================================================================
--- branches/2.1.x/webapps/docs/changelog.xml	2009-11-30 13:21:02 UTC (rev 1308)
+++ branches/2.1.x/webapps/docs/changelog.xml	2009-11-30 13:57:53 UTC (rev 1309)
@@ -16,6 +16,16 @@
 
 <body>
 
+<section name="JBoss Web 2.1.7.GA (remm)">
+  <subsection name="Coyote">
+    <changelog>
+      <fix>
+        Fix incomplete write logic in APR. (jfclere)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
+
 <section name="JBoss Web 2.1.6.GA (remm)">
   <subsection name="Coyote">
     <changelog>


    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

JBossWeb SVN: r1309 - in branches/2.1.x: webapps/docs and 1 other directory.