date:20161213

Re: websocket and custom instantiator

2016-12-13 Thread Romain Manni-Bucau

PS: same for encoders/decoders BTW


Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | JavaEE Factory


2016-12-12 22:03 GMT+01:00 Romain Manni-Bucau :

> Hi guys,
>
> on 9M15 it seems the default server configurator just uses a newInstance
> and not the instance manager. Any reason? Is it too hard to catch close and
> destroy instances properly?
>
> Issue is it makes hard to integrate with an IoC without needing some
> boilerplate in onopen() and onclose().
>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github
>  | LinkedIn
>  | JavaEE Factory
> 
>

Re: websocket and custom instantiator

2016-12-13 Thread Rémy Maucherat

2016-12-12 22:03 GMT+01:00 Romain Manni-Bucau :

> Hi guys,
>
> on 9M15 it seems the default server configurator just uses a newInstance
> and not the instance manager. Any reason? Is it too hard to catch close and
> destroy instances properly?
>
> Issue is it makes hard to integrate with an IoC without needing some
> boilerplate in onopen() and onclose().
>

It gets registered a little bit later in WsSession.

Ok for encoder/decoder, this is not done, but is it certain these objects
are injectable ?

Rémy


>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github  rmannibucau> |
> LinkedIn  | JavaEE Factory
> 
>

Re: websocket and custom instantiator

2016-12-13 Thread Romain Manni-Bucau

2016-12-13 11:18 GMT+01:00 Rémy Maucherat :

> 2016-12-12 22:03 GMT+01:00 Romain Manni-Bucau :
>
> > Hi guys,
> >
> > on 9M15 it seems the default server configurator just uses a newInstance
> > and not the instance manager. Any reason? Is it too hard to catch close
> and
> > destroy instances properly?
> >
> > Issue is it makes hard to integrate with an IoC without needing some
> > boilerplate in onopen() and onclose().
> >
>
> It gets registered a little bit later in WsSession.
>
>
Hmm, didn't see it, do you have the class/method?


> Ok for encoder/decoder, this is not done, but is it certain these objects
> are injectable ?
>
>
By spec not sure but would be nice to inject a reusable codec or serializer
which can optimize the data (@Inject Jsonb for instance). Shouldn't cost
much to tomcat since instance manager is there.


> Rémy
>
>
> >
> > Romain Manni-Bucau
> > @rmannibucau  |  Blog
> >  | Old Blog
> >  | Github  > rmannibucau> |
> > LinkedIn  | JavaEE Factory
> > 
> >
>

Incoming refactoring

2016-12-13 Thread Mark Thomas

Hi,

Just a heads up that - assuming the currently running tests pass - I'll
be committing a batch of connector refactoring changes. The general aim
of these changes is:

- Reduce the duplication of configuration between Protocol and Processor
  In addition to removing a chunk of duplicate getters and setters, it
  should make it easier to make dynamic configuration changes.

- Reduce the visibility of the Endpoint.
  Processor no longer accesses Endpoint directly.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 59664] BufferReader return fuzzied when use https transfer Unicode char

2016-12-13 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=59664

liujian  changed:

   What|Removed |Added

 Resolution|INVALID |REMIND

--- Comment #3 from liujian  ---
Hi:

sorry about the issuss

i see the code of the org.apache.catalina.connector.InputBuffer
public int available() {
int available = 0;
if (state == BYTE_STATE) {
available = bb.getLength();
} else if (state == CHAR_STATE) {
available = cb.getLength();
}
if (available == 0) {
coyoteRequest.action(ActionCode.AVAILABLE, null);
available = (coyoteRequest.getAvailable() > 0) ? 1 : 0;
}
return available;
}

public boolean ready()
throws IOException {

if (closed) {
throw new IOException(sm.getString("inputBuffer.streamClosed"));
}

return (available() > 0);
}


you see,if only one byte in 'bb',the 'ready()' will return 'true'
But for 'Unicode',only one byte can not read success

So, we can not use 'ready()' to get 'Reader' is available or not

i think 'ready()' of 'Reader' should imporve

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Incoming refactoring

2016-12-13 Thread Christopher Schultz

Mark,

On 12/13/16 6:24 AM, Mark Thomas wrote:
> Hi,
> 
> Just a heads up that - assuming the currently running tests pass - I'll
> be committing a batch of connector refactoring changes. The general aim
> of these changes is:
> 
> - Reduce the duplication of configuration between Protocol and Processor
>   In addition to removing a chunk of duplicate getters and setters, it
>   should make it easier to make dynamic configuration changes.
> 
> - Reduce the visibility of the Endpoint.
>   Processor no longer accesses Endpoint directly.

+1

Any simplification we can make in that area will be good.

Are you thinking of back-porting to 8.5 as well, or is this likely to
stay in 9.0?

-chris



signature.asc
Description: OpenPGP digital signature

[Bug 59664] BufferReader return fuzzied when use https transfer Unicode char

2016-12-13 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=59664

Christopher Schultz  changed:

   What|Removed |Added

 Resolution|REMIND  |INVALID

--- Comment #4 from Christopher Schultz  ---
If you wish to re-open this bug, please provide a clear test-case where Tomcat
fails to behave in a way that is expected. Your test case should be an SSCCE[1]
and clearly demonstrate that Tomcat is behaving incorrectly with respect to the
HTTP or other specifications which govern its operation.

Assertions that Tomcat might not behave properly under certain circumstances
are not adequate: you must provide code that should operate properly but does
not due to a problem with Tomcat.

[1] http://sscce.org/

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Incoming refactoring

2016-12-13 Thread Mark Thomas

On 13/12/2016 15:09, Christopher Schultz wrote:
> Mark,
> 
> On 12/13/16 6:24 AM, Mark Thomas wrote:
>> Hi,
>>
>> Just a heads up that - assuming the currently running tests pass - I'll
>> be committing a batch of connector refactoring changes. The general aim
>> of these changes is:
>>
>> - Reduce the duplication of configuration between Protocol and Processor
>>   In addition to removing a chunk of duplicate getters and setters, it
>>   should make it easier to make dynamic configuration changes.
>>
>> - Reduce the visibility of the Endpoint.
>>   Processor no longer accesses Endpoint directly.
> 
> +1
> 
> Any simplification we can make in that area will be good.
> 
> Are you thinking of back-porting to 8.5 as well, or is this likely to
> stay in 9.0?

Not sure. 8.5.x is meant to be stable and I'm changing APIs. Then again,
they are internal APIs. Config isn't changing. Also, we'd need to back
port the Acceptor changes first.

Overall I'm neutral on this. I'd like to see the refactoring in 8.5.x
but I'm concerned about any instability or regressions that might slip in.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60475] New: Urls containing | as a delimiter cause http 400 errors

2016-12-13 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60475

Bug ID: 60475
   Summary: Urls containing | as a delimiter cause http 400 errors
   Product: Tomcat 8
   Version: 8.5.8
  Hardware: PC
OS: Windows NT
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: adrie...@opentext.com
  Target Milestone: 

URLs like this cause HTTP 400 errors:

http://xx/yy/cs?func=sbroker.ExecuteExtCmd&cacheID=1132437720&extResultsAction=SaveResults&objects=|1|2

because  parameter formats using | as a delimiter

i.e. &objects=|1|2

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1774052 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

2016-12-13 Thread markt

Author: markt
Date: Tue Dec 13 16:48:40 2016
New Revision: 1774052

URL: http://svn.apache.org/viewvc?rev=1774052&view=rev
Log:
Fix unlock delay on OSX if airdrop is enabled.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1774052&r1=1774051&r2=1774052&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Dec 
13 16:48:40 2016
@@ -21,6 +21,7 @@ import java.io.OutputStreamWriter;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.NetworkInterface;
+import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -785,24 +786,7 @@ public abstract class AbstractEndpoint networkInterfaces = 
NetworkInterface.getNetworkInterfaces();
-while (unlockAddress == null && 
networkInterfaces.hasMoreElements()) {
-NetworkInterface networkInterface = 
networkInterfaces.nextElement();
-Enumeration inetAddresses = 
networkInterface.getInetAddresses();
-while (unlockAddress == null && 
inetAddresses.hasMoreElements()) {
-InetAddress inetAddress = inetAddresses.nextElement();
-if 
(localAddress.getAddress().getClass().isAssignableFrom(inetAddress.getClass())) 
{
-unlockAddress = new InetSocketAddress(inetAddress, 
localAddress.getPort());
-}
-}
-}
-} else {
-unlockAddress = localAddress;
-}
+unlockAddress = getUnlockAddress(localAddress);
 
 try (java.net.Socket s = new java.net.Socket()) {
 int stmo = 2 * 1000;
@@ -851,6 +835,52 @@ public abstract class AbstractEndpoint networkInterfaces = 
NetworkInterface.getNetworkInterfaces();
+while (networkInterfaces.hasMoreElements()) {
+NetworkInterface networkInterface = 
networkInterfaces.nextElement();
+Enumeration inetAddresses = 
networkInterface.getInetAddresses();
+while (inetAddresses.hasMoreElements()) {
+InetAddress inetAddress = inetAddresses.nextElement();
+if 
(localAddress.getAddress().getClass().isAssignableFrom(inetAddress.getClass())) 
{
+if (inetAddress.isLoopbackAddress()) {
+if (loopbackUnlockAddress == null) {
+loopbackUnlockAddress = inetAddress;
+}
+} else if (inetAddress.isLinkLocalAddress()) {
+if (linkLocalUnlockAddress == null) {
+linkLocalUnlockAddress = inetAddress;
+}
+} else {
+// Use a non-link local, non-loop back address by 
default
+return new InetSocketAddress(inetAddress, 
localAddress.getPort());
+}
+}
+}
+}
+// Prefer loop back over link local since on some platforms (e.g.
+// OSX) some link local addresses are not included when listening 
on
+// all local addresses.
+if (loopbackUnlockAddress != null) {
+return new InetSocketAddress(loopbackUnlockAddress, 
localAddress.getPort());
+}
+if (linkLocalUnlockAddress != null) {
+return new InetSocketAddress(linkLocalUnlockAddress, 
localAddress.getPort());
+}
+return null;
+} else {
+return localAddress;
+}
+}
+
 
 // -- Request processing 
methods
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1774052&r1=1774051&r2=1774052&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Dec 13 16:48:40 2016
@@ -81,6 +81,12 @@
 with a clear error message HTTP/2 header values that contain characters
 with unicode code points above 255. (markt)
   
+  
+Improve the logic that selects an address to use to unlock the Acceptor
+to take account of platforms what do not listen on all local addresses
+when configured with an address of 0.0.0.0 or
+::. (

[Bug 60475] Urls containing | as a delimiter cause http 400 errors

2016-12-13 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60475

--- Comment #1 from adrie...@opentext.com ---
Unable to reproduce with Tomcat 8.5.6

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60475] Urls containing | as a delimiter cause http 400 errors

2016-12-13 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=60475

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #2 from Mark Thomas  ---
Unencoded '|' are nor permitted anywhere in a request target. As part of the
fix for CVE-2016-6816, Tomcat now rejects them with a 400 response.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

websocket and lambdas

2016-12-13 Thread Romain Manni-Bucau

Hi guys,

is it under radar lambdas don't work with websocket programmatic API?

session.addMessageHandler(new MessageHandler.Whole() {
@Override
public void onMessage(final Request request) {
*// whatever*
}
});


If you convert it in a lambda ((MessageHandler.Whole) m -> {})
then tomcat is not able to extract the type. There are several solution on
the net I think about it so I guess it should be doable?

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | JavaEE Factory

Re: websocket and lambdas

2016-12-13 Thread Violeta Georgieva

Hi,

2016-12-13 20:41 GMT+02:00 Romain Manni-Bucau :
>
> Hi guys,
>
> is it under radar lambdas don't work with websocket programmatic API?
>
> session.addMessageHandler(new MessageHandler.Whole() {
> @Override
> public void onMessage(final Request request) {
> *// whatever*
> }
> });
>
>
> If you convert it in a lambda ((MessageHandler.Whole) m -> {})
> then tomcat is not able to extract the type. There are several solution on
> the net I think about it so I guess it should be doable?
>

This is working for me

Instead of:

session.addMessageHandler(new MessageHandler.Whole() {
 @Override
 public void onMessage(String message) {
 *// whatever*
 }
});

this one:

session.addMessageHandler(String.class, message -> {
*// whatever*
});

Regards,
Violeta

> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github <
https://github.com/rmannibucau> |
> LinkedIn  | JavaEE Factory
>

svn commit: r1774098 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

2016-12-13 Thread markt

Author: markt
Date: Tue Dec 13 20:39:25 2016
New Revision: 1774098

URL: http://svn.apache.org/viewvc?rev=1774098&view=rev
Log:
Fix unlock delay on OSX if airdrop is enabled.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 20:39:25 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
 
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,17636

Re: websocket and lambdas

2016-12-13 Thread Romain Manni-Bucau

right, so means the other addmessagehandler is seen as a shortcut
(convenient).


Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | JavaEE Factory


2016-12-13 20:58 GMT+01:00 Violeta Georgieva :

> Hi,
>
> 2016-12-13 20:41 GMT+02:00 Romain Manni-Bucau :
> >
> > Hi guys,
> >
> > is it under radar lambdas don't work with websocket programmatic API?
> >
> > session.addMessageHandler(new MessageHandler.Whole() {
> > @Override
> > public void onMessage(final Request request) {
> > *// whatever*
> > }
> > });
> >
> >
> > If you convert it in a lambda ((MessageHandler.Whole) m -> {})
> > then tomcat is not able to extract the type. There are several solution
> on
> > the net I think about it so I guess it should be doable?
> >
>
> This is working for me
>
> Instead of:
>
> session.addMessageHandler(new MessageHandler.Whole() {
>  @Override
>  public void onMessage(String message) {
>  *// whatever*
>  }
> });
>
> this one:
>
> session.addMessageHandler(String.class, message -> {
> *// whatever*
> });
>
> Regards,
> Violeta
>
> > Romain Manni-Bucau
> > @rmannibucau  |  Blog
> >  | Old Blog
> >  | Github <
> https://github.com/rmannibucau> |
> > LinkedIn  | JavaEE Factory
> > 
>

svn commit: r1774102 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

2016-12-13 Thread markt

Author: markt
Date: Tue Dec 13 20:50:18 2016
New Revision: 1774102

URL: http://svn.apache.org/viewvc?rev=1774102&view=rev
Log:
Fallback to localhost rather than fail

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1774102&r1=1774101&r2=1774102&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Dec 
13 20:50:18 2016
@@ -875,7 +875,8 @@ public abstract class AbstractEndpoint

svn commit: r1774103 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java

2016-12-13 Thread markt

Author: markt
Date: Tue Dec 13 20:50:55 2016
New Revision: 1774103

URL: http://svn.apache.org/viewvc?rev=1774103&view=rev
Log:
Fallback to localhost rather than fail

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 20:50:55 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
 
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763813,1

svn commit: r1774104 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

2016-12-13 Thread markt

Author: markt
Date: Tue Dec 13 20:55:36 2016
New Revision: 1774104

URL: http://svn.apache.org/viewvc?rev=1774104&view=rev
Log:
Fix unlock delay on OSX if airdrop is enabled.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 20:55:36 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1

svn commit: r1774105 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

2016-12-13 Thread markt

Author: markt
Date: Tue Dec 13 20:56:39 2016
New Revision: 1774105

URL: http://svn.apache.org/viewvc?rev=1774105&view=rev
Log:
Fix unlock delay on OSX if airdrop is enabled.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 20:56:39 2016
@@ -1,3 +1,3 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702
 
742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527
+/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,16514

Re: Incoming refactoring

2016-12-13 Thread Mark Thomas

On 13/12/2016 15:21, Mark Thomas wrote:
> On 13/12/2016 15:09, Christopher Schultz wrote:
>> Mark,
>>
>> On 12/13/16 6:24 AM, Mark Thomas wrote:
>>> Hi,
>>>
>>> Just a heads up that - assuming the currently running tests pass - I'll
>>> be committing a batch of connector refactoring changes. The general aim
>>> of these changes is:
>>>
>>> - Reduce the duplication of configuration between Protocol and Processor
>>>   In addition to removing a chunk of duplicate getters and setters, it
>>>   should make it easier to make dynamic configuration changes.
>>>
>>> - Reduce the visibility of the Endpoint.
>>>   Processor no longer accesses Endpoint directly.
>>
>> +1
>>
>> Any simplification we can make in that area will be good.
>>
>> Are you thinking of back-porting to 8.5 as well, or is this likely to
>> stay in 9.0?
> 
> Not sure. 8.5.x is meant to be stable and I'm changing APIs. Then again,
> they are internal APIs. Config isn't changing. Also, we'd need to back
> port the Acceptor changes first.
> 
> Overall I'm neutral on this. I'd like to see the refactoring in 8.5.x
> but I'm concerned about any instability or regressions that might slip in.

An intermittent test failure has appeared. I need to investigate further
before pushing the commit.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: websocket and custom instantiator

Re: websocket and custom instantiator

Re: websocket and custom instantiator

Incoming refactoring

[Bug 59664] BufferReader return fuzzied when use https transfer Unicode char

Re: Incoming refactoring

[Bug 59664] BufferReader return fuzzied when use https transfer Unicode char

Re: Incoming refactoring

[Bug 60475] New: Urls containing | as a delimiter cause http 400 errors

svn commit: r1774052 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

[Bug 60475] Urls containing | as a delimiter cause http 400 errors

[Bug 60475] Urls containing | as a delimiter cause http 400 errors

websocket and lambdas

Re: websocket and lambdas

svn commit: r1774098 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

Re: websocket and lambdas

svn commit: r1774102 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

svn commit: r1774103 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java

svn commit: r1774104 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

svn commit: r1774105 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

Re: Incoming refactoring

21 matches

Site Navigation

Mail list logo

Footer information