Re: svn commit: r572181 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp12_worker.c jk_ajp_common.c jk_jni_worker.c jk_status.c

[Mladen Turk]

Rainer Jung wrote:

Hi Mladen,

I'm fine with rolling back and committing in steps.


No need to do that. Let's just take more care in the future.
It'll be much easier to follow the commits thought.

Regards,
Mladen

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Move trunk to sandbox

[Remy Maucherat]

Peter Rossbach wrote:

+1

move 6.0 trunk at a sandbox. We must made a check that we not lose some 
non comet changes :-(


This vote is about trunk (/tomcat/trunk), not the 6.0.x trunk 
(/tomcat/tc6.0.x/trunk). 6.0.x trunk is from where 6.0.x tags are 
created, so it's really the 6.0.x branch. As I said in my post, there 
could be changes to commit procedures according to what Jean-Frédéric 
posted earlier.


Hope this clarifies things.

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Move trunk to sandbox

[Peter Rossbach]

Yes, its clear and vote to move tomcat/trunk to a sandbox branch!

Peter



Am 03.09.2007 um 11:53 schrieb Remy Maucherat:


Peter Rossbach wrote:

+1
move 6.0 trunk at a sandbox. We must made a check that we not lose  
some non comet changes :-(


This vote is about trunk (/tomcat/trunk), not the 6.0.x trunk (/ 
tomcat/tc6.0.x/trunk). 6.0.x trunk is from where 6.0.x tags are  
created, so it's really the 6.0.x branch. As I said in my post,  
there could be changes to commit procedures according to what Jean- 
Frédéric posted earlier.


Hope this clarifies things.

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Draft for September 2007 Board report

[Yoav Shapira]

Hey,

On 9/3/07, Mladen Turk <[EMAIL PROTECTED]> wrote:
> We need to file the board report by next week for a board
> meeting on September 19th.
>
> Here is my draft, so please fill in the gaps, since it's my
> first one :)

Looks good to me ;)
Yoav

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Release build 5.5.25

[Remy Maucherat]

Filip Hanik - Dev Lists wrote:

According to the (slightly) updated release process, the 5.5.25 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[X] Stable


Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Connectors cleanup

[Mark Thomas]

Mladen Turk wrote:
> I propose we create connectors/sanbox and move the
> trunk/ajp/* code in there.
> ajp/proxy code can be removed of course.

Could we just move it to tomcat/sandbox as that already exists?

Mark

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Connectors cleanup

[Mladen Turk]

Mark Thomas wrote:

Mladen Turk wrote:

I propose we create connectors/sanbox and move the
trunk/ajp/* code in there.
ajp/proxy code can be removed of course.


Could we just move it to tomcat/sandbox as that already exists?



We need connectors/sandbox anyway, so IMHO it's a good
initial reason.

Regards,
Mladen

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Connectors cleanup

[Mark Thomas]

Mladen Turk wrote:
> Mark Thomas wrote:
>> Mladen Turk wrote:
>>> I propose we create connectors/sanbox and move the
>>> trunk/ajp/* code in there.
>>> ajp/proxy code can be removed of course.
>>
>> Could we just move it to tomcat/sandbox as that already exists?
>>
> 
> We need connectors/sandbox anyway, so IMHO it's a good
> initial reason.

OK.

Mark


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r572355 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[jim]

Author: jim
Date: Mon Sep  3 07:40:44 2007
New Revision: 572355

URL: http://svn.apache.org/viewvc?rev=572355&view=rev
Log:
making looping explicit code-wise.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=572355&r1=572354&r2=572355&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Mon Sep  3 
07:40:44 2007
@@ -1845,6 +1845,7 @@
 /*
  * This is fine, loop again, more data to send.
  */
+continue;
 }
 else if (rc < 0) {
 /*



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Connectors cleanup

[Jim Jagielski]

On Sep 3, 2007, at 2:06 AM, Mladen Turk wrote:


Mark Thomas wrote:

Hi,
Following on from my previous over eager attempt to clean up the
duplicate code in connectors I would like to propose the following
- remove connectors/trunk/ajp/CHANGES
- remove connectors/trunk/ajp/proxy
- move connectors/trunk/ajp/ajplib to connectors/trunk/ajplib
Thoughts?



I propose we create connectors/sanbox and move the
trunk/ajp/* code in there.
ajp/proxy code can be removed of course.

Later if we choose to use the existing code from
ajplib as base for JK3 we can either put it inside
trunk/jk3 or inside trunk/ajplib if we choose to
have independent protocol library.


is sandbox or attic better? sandbox implies a place
where people will be playing around with the code;
attic says we're storing it away :)


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 29936] - XML parser loading problems by container

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=29936


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WORKSFORME




--- Additional Comments From [EMAIL PROTECTED]  2007-09-03 17:50 ---
This works for me, at least I can't reproduce by following the steps provided
here, with the latest source from svn.

Please test this with the latest 5.5.x release. If you still see the issue,
please provide the simplest possible WAR that reproduces the issue on a clean
Tomcat install along with any additional configuration steps that may be 
required.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 30949] - After Failed Include, Request and Response not Unwrapped

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=30949





--- Additional Comments From [EMAIL PROTECTED]  2007-09-03 18:35 ---
Mike - having stepped through the code, I don't see the problem you are
describing. If you still see the issue, please open a new Bugzilla item and
provide the steps to reproduce and/or a simple test war.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r572487 - /tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/SSLSupport.java

[billbarker]

Author: billbarker
Date: Mon Sep  3 18:39:25 2007
New Revision: 572487

URL: http://svn.apache.org/viewvc?rev=572487&view=rev
Log:
Update cipher key list with Sun's new ones in Java 6

Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/SSLSupport.java

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/SSLSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/SSLSupport.java?rev=572487&r1=572486&r2=572487&view=diff
==
--- 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/SSLSupport.java 
(original)
+++ 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/SSLSupport.java 
Mon Sep  3 18:39:25 2007
@@ -61,7 +61,9 @@
 new CipherData("_WITH_RC4_128_", 128),
 new CipherData("_WITH_DES40_CBC_", 40),
 new CipherData("_WITH_DES_CBC_", 56),
-new CipherData("_WITH_3DES_EDE_CBC_", 168)
+new CipherData("_WITH_3DES_EDE_CBC_", 168),
+new CipherData("_WITH_AES_128_CBC_", 128),
+new CipherData("_WITH_AES_256_CBC_", 256)
 };
 
 /**



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r572490 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java

[billbarker]

Author: billbarker
Date: Mon Sep  3 18:54:52 2007
New Revision: 572490

URL: http://svn.apache.org/viewvc?rev=572490&view=rev
Log:
Update cipher key list with Sun's new ones in Java 6

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java?rev=572490&r1=572489&r2=572490&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java Mon 
Sep  3 18:54:52 2007
@@ -61,7 +61,9 @@
 new CipherData("_WITH_RC4_128_", 128),
 new CipherData("_WITH_DES40_CBC_", 40),
 new CipherData("_WITH_DES_CBC_", 56),
-new CipherData("_WITH_3DES_EDE_CBC_", 168)
+new CipherData("_WITH_3DES_EDE_CBC_", 168),
+new CipherData("_WITH_AES_128_CBC_", 128),
+new CipherData("_WITH_AES_256_CBC_", 256)
 };
 
 /**



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r572497 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

[billbarker]

Author: billbarker
Date: Mon Sep  3 19:44:07 2007
New Revision: 572497

URL: http://svn.apache.org/viewvc?rev=572497&view=rev
Log:
Forward porting Reader fixes from 5.5.x

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=572497&r1=572496&r2=572497&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Mon 
Sep  3 19:44:07 2007
@@ -68,22 +68,31 @@
 char result[]=new char[BUFFER_SIZE];
 
 /** Convert a buffer of bytes into a chars
+ * @deprecated
  */
 public  void convert( ByteChunk bb, CharChunk cb )
throws IOException
 {
// Set the ByteChunk as input to the Intermediate reader
-   iis.setByteChunk( bb );
-   convert(cb);
+   convert(bb, cb, cb.getBuffer().length - cb.getEnd());
 }
 
-private void convert(CharChunk cb)
+public void convert( ByteChunk bb, CharChunk cb, int limit) 
+throws IOException
+{
+iis.setByteChunk( bb );
+convert(cb, limit);
+}
+
+private void convert(CharChunk cb, int limit)
throws IOException
 {
try {
// read from the reader
-   while( true ) { // conv.ready() ) {
-   int cnt=conv.read( result, 0, BUFFER_SIZE );
+int count = 0;
+   while( limit > 0 ) { // conv.ready() ) {
+int size = limit < BUFFER_SIZE ? limit : BUFFER_SIZE;
+   int cnt=conv.read( result, 0, size );
if( cnt <= 0 ) {
// End of stream ! - we may be in a bad state
if( debug>0)
@@ -96,6 +105,7 @@
 
// XXX go directly
cb.append( result, 0, cnt );
+limit -= cnt;
}
} catch( IOException ex) {
if( debug>0)
@@ -225,10 +235,7 @@
 not be called if recycling the converter and if data was not flushed.
 */
 final class IntermediateInputStream extends InputStream {
-byte buf[];
-int pos;
-int len;
-int end;
+ByteChunk bc = null;
 
 public IntermediateInputStream() {
 }
@@ -239,36 +246,18 @@
 }
 
 public  final  int read(byte cbuf[], int off, int len) throws IOException {
-   if( pos >= end ) return -1;
-   if (pos + len > end) {
-   len = end - pos;
-   }
-   if (len <= 0) {
-   return 0;
-   }
-   System.arraycopy(buf, pos, cbuf, off, len);
-   pos += len;
-   return len;
+   return bc.substract(cbuf, off, len);
 }
 
 public  final int read() throws IOException {
-   return (pos < end ) ? (buf[pos++] & 0xff) : -1;
+   return bc.substract();
 }
 
 //  Internal methods 
 
-void setBuffer( byte b[], int p, int l ) {
-   buf=b;
-   pos=p;
-   len=l;
-   end=pos+len;
-}
 
 void setByteChunk( ByteChunk mb ) {
-   buf=mb.getBytes();
-   pos=mb.getStart();
-   len=mb.getLength();
-   end=pos+len;
+bc = mb;
 }
 
 }



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r572498 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java

[billbarker]

Author: billbarker
Date: Mon Sep  3 19:45:37 2007
New Revision: 572498

URL: http://svn.apache.org/viewvc?rev=572498&view=rev
Log:
Forward porting Reader fixes from 5.5.x

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=572498&r1=572497&r2=572498&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java 
Mon Sep  3 19:45:37 2007
@@ -292,7 +292,8 @@
 if (coyoteRequest == null)
 return -1;
 
-state = BYTE_STATE;
+if(state == INITIAL_STATE)
+state = BYTE_STATE;
 
 int result = coyoteRequest.doRead(bb);
 
@@ -325,6 +326,8 @@
 public void realWriteChars(char c[], int off, int len) 
 throws IOException {
 markPos = -1;
+cb.setOffset(0);
+cb.setEnd(0);
 }
 
 
@@ -351,12 +354,9 @@
 cb.setEnd(0);
 }
 
-int limit = bb.getLength()+cb.getStart();
-if( cb.getLimit() < limit ) 
-   cb.setLimit(limit);
-conv.convert(bb, cb);
-bb.setOffset(bb.getEnd());
 state = CHAR_STATE;
+conv.convert(bb, cb, len);
+bb.setOffset(bb.getEnd());
 
 return cb.getLength();
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]