Re: getResourceAsStream() for a folder

[Svetlin Zarev]

Oops, I was looking at the code before the fix. Sorry.

2016-10-14 9:07 GMT+03:00 Svetlin Zarev :

> Hi Mark!
>
> > Fixed.
>
> > Mark
>
>
> What about the inconsistency between getContent() and doGetInputStream() ?
> In case of doGetInputStream() when a FileNotFoundException is thrown, the
> caller will get a "null" stream. But in case of getContent() the caller
> will get a byte[] full of zeroes, which will result in ByteArrayInputStream
> that returns incorrect content. Also if an IOEx is thrown during read, the
> caller may get corrupted content -> one part filled with zeroes.
>
>
> Best regards,
>
> Svetlin
>

Re: getResourceAsStream() for a folder

[Svetlin Zarev]

Hi Mark!

> Fixed.

> Mark


What about the inconsistency between getContent() and doGetInputStream() ?
In case of doGetInputStream() when a FileNotFoundException is thrown, the
caller will get a "null" stream. But in case of getContent() the caller
will get a byte[] full of zeroes, which will result in ByteArrayInputStream
that returns incorrect content. Also if an IOEx is thrown during read, the
caller may get corrupted content -> one part filled with zeroes.


Best regards,

Svetlin

[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-nio has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 27 mins 47 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161014-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20161014.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161014-native-src.
 tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true 
-Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20161014/bin/openssl
 -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/g

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 6 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 32 mins 34 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20161014.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20161014/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161014-native-src.tar.gz
 -Dtest.repor
 ts=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161014-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tr

[Bug 55383] Improve markup and design of Tomcat's HTML pages

[bugzilla]

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

manoripriyadarshani  changed:

   What|Removed |Added

 CC||kampriyadarshani326@gmail.c
   ||om

-- 
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: [VOTE] Release Apache Tomcat 6.0.47

[Felix Schumacher]

Am 13.10.2016 um 12:51 schrieb Violeta Georgieva:

The proposed Apache Tomcat 6.0.47 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.47/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1100/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_47/

The proposed 6.0.47 release is:
[ ] Broken - do not release
[x] Stable - go ahead and release as 6.0.47 Stable

With java 1.5.0_22 I get the following stacktrace:

org.w3c.dom.ls.LSException: java.lang.NullPointerException
at 
com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl.writeToString(DOMSerializerImpl.java:546)
at 
org.apache.catalina.core.JreMemoryLeakPreventionListener.lifecycleEvent(JreMemoryLeakPreventionListener.java:410)
at 
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:142)
at 
org.apache.catalina.core.StandardServer.initialize(StandardServer.java:818)

at org.apache.catalina.startup.Catalina.load(Catalina.java:538)
at org.apache.catalina.startup.Catalina.load(Catalina.java:562)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)

at java.lang.reflect.Method.invoke(Method.java:592)
at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:261)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413)

But that seems to be a problem of java 5 and goes away, if I start 
tomcat with java 8.


Regards,
 Felix


Regards,
Violeta




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

Re: getResourceAsStream() for a folder

[Romain Manni-Bucau]

Thanks Mark!


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


2016-10-13 16:05 GMT+02:00 Mark Thomas :

> On 13/10/2016 14:27, Mark Thomas wrote:
> > On 13/10/2016 13:13, Romain Manni-Bucau wrote:
> >> @Svetlin: thanks to catch it, was intended for dev@tomcat (thanks
> gmail to
> >> have completion ;))
> >>
> >> dev@tomcat: can you check please the original question (in short:
> >> getResourceAsStream("/some/folder")
> >> returns a stream)
> >
> > Thanks for the heads up. I'll take a look.
>
> Fixed.
>
> Mark
>
> >> Romain Manni-Bucau
> >> @rmannibucau  |  Blog
> >>  | Old Wordpress Blog
> >>  | Github  rmannibucau> |
> >> LinkedIn  | Tomitriber
> >>  | JavaEE Factory
> >> 
> >>
> >> 2016-10-13 13:59 GMT+02:00 Svetlin Zarev  com>:
> >>
> >>> Hi,
> >>>
> >>> IMO this is a bug introduced with [1][2]. Although the root cause is
> in the
> >>> bad impl. of FileResource [3] that ignores the IOException and despite
> the
> >>> error, still returns a byte[] as if nothing bad happened.
> >>>
> >>>
> >>> [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=60146
> >>> [2]
> >>> https://github.com/apache/tomcat85/blob/5768426dd27422747f2b9b4da5a092
> >>> 7ee3328ffb/java/org/apache/catalina/webresources/
> CachedResource.java#L267
> >>> [3]
> >>> https://github.com/apache/tomcat85/blob/5768426dd27422747f2b9b4da5a092
> >>> 7ee3328ffb/java/org/apache/catalina/webresources/
> FileResource.java#L203
> >>>
> >>> PS: Maybe this should be forwarded to the tomcat dev list ?
> >>>
> >>> Kind regards,
> >>> Svetlin
> >>>
> >>> 2016-10-13 12:06 GMT+03:00 Romain Manni-Bucau :
> >>>
>  Hi guys,
> 
>  upgrading tomee to tomcat 8.5.6 I noticed request.getServletContext().
>  getResourceAsStream(path) now returns an empty stream for / (or an
> >>> existing
>  folder probably). Not sure it is expected or unintended.
> 
>  Reading the spec it is not that clear to me since the folder is an
> >>> existing
>  resource but not really a webresource so not it should be considered
> as a
>  resource and therefore having a stream (which doesn't mean much for a
>  folder).
> 
>  Romain Manni-Bucau
>  @rmannibucau  |  Blog
>   | Old Wordpress Blog
>   | Github   rmannibucau> |
>  LinkedIn  | Tomitriber
>   | JavaEE Factory
>  
> 
> >>>
> >>
> >
> >
> > -
> > 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
>
>

Re: getResourceAsStream() for a folder

[Mark Thomas]

On 13/10/2016 14:27, Mark Thomas wrote:
> On 13/10/2016 13:13, Romain Manni-Bucau wrote:
>> @Svetlin: thanks to catch it, was intended for dev@tomcat (thanks gmail to
>> have completion ;))
>>
>> dev@tomcat: can you check please the original question (in short:
>> getResourceAsStream("/some/folder")
>> returns a stream)
> 
> Thanks for the heads up. I'll take a look.

Fixed.

Mark

>> Romain Manni-Bucau
>> @rmannibucau  |  Blog
>>  | Old Wordpress Blog
>>  | Github  
>> |
>> LinkedIn  | Tomitriber
>>  | JavaEE Factory
>> 
>>
>> 2016-10-13 13:59 GMT+02:00 Svetlin Zarev :
>>
>>> Hi,
>>>
>>> IMO this is a bug introduced with [1][2]. Although the root cause is in the
>>> bad impl. of FileResource [3] that ignores the IOException and despite the
>>> error, still returns a byte[] as if nothing bad happened.
>>>
>>>
>>> [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=60146
>>> [2]
>>> https://github.com/apache/tomcat85/blob/5768426dd27422747f2b9b4da5a092
>>> 7ee3328ffb/java/org/apache/catalina/webresources/CachedResource.java#L267
>>> [3]
>>> https://github.com/apache/tomcat85/blob/5768426dd27422747f2b9b4da5a092
>>> 7ee3328ffb/java/org/apache/catalina/webresources/FileResource.java#L203
>>>
>>> PS: Maybe this should be forwarded to the tomcat dev list ?
>>>
>>> Kind regards,
>>> Svetlin
>>>
>>> 2016-10-13 12:06 GMT+03:00 Romain Manni-Bucau :
>>>
 Hi guys,

 upgrading tomee to tomcat 8.5.6 I noticed request.getServletContext().
 getResourceAsStream(path) now returns an empty stream for / (or an
>>> existing
 folder probably). Not sure it is expected or unintended.

 Reading the spec it is not that clear to me since the folder is an
>>> existing
 resource but not really a webresource so not it should be considered as a
 resource and therefore having a stream (which doesn't mean much for a
 folder).

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

>>>
>>
> 
> 
> -
> 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

svn commit: r1764692 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/ webapps/docs/

[markt]

Author: markt
Date: Thu Oct 13 14:06:34 2016
New Revision: 1764692

URL: http://svn.apache.org/viewvc?rev=1764692&view=rev
Log:
When calling getResourceAsStream() on a directory, ensure that null is
returned.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResource.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResource.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 14:06:34 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792
-/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-168

svn commit: r1764691 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/ webapps/docs/

[markt]

Author: markt
Date: Thu Oct 13 14:03:55 2016
New Revision: 1764691

URL: http://svn.apache.org/viewvc?rev=1764691&view=rev
Log:
When calling getResourceAsStream() on a directory, ensure that null is
returned. (markt)

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/EmptyResource.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/FileResource.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 14:03: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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763

svn commit: r1764689 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2Parser.java

[markt]

Author: markt
Date: Thu Oct 13 14:03:04 2016
New Revision: 1764689

URL: http://svn.apache.org/viewvc?rev=1764689&view=rev
Log:
Refactor header completion handling to a single method

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Parser.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 14:03:04 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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648
+/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,17

svn commit: r1764690 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/coyote/http2/Http2TestBase.java

[markt]

Author: markt
Date: Thu Oct 13 14:03:26 2016
New Revision: 1764690

URL: http://svn.apache.org/viewvc?rev=1764690&view=rev
Log:
Add some additional hooks/features for some new tests currently being
worked on.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 14:03:26 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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649
+/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,173715

svn commit: r1764688 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/coyote/http2/TestHttp2Section_6_8.java

[markt]

Author: markt
Date: Thu Oct 13 14:02:42 2016
New Revision: 1764688

URL: http://svn.apache.org/viewvc?rev=1764688&view=rev
Log:
Remove debug code

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 14:02:42 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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646
+/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,173783

svn commit: r1764687 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2Parser.java

[markt]

Author: markt
Date: Thu Oct 13 14:02:20 2016
New Revision: 1764687

URL: http://svn.apache.org/viewvc?rev=1764687&view=rev
Log:
Rename for clarity

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Parser.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 14:02:20 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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425
+/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,173790

svn commit: r1764682 - in /tomcat/trunk: java/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/ webapps/docs/

[markt]

Author: markt
Date: Thu Oct 13 14:00:20 2016
New Revision: 1764682

URL: http://svn.apache.org/viewvc?rev=1764682&view=rev
Log:
When calling getResourceAsStream() on a directory, ensure that null is
returned. (markt)

Modified:

tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/trunk/java/org/apache/catalina/webresources/EmptyResource.java
tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java

tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1764682&r1=1764681&r2=1764682&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java 
Thu Oct 13 14:00:20 2016
@@ -113,6 +113,9 @@ public abstract class AbstractArchiveRes
 
 @Override
 public long getContentLength() {
+if (isDirectory()) {
+return -1;
+}
 return resource.getSize();
 }
 
@@ -167,6 +170,11 @@ public abstract class AbstractArchiveRes
 Long.valueOf(len)));
 }
 
+if (len < 0) {
+// Content is not applicable here (e.g. is a directory)
+return null;
+}
+
 int size = (int) len;
 byte[] result = new byte[size];
 
@@ -215,6 +223,9 @@ public abstract class AbstractArchiveRes
 
 @Override
 protected final InputStream doGetInputStream() {
+if (isDirectory()) {
+return null;
+}
 return getJarInputStreamWrapper();
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/webresources/EmptyResource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/EmptyResource.java?rev=1764682&r1=1764681&r2=1764682&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/EmptyResource.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/EmptyResource.java Thu 
Oct 13 14:00:20 2016
@@ -89,7 +89,7 @@ public class EmptyResource implements We
 
 @Override
 public long getContentLength() {
-return 0;
+return -1;
 }
 
 @Override

Modified: tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java?rev=1764682&r1=1764681&r2=1764682&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java Thu 
Oct 13 14:00:20 2016
@@ -130,7 +130,11 @@ public class FileResource extends Abstra
 
 @Override
 public long getContentLength() {
-if (needConvert) {
+return getContentLengthInternal(needConvert);
+}
+
+private long getContentLengthInternal(boolean convert) {
+if (convert) {
 byte[] content = getContent();
 if (content == null) {
 return -1;
@@ -138,6 +142,11 @@ public class FileResource extends Abstra
 return content.length;
 }
 }
+
+if (isDirectory()) {
+return -1;
+}
+
 return resource.length();
 }
 
@@ -179,7 +188,8 @@ public class FileResource extends Abstra
 
 @Override
 public final byte[] getContent() {
-long len = getContentLength();
+// Use internal version to avoid loop when needConvert is true
+long len = getContentLengthInternal(false);
 
 if (len > Integer.MAX_VALUE) {
 // Can't create an array that big
@@ -188,6 +198,11 @@ public class FileResource extends Abstra
 Long.valueOf(len)));
 }
 
+if (len < 0) {
+// Content is not applicable here (e.g. is a directory)
+return null;
+}
+
 int size = (int) len;
 byte[] result = new byte[size];
 
@@ -205,6 +220,7 @@ public class FileResource extends Abstra
 getLog().debug(sm.getString("abstractResource.getContentFail",
 getWebappPath()), ioe);
 }
+return null;
 }
 
 if (needConvert) {

Modified: 
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java?rev=1764682&r1=1764681&r2=1764682&view=diff
==

Re: getResourceAsStream() for a folder

[Mark Thomas]

On 13/10/2016 13:13, Romain Manni-Bucau wrote:
> @Svetlin: thanks to catch it, was intended for dev@tomcat (thanks gmail to
> have completion ;))
> 
> dev@tomcat: can you check please the original question (in short:
> getResourceAsStream("/some/folder")
> returns a stream)

Thanks for the heads up. I'll take a look.

Mark

> 
> 
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Wordpress Blog
>  | Github  |
> LinkedIn  | Tomitriber
>  | JavaEE Factory
> 
> 
> 2016-10-13 13:59 GMT+02:00 Svetlin Zarev :
> 
>> Hi,
>>
>> IMO this is a bug introduced with [1][2]. Although the root cause is in the
>> bad impl. of FileResource [3] that ignores the IOException and despite the
>> error, still returns a byte[] as if nothing bad happened.
>>
>>
>> [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=60146
>> [2]
>> https://github.com/apache/tomcat85/blob/5768426dd27422747f2b9b4da5a092
>> 7ee3328ffb/java/org/apache/catalina/webresources/CachedResource.java#L267
>> [3]
>> https://github.com/apache/tomcat85/blob/5768426dd27422747f2b9b4da5a092
>> 7ee3328ffb/java/org/apache/catalina/webresources/FileResource.java#L203
>>
>> PS: Maybe this should be forwarded to the tomcat dev list ?
>>
>> Kind regards,
>> Svetlin
>>
>> 2016-10-13 12:06 GMT+03:00 Romain Manni-Bucau :
>>
>>> Hi guys,
>>>
>>> upgrading tomee to tomcat 8.5.6 I noticed request.getServletContext().
>>> getResourceAsStream(path) now returns an empty stream for / (or an
>> existing
>>> folder probably). Not sure it is expected or unintended.
>>>
>>> Reading the spec it is not that clear to me since the folder is an
>> existing
>>> resource but not really a webresource so not it should be considered as a
>>> resource and therefore having a stream (which doesn't mean much for a
>>> folder).
>>>
>>> Romain Manni-Bucau
>>> @rmannibucau  |  Blog
>>>  | Old Wordpress Blog
>>>  | Github >> rmannibucau> |
>>> LinkedIn  | Tomitriber
>>>  | JavaEE Factory
>>> 
>>>
>>
> 


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

buildbot success in on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1795

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1764663
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1764663 - /tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java

[markt]

Author: markt
Date: Thu Oct 13 12:59:55 2016
New Revision: 1764663

URL: http://svn.apache.org/viewvc?rev=1764663&view=rev
Log:
Add some additional hooks/features for some new tests currently being
worked on.

Modified:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java

Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1764663&r1=1764662&r2=1764663&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Thu Oct 13 
12:59:55 2016
@@ -305,11 +305,31 @@ public abstract class Http2TestBase exte
 ByteUtil.set31Bits(dataFrameHeader, 5, streamId);
 }
 
+
 protected void writeFrame(byte[] header, ByteBuffer payload)
 throws IOException {
+writeFrame(header, payload, 0, payload.limit());
+}
+
+
+protected void writeFrame(byte[] header, ByteBuffer payload, int offset, 
int len)
+throws IOException {
+writeFrame(header, payload, offset, len, 0);
+}
+
+
+protected void writeFrame(byte[] header, ByteBuffer payload, int offset, 
int len, int delayms)
+throws IOException {
 os.write(header);
-os.write(payload.array(), payload.arrayOffset(), payload.limit());
+os.write(payload.array(), payload.arrayOffset() + offset, len);
 os.flush();
+if (delayms > 0) {
+try {
+Thread.sleep(delayms);
+} catch (InterruptedException e) {
+// Ignore
+}
+}
 }
 
 
@@ -894,6 +914,11 @@ public abstract class Http2TestBase exte
 public String getTrace() {
 return trace.toString();
 }
+
+
+public int getMaxFrameSize() {
+return remoteSettings.getMaxFrameSize();
+}
 }
 
 



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

buildbot failure in on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1794

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1764659
Blamelist: violetagg

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1764662 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

[violetagg]

Author: violetagg
Date: Thu Oct 13 12:45:55 2016
New Revision: 1764662

URL: http://svn.apache.org/viewvc?rev=1764662&view=rev
Log:
Fix typo

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1764662&r1=1764661&r2=1764662&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
Thu Oct 13 12:45:55 2016
@@ -607,7 +607,7 @@ public class ApplicationContext implemen
 
 /*
  * Returns null if the input path is not valid or a path that will be
- * acceptable to resoucres.getResource().
+ * acceptable to resources.getResource().
  */
 private String validateResourcePath(String path, boolean allowEmptyPath) {
 if (path == null) {



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

svn commit: r1764660 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

[violetagg]

Author: violetagg
Date: Thu Oct 13 12:44:29 2016
New Revision: 1764660

URL: http://svn.apache.org/viewvc?rev=1764660&view=rev
Log:
Fix typo

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1764660&r1=1764659&r2=1764660&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
Thu Oct 13 12:44:29 2016
@@ -533,7 +533,7 @@ public class ApplicationContext implemen
 
 /*
  * Returns null if the input path is not valid or a path that will be
- * acceptable to resoucres.getResource().
+ * acceptable to resources.getResource().
  */
 private String validateResourcePath(String path, boolean allowEmptyPath) {
 if (path == null) {



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

svn commit: r1764659 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

[violetagg]

Author: violetagg
Date: Thu Oct 13 12:39:07 2016
New Revision: 1764659

URL: http://svn.apache.org/viewvc?rev=1764659&view=rev
Log:
FIx typo

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1764659&r1=1764658&r2=1764659&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu Oct 
13 12:39:07 2016
@@ -532,7 +532,7 @@ public class ApplicationContext implemen
 
 /*
  * Returns null if the input path is not valid or a path that will be
- * acceptable to resoucres.getResource().
+ * acceptable to resources.getResource().
  */
 private String validateResourcePath(String path, boolean allowEmptyPath) {
 if (path == null) {



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

Re: getResourceAsStream() for a folder

[Romain Manni-Bucau]

@Svetlin: thanks to catch it, was intended for dev@tomcat (thanks gmail to
have completion ;))

dev@tomcat: can you check please the original question (in short:
getResourceAsStream("/some/folder")
returns a stream)


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


2016-10-13 13:59 GMT+02:00 Svetlin Zarev :

> Hi,
>
> IMO this is a bug introduced with [1][2]. Although the root cause is in the
> bad impl. of FileResource [3] that ignores the IOException and despite the
> error, still returns a byte[] as if nothing bad happened.
>
>
> [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=60146
> [2]
> https://github.com/apache/tomcat85/blob/5768426dd27422747f2b9b4da5a092
> 7ee3328ffb/java/org/apache/catalina/webresources/CachedResource.java#L267
> [3]
> https://github.com/apache/tomcat85/blob/5768426dd27422747f2b9b4da5a092
> 7ee3328ffb/java/org/apache/catalina/webresources/FileResource.java#L203
>
> PS: Maybe this should be forwarded to the tomcat dev list ?
>
> Kind regards,
> Svetlin
>
> 2016-10-13 12:06 GMT+03:00 Romain Manni-Bucau :
>
> > Hi guys,
> >
> > upgrading tomee to tomcat 8.5.6 I noticed request.getServletContext().
> > getResourceAsStream(path) now returns an empty stream for / (or an
> existing
> > folder probably). Not sure it is expected or unintended.
> >
> > Reading the spec it is not that clear to me since the folder is an
> existing
> > resource but not really a webresource so not it should be considered as a
> > resource and therefore having a stream (which doesn't mean much for a
> > folder).
> >
> > Romain Manni-Bucau
> > @rmannibucau  |  Blog
> >  | Old Wordpress Blog
> >  | Github  > rmannibucau> |
> > LinkedIn  | Tomitriber
> >  | JavaEE Factory
> > 
> >
>

Re: [VOTE] Release Apache Tomcat 6.0.47

[Violeta Georgieva]

2016-10-13 13:51 GMT+03:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 6.0.47 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.47/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1100/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_47/
>
> The proposed 6.0.47 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 6.0.47 Stable
>
> Regards,
> Violeta

[VOTE] Release Apache Tomcat 6.0.47

[Violeta Georgieva]

The proposed Apache Tomcat 6.0.47 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.47/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1100/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_47/

The proposed 6.0.47 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 6.0.47 Stable

Regards,
Violeta

svn commit: r1764654 - in /tomcat/tc6.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Thu Oct 13 10:44:16 2016
New Revision: 1764654

URL: http://svn.apache.org/viewvc?rev=1764654&view=rev
Log:
Increment version for next release

Modified:
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1764654&r1=1764653&r2=1764654&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Oct 13 10:44:16 2016
@@ -25,10 +25,10 @@
 # - Version Control Flags -
 version.major=6
 version.minor=0
-version.build=47
+version.build=48
 version.patch=0
 version.suffix=-dev
-version=6.0.47
+version=6.0.48
 
 # - Build control flags -
 execute.test.bio=true

Modified: tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default?rev=1764654&r1=1764653&r2=1764654&view=diff
==
--- tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Thu Oct 13 10:44:16 
2016
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=6.0.47
+maven.asf.release.deploy.version=6.0.48
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1764654&r1=1764653&r2=1764654&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 13 10:44:16 2016
@@ -44,6 +44,8 @@
 
+
+
 
   
 



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

svn commit: r16496 [1/2] - in /dev/tomcat/tomcat-6/v6.0.47: ./ bin/ bin/extras/ src/

[violetagg]

Author: violetagg
Date: Thu Oct 13 10:42:41 2016
New Revision: 16496

Log:
Stage 6.0.47 RC

Added:
dev/tomcat/tomcat-6/v6.0.47/
dev/tomcat/tomcat-6/v6.0.47/KEYS
dev/tomcat/tomcat-6/v6.0.47/README.html
dev/tomcat/tomcat-6/v6.0.47/RELEASE-NOTES
dev/tomcat/tomcat-6/v6.0.47/bin/
dev/tomcat/tomcat-6/v6.0.47/bin/README.html
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-deployer.tar.gz.asc
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-deployer.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-deployer.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-deployer.zip   (with 
props)
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-deployer.zip.asc
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-deployer.zip.md5
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-deployer.zip.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-fulldocs.tar.gz.asc
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-fulldocs.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-windows-x64.zip   
(with props)
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-windows-x64.zip.asc
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-windows-x64.zip.md5
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-windows-x64.zip.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-windows-x86.zip   
(with props)
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-windows-x86.zip.asc
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-windows-x86.zip.md5
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47-windows-x86.zip.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.exe   (with props)
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.exe.asc
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.exe.md5
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.exe.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.tar.gz   (with props)
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.tar.gz.asc
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.zip   (with props)
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.zip.asc
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.zip.md5
dev/tomcat/tomcat-6/v6.0.47/bin/apache-tomcat-6.0.47.zip.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/extras/
dev/tomcat/tomcat-6/v6.0.47/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-6/v6.0.47/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-6/v6.0.47/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-6/v6.0.47/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-6/v6.0.47/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-6/v6.0.47/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-6/v6.0.47/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-6/v6.0.47/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-6/v6.0.47/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-6/v6.0.47/bin/extras/tomcat-juli-adapters.jar.sha1
dev/tomcat/tomcat-6/v6.0.47/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-6/v6.0.47/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-6/v6.0.47/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-6/v6.0.47/bin/extras/tomcat-juli.jar.sha1
dev/tomcat/tomcat-6/v6.0.47/src/
dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz   (with 
props)
dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.asc
dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip   (with props)
dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.asc
dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.md5
dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.sha1

Added: dev/tomcat/tomcat-6/v6.0.47/KEYS
==
--- dev/tomcat/tomcat-6/v6.0.47/KEYS (added)
+++ dev/tomcat/tomcat-6/v6.0.47/KEYS Thu Oct 13 10:42:41 2016
@@ -0,0 +1,631 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache 

svn commit: r16496 [2/2] - in /dev/tomcat/tomcat-6/v6.0.47: ./ bin/ bin/extras/ src/

[violetagg]

Added: dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.asc
==
--- dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.asc Thu Oct 
13 10:42:41 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJX/2DyAAoJECCLCrHWMBHHCncQAINp6bs/RWaJ4S6wD8RpWjxN
+stgDs+Rel961vUwlrB4Ay8OlIVIdoem1Fpw1x1dRBzWFOQGrCFV/vgru0yx5YVhD
+jDFVv0QKhFum0aAhPuY3Vn3GD3G58y74VBjVVzadjkG+Ki7c5o0hbZ619EH18gzN
+3fzkx1FaWD6Z7aK/Y+OGlZW5bl4CYRuSEvS7n2QmOfkz5uI+3tEHCY0N6aVeJ502
+4N6y/gafwnupejpWwbultdkF6q7eedn71al3xe/WMQwcZnq15iSCsTVzIRuFjH2/
+mRBOFtM9HLlpmEfE1ZiwKRo9Dz4JchdslcGcCIq67Iu6wUtkKbkxUQ53RFP3gfUG
+LQGEET1Zruu5Lx70DZbgZ9cTgibkIGnYSt/0VXD4QQLKL4FYEhErDp2vcQnNT1Kg
+YZabGZNpZPe4OXwWtQampp09p7VmicM3uVKk1HW3SLn5RSlbYDW1ZUwl1VR60Xl0
+qtY5t1AJDvr72LesOOKwkz9LsTcovYurZ7HdMqFd8H5hwbu7prh/w0j9tZ8PKz+7
+sTa9UQ4LpBafNHcGuZ4ARd+oRMde2VBQmKBFbLFK4kT79j6sEjeuu5IE3VqMAfNm
+A8RcBUGoUCsWsTy0SkuGwTusmd1jis7cboKWyTQOD7XyCaTBdGaKdpmJBvTavm9L
+SidEZ40sbSG7RMPwGTGR
+=qj71
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.md5
==
--- dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.md5 (added)
+++ dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.md5 Thu Oct 
13 10:42:41 2016
@@ -0,0 +1 @@
+f4cde1cad88be747795238e6ec1292d2 *apache-tomcat-6.0.47-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.sha1
==
--- dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.sha1 (added)
+++ dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.tar.gz.sha1 Thu 
Oct 13 10:42:41 2016
@@ -0,0 +1 @@
+372f1c507e7e5a545ae2d0141d31045a8eab1dac *apache-tomcat-6.0.47-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.asc
==
--- dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.asc (added)
+++ dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.asc Thu Oct 13 
10:42:41 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJX/2EPAAoJECCLCrHWMBHHfFYP/1tPOAGAGb7MrDCc/CbfyI9e
+tqlYBUiXu6Piwmv+SKJWZCZVUohwK+FyqLLSbHd4dr3KCzT9sgnCLwmWZeuYZuCI
+yAVvu8lA5pYBXato2HpDQWwve5MGdxDzQf6+EBy7Ty2HLcARDlAg1LsZzmCUWXw9
+4hKOsaqQPQPSAPvPuQVw3cGWXuGW8SL4AIlcfsCNrnqVvgPbpvex9sMIP/OxlO+3
+Pwx1yd/0sDjNeHDbhn2B0LyaN+h0nLA4NlhUB4qv8N1YZWRtwm7A74WMNhOGgE5a
+Cu78omRpzzYGVknvBTqVZE7LD3xvpvasjVhBKh5vgM3uBzEANLiDrRDvQnMT/z9g
+L/YNT4UzNrZEvmyhFNCVyWXC1AhOGo2gEo7igZ9ZLfDmjjb2xyOKH4njLXqtdpeT
+eYlLiFVls1wdENsfDwnAFbE9XZt7K2bYA+yErvdXaCjNrDjZ38f/utzvwaRKWUsu
+pAiwe5r9o5MSS3yBJZPg9cNhhIKsw7euuouu5OVjxgsa5pD7Y/VmLpeNJt3KlH6A
+CYJkM/8IPJVH4OnuSesBYsXl7x23cv0DnfZDaYfWh62CfNiBQS61ACUvFiQgw/iB
+Iaa/lDpgT8HFuRj9VXZZMe6Q/Rrw0wTplcT/1bkhk3jnJcO2LaDF2bIYejEEPYrt
+LqKMUeeOzM6Y1gCac+ZC
+=D1Hj
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.md5
==
--- dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.md5 (added)
+++ dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.md5 Thu Oct 13 
10:42:41 2016
@@ -0,0 +1 @@
+a7ec32c5484de019e431268910f9ddbc *apache-tomcat-6.0.47-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.sha1
==
--- dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.sha1 (added)
+++ dev/tomcat/tomcat-6/v6.0.47/src/apache-tomcat-6.0.47-src.zip.sha1 Thu Oct 
13 10:42:41 2016
@@ -0,0 +1 @@
+7b0a2a15725103e7f048900475fc1e6f272eebc9 *apache-tomcat-6.0.47-src.zip
\ No newline at end of file



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

svn commit: r1764649 - /tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java

[markt]

Author: markt
Date: Thu Oct 13 10:37:29 2016
New Revision: 1764649

URL: http://svn.apache.org/viewvc?rev=1764649&view=rev
Log:
Refactor header completion handling to a single method

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1764649&r1=1764648&r2=1764649&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Thu Oct 13 
10:37:29 2016
@@ -241,25 +241,17 @@ class Http2Parser {
 payloadSize -= padLength;
 }
 
-boolean endOfHeaders = Flags.isEndOfHeaders(flags);
-
-readHeaderPayload(payloadSize, endOfHeaders);
+readHeaderPayload(payloadSize);
 
 swallow(streamId, padLength, true);
 
-if (endOfHeaders) {
-output.headersEnd(streamId);
+headersEndStream = Flags.isEndOfStream(flags);
+
+if (Flags.isEndOfHeaders(flags)) {
+onHeadersComplete(streamId);
 } else {
 headersCurrentStream = streamId;
 }
-
-if (Flags.isEndOfStream(flags)) {
-if (headersCurrentStream == -1) {
-output.receiveEndOfStream(streamId);
-} else {
-headersEndStream = true;
-}
-}
 }
 
 
@@ -377,22 +369,16 @@ class Http2Parser {
 Integer.toString(streamId)), Http2Error.PROTOCOL_ERROR);
 }
 
-boolean endOfHeaders = Flags.isEndOfHeaders(flags);
-readHeaderPayload(payloadSize, endOfHeaders);
+readHeaderPayload(payloadSize);
 
-if (endOfHeaders) {
-output.headersEnd(streamId);
+if (Flags.isEndOfHeaders(flags)) {
+onHeadersComplete(streamId);
 headersCurrentStream = -1;
-if (headersEndStream) {
-output.receiveEndOfStream(streamId);
-headersEndStream = false;
-}
 }
 }
 
 
-private void readHeaderPayload(int payloadSize, boolean endOfHeaders)
-throws Http2Exception, IOException {
+private void readHeaderPayload(int payloadSize) throws Http2Exception, 
IOException {
 
 while (payloadSize > 0) {
 int toRead = Math.min(headerReadBuffer.remaining(), payloadSize);
@@ -411,12 +397,23 @@ class Http2Parser {
 headerReadBuffer.compact();
 payloadSize -= toRead;
 }
+}
+
 
-if (headerReadBuffer.position() > 0 && endOfHeaders) {
+private void onHeadersComplete(int streamId) throws Http2Exception {
+// Any left over data is a compression error
+if (headerReadBuffer.position() > 0) {
 throw new ConnectionException(
 
sm.getString("http2Parser.processFrameHeaders.decodingDataLeft"),
 Http2Error.COMPRESSION_ERROR);
 }
+
+output.headersEnd(streamId);
+
+if (headersEndStream) {
+output.receiveEndOfStream(streamId);
+headersEndStream = false;
+}
 }
 
 



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

svn commit: r1764648 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java

[markt]

Author: markt
Date: Thu Oct 13 10:36:13 2016
New Revision: 1764648

URL: http://svn.apache.org/viewvc?rev=1764648&view=rev
Log:
Remove debug code

Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java

Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java?rev=1764648&r1=1764647&r2=1764648&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_8.java Thu Oct 
13 10:36:13 2016
@@ -61,8 +61,6 @@ public class TestHttp2Section_6_8 extend
 
 // Go away
 parser.readFrame(true);
-// Debugging Gump failure
-System.err.println(output.getTrace());
 Assert.assertEquals("0-Goaway-[2147483647]-[0]-[null]", 
output.getTrace());
 output.clearTrace();
 
@@ -75,11 +73,7 @@ public class TestHttp2Section_6_8 extend
 sendSimpleGetRequest(5);
 
 parser.readFrame(true);
-// Debugging Gump failure
-System.err.println(output.getTrace());
 parser.readFrame(true);
-// Debugging Gump failure
-System.err.println(output.getTrace());
 
 Assert.assertEquals(getSimpleResponseTrace(3),  output.getTrace());
 output.clearTrace();



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

svn commit: r1764646 - /tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java

[markt]

Author: markt
Date: Thu Oct 13 10:16:02 2016
New Revision: 1764646

URL: http://svn.apache.org/viewvc?rev=1764646&view=rev
Log:
Rename for clarity

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1764646&r1=1764645&r2=1764646&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Thu Oct 13 
10:16:02 2016
@@ -243,7 +243,7 @@ class Http2Parser {
 
 boolean endOfHeaders = Flags.isEndOfHeaders(flags);
 
-readHeaderBlock(payloadSize, endOfHeaders);
+readHeaderPayload(payloadSize, endOfHeaders);
 
 swallow(streamId, padLength, true);
 
@@ -378,7 +378,7 @@ class Http2Parser {
 }
 
 boolean endOfHeaders = Flags.isEndOfHeaders(flags);
-readHeaderBlock(payloadSize, endOfHeaders);
+readHeaderPayload(payloadSize, endOfHeaders);
 
 if (endOfHeaders) {
 output.headersEnd(streamId);
@@ -391,7 +391,7 @@ class Http2Parser {
 }
 
 
-private void readHeaderBlock(int payloadSize, boolean endOfHeaders)
+private void readHeaderPayload(int payloadSize, boolean endOfHeaders)
 throws Http2Exception, IOException {
 
 while (payloadSize > 0) {



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

svn commit: r1764645 - in /tomcat/tc6.0.x/tags/TOMCAT_6_0_47: ./ build.properties.default

[violetagg]

Author: violetagg
Date: Thu Oct 13 10:00:46 2016
New Revision: 1764645

URL: http://svn.apache.org/viewvc?rev=1764645&view=rev
Log:
Tag 6.0.47

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_47/   (props changed)
  - copied from r1764644, tomcat/tc6.0.x/trunk/
Modified:
tomcat/tc6.0.x/tags/TOMCAT_6_0_47/build.properties.default

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_47/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct 13 10:00:46 2016
@@ -0,0 +1,5 @@
+.*
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_47/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 13 10:00:46 2016
@@ -0,0 +1,4 @@
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968
 
,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759567,1761631,1761748,1762772,1763236,1763
 415,1763580
+/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018,1759565
+/tomcat/tc8.5.x/trunk:1737199,1737966,1738044,1741174,1741182,1741191,1741209,1741226,1741233,1742277,1743118,1743139-1743140,1744059,1744127,1744151,1744232,1744377,1744687,1745228,1746940,1749375,1750016,1750976,1751062,1754112,1754144,1754726,1754806,1754878,1754889,1754894,1754900,1756412,1756940,1757272,1757282,1757501,1758488,1758493,1761629,1761741,1762770,1763233,1763413,1763578
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,7649

svn commit: r1764643 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/ webapps/docs/

[markt]

Author: markt
Date: Thu Oct 13 09:55:19 2016
New Revision: 1764643

URL: http://svn.apache.org/viewvc?rev=1764643&view=rev
Log:
Remove unused code

Modified:
tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java
tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java?rev=1764643&r1=1764642&r2=1764643&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HeaderSink.java Thu Oct 13 
09:55:19 2016
@@ -26,7 +26,7 @@ import org.apache.coyote.http2.HpackDeco
 class HeaderSink implements HeaderEmitter {
 
 @Override
-public void emitHeader(String name, String value, boolean neverIndex) {
+public void emitHeader(String name, String value) {
 // NO-OP
 }
 }

Modified: tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java?rev=1764643&r1=1764642&r2=1764643&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java Thu Oct 13 
09:55:19 2016
@@ -109,7 +109,7 @@ public class HpackDecoder {
 buffer.position(originalPos);
 return;
 }
-headerEmitter.emitHeader(headerName, headerValue, false);
+headerEmitter.emitHeader(headerName, headerValue);
 addEntryToHeaderTable(new Hpack.HeaderField(headerName, 
headerValue));
 } else if ((b & 0b) == 0) {
 //Literal Header Field without Indexing
@@ -123,7 +123,7 @@ public class HpackDecoder {
 buffer.position(originalPos);
 return;
 }
-headerEmitter.emitHeader(headerName, headerValue, false);
+headerEmitter.emitHeader(headerName, headerValue);
 } else if ((b & 0b) == 0b0001) {
 //Literal Header Field never indexed
 String headerName = readHeaderName(buffer, 4);
@@ -136,7 +136,7 @@ public class HpackDecoder {
 buffer.position(originalPos);
 return;
 }
-headerEmitter.emitHeader(headerName, headerValue, true);
+headerEmitter.emitHeader(headerName, headerValue);
 } else if ((b & 0b1110) == 0b0010) {
 //context update max table size change
 if (!handleMaxMemorySizeChange(buffer, originalPos)) {
@@ -246,7 +246,7 @@ public class HpackDecoder {
 } else {
 int adjustedIndex = getRealIndex(index - 
Hpack.STATIC_TABLE_LENGTH);
 Hpack.HeaderField headerField = headerTable[adjustedIndex];
-headerEmitter.emitHeader(headerField.name, headerField.value, 
false);
+headerEmitter.emitHeader(headerField.name, headerField.value);
 }
 }
 
@@ -273,7 +273,7 @@ public class HpackDecoder {
 if (entry.value == null) {
 throw new HpackException();
 }
-headerEmitter.emitHeader(entry.name, entry.value, false);
+headerEmitter.emitHeader(entry.name, entry.value);
 }
 
 private void addEntryToHeaderTable(Hpack.HeaderField entry) {
@@ -327,7 +327,7 @@ public class HpackDecoder {
  * Interface that can be used to immediately validate headers (ex: 
uppercase detection).
  */
 interface HeaderEmitter {
-void emitHeader(String name, String value, boolean neverIndex);
+void emitHeader(String name, String value);
 }
 
 

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1764643&r1=1764642&r2=1764643&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Oct 13 09:55:19 
2016
@@ -189,7 +189,7 @@ class Stream extends AbstractStream impl
 
 
 @Override
-public final void emitHeader(String name, String value, boolean 
neverIndex) {
+public final void emitHeader(String name, String value) {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("stream.header.debug", getConnectionId(), 
getIdentifier(),
 name, 

svn commit: r16495 - /dev/tomcat/tomcat-6/v6.0.46/

[violetagg]

Author: violetagg
Date: Thu Oct 13 09:49:31 2016
New Revision: 16495

Log:
Tomcat 6.0.46 did not pass the vote

Removed:
dev/tomcat/tomcat-6/v6.0.46/


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

svn commit: r1764642 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Oct 13 09:48:02 2016
New Revision: 1764642

URL: http://svn.apache.org/viewvc?rev=1764642&view=rev
Log:
Correct the HPACK header table size configuration that transposed the client 
and server table sizes when creating the encoder and decoder.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 09:48:02 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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1

svn commit: r1764641 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Thu Oct 13 09:47:12 2016
New Revision: 1764641

URL: http://svn.apache.org/viewvc?rev=1764641&view=rev
Log:
6.0.46 does not pass the vote

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1764641&r1=1764640&r2=1764641&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 13 09:47:12 2016
@@ -54,7 +54,7 @@
 
   
 
-
+
   
 
   



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

Re: Help me to begin bug fixing

[Mark Thomas]

On 13/10/2016 09:54, jayani sumudini wrote:
> Hi,
> 
> I'm trying to find the default request mapping for "/example" and "/docs"
>  please help me to find the java class that uses to request mapping for
> those

That sounds like a homework question.

Whether it is or isn't, the best way to learn is to figure stuff out for
yourself. Some ideas:

- Use a debugger to follow the request flow. The wiki [1] has
  instructions for setting up Eclipse to do this.

- Write a Servlet or JSP. Throw an exception and look at the stack
  trace. Use the stack trace to follow the flow of a request through the
  Tomcat code.

Mark

[1] http://wiki.apache.org/tomcat/HowTo


> 
> Jayani
> Thank you
> 
> On Mon, Jul 18, 2016 at 9:21 PM, Mark Thomas  wrote:
> 
>> On 16/07/2016 02:43, jayani sumudini wrote:
>>> hello,
>>> I am a beginner to bug fixing.I hope to built tomcat.Please
>>> help me to select easy bug.
>>
>> Welcome to the Apache Tomcat developer community.
>>
>> Take a look at the open bugs in Bugzilla (I suggest you start with the
>> most recent and work backwards). When you find one that interests you,
>> try and write a patch.
>>
>> Mark
>>
>> -
>> 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

Re: Help me to begin bug fixing

[jayani sumudini]

Hi,

I'm trying to find the default request mapping for "/example" and "/docs"
 please help me to find the java class that uses to request mapping for
those

Jayani
Thank you

On Mon, Jul 18, 2016 at 9:21 PM, Mark Thomas  wrote:

> On 16/07/2016 02:43, jayani sumudini wrote:
> > hello,
> > I am a beginner to bug fixing.I hope to built tomcat.Please
> > help me to select easy bug.
>
> Welcome to the Apache Tomcat developer community.
>
> Take a look at the open bugs in Bugzilla (I suggest you start with the
> most recent and work backwards). When you find one that interests you,
> try and write a patch.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re:[CANCEL][VOTE] Release Apache Tomcat 6.0.46

[Violeta Georgieva]

Hi,

2016-10-12 23:10 GMT+03:00 Felix Schumacher <
felix.schumac...@internetallee.de>:
>
> Am 12.10.2016 um 21:47 schrieb Violeta Georgieva:
>>
>> Hi,
>>
>> 2016-10-11 21:56 GMT+03:00 Felix Schumacher <
>> felix.schumac...@internetallee.de>:
>>>
>>> Am 07.10.2016 um 16:11 schrieb Violeta Georgieva:

 The proposed Apache Tomcat 6.0.46 release is now available for voting.

 It can be obtained from:
 https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.46/
 The Maven staging repo is:

https://repository.apache.org/content/repositories/orgapachetomcat-1099/
 The svn tag is:
 http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_46/

 The proposed 6.0.46 release is:
 [ ] Broken - do not release
 [ ] Stable - go ahead and release as 6.0.46 Stable
>>>
>>> On startup I see the following message, which I didn't see with 6.0.45:
>>>
>>> INFO: Deploying web application directory ROOT
>>> Oct 11, 2016 6:55:06 PM org.apache.catalina.session.ManagerBase
>>
>> setMaxInactiveInterval
>>>
>>> WARNING: Manager.setMaxInactiveInterval() is deprecated and calls to
this
>>
>> method are ignored. Session timeouts should be configured in web.xml or
via
>>>
>>> Context.setSessionTimeout(int timeoutInMinutes)
>>
>> In the previous versions the invocation of this method was ignored. Now
we
>> log that it will be ignored.
>> http://svn.apache.org/viewvc?view=revision&revision=1732678
>
> Should we really release a version, that emits warnings in its default
configuration?
> I just changed into output/build and ran bin/startup.sh.

You are right. I committed a change - r1764625.

I'm cancelling the vote in order to pickup this change.

Regards,
Violeta

>
> Felix
>
>>
>> Thanks,
>> Violeta
>>
>>> Tests run fine, though.
>>>
>>> Regards,
>>>   Felix

 Regards,
 Violeta

>>>
>>> -
>>> 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
>

svn commit: r1764625 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ webapps/docs/

[violetagg]

Author: violetagg
Date: Thu Oct 13 08:49:27 2016
New Revision: 1764625

URL: http://svn.apache.org/viewvc?rev=1764625&view=rev
Log:
Fixed a warning message that is logged during Tomcat startup. Do not remove the 
marker PropertyChangeListener as it might be used by custom session managers.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1764625&r1=1764624&r2=1764625&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
Thu Oct 13 08:49:27 2016
@@ -546,7 +546,6 @@ public class DeltaManager extends Cluste
 
 // Register with the new Container (if any)
 if ((this.container != null) && (this.container instanceof Context)) {
-setMaxInactiveInterval(((Context) 
this.container).getSessionTimeout() * 60);
 ((Context) this.container).addPropertyChangeListener(this);
 }
 
@@ -1151,19 +1150,7 @@ public class DeltaManager extends Cluste
  *The property change event that has occurred
  */
 public void propertyChange(PropertyChangeEvent event) {
-
-// Validate the source of this event
-if (!(event.getSource() instanceof Context))
-return;
-// Process a relevant property change
-if (event.getPropertyName().equals("sessionTimeout")) {
-try {
-setMaxInactiveInterval(((Integer) 
event.getNewValue()).intValue() * 60);
-} catch (NumberFormatException e) {
-log.error(sm.getString("deltaManager.sessionTimeout", 
event.getNewValue()));
-}
-}
-
+// no-op
 }
 
 //  Replication

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1764625&r1=1764624&r2=1764625&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties 
Thu Oct 13 08:49:27 2016
@@ -49,7 +49,6 @@ standardManager.loading=Loading persiste
 standardManager.loading.cnfe=ClassNotFoundException while loading persisted 
sessions: {0}
 standardManager.loading.ioe=IOException while loading persisted sessions: {0}
 standardManager.notStarted=Manager has not yet been started
-standardManager.sessionTimeout=Invalid session timeout setting {0}
 standardManager.unloading=Saving persisted sessions to {0}
 standardManager.unloading.debug=Unloading persisted sessions
 standardManager.unloading.ioe=IOException while saving persisted sessions: {0}

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=1764625&r1=1764624&r2=1764625&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
 Thu Oct 13 08:49:27 2016
@@ -43,7 +43,6 @@ standardManager.loading = Cargando sesio
 standardManager.loading.cnfe = ClassNotFoundException al cargar sesiones 
persistidas\: {0}
 standardManager.loading.ioe = IOException al cargar sesiones persistidas\: {0}
 standardManager.notStarted = A\u00FAn no se ha arrancado el Gestor
-standardManager.sessionTimeout = Valor inv\u00E1lido de Tiempo Agotado de 
sesi\u00F3n {0}
 standardManager.unloading = Salvando sesiones persistidas a {0}
 standardManager.unloading.ioe = IOException al salvar sesiones persistidas\: 
{0}
 standardManager.managerLoad = Excepci\u00F3n cargando sesiones desde 
almacenamiento persistente

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.

[Bug 60232] HTTP/2 connector stuck when parsing big http header

[bugzilla]

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

barney...@gmail.com changed:

   What|Removed |Added

 OS||All

--- Comment #1 from barney...@gmail.com ---
This issue still exists in tomcat 8.5.6, even though there seem to have been
some bugfixes (e.g. bug  60173 ) in the affected area

-- 
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