JFC: please don't forget to update trunk of tcnative too. I recently forward ported a lot of changes because the 1.1 branch was ahead of trunk.
Regards, Rainer On 20.07.2011 17:25, jfcl...@apache.org wrote: > Author: jfclere > Date: Wed Jul 20 15:25:02 2011 > New Revision: 1148814 > > URL: http://svn.apache.org/viewvc?rev=1148814&view=rev > Log: > Fix for 50394. Need fix in > java/org/apache/coyote/http11/InternalAprInputBuffer.java too. > > Modified: > tomcat/native/branches/1.1.x/native/src/network.c > > Modified: tomcat/native/branches/1.1.x/native/src/network.c > URL: > http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/network.c?rev=1148814&r1=1148813&r2=1148814&view=diff > ============================================================================== > --- tomcat/native/branches/1.1.x/native/src/network.c (original) > +++ tomcat/native/branches/1.1.x/native/src/network.c Wed Jul 20 15:25:02 2011 > @@ -929,6 +929,8 @@ TCN_IMPLEMENT_CALL(jint, Socket, recvbb) > #endif > if (ss == APR_SUCCESS) > return (jint)nbytes; > + else if (APR_STATUS_IS_EOF(ss)) > + return 0; > else { > TCN_ERROR_WRAP(ss); > return -(jint)ss; > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
