svn commit: r1693430 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoaderBase.java webapps/docs/changelog.xml

2015-07-30 Thread markt
Author: markt
Date: Thu Jul 30 14:13:47 2015
New Revision: 1693430

URL: http://svn.apache.org/r1693430
Log: (empty)

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 30 14:13:47 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,168726
 
8,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105

Re: [VOTE] JK 1.2.41

2015-07-30 Thread Christopher Schultz
Mark,

On 7/26/15 6:27 PM, Mark Thomas wrote:
 Tag:
 http://svn.apache.org/viewvc/tomcat/jk/tags/JK_1_2_41/  (r1692773)
 
 Source:
 https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/
 
 Full details in the changelog but main reason for release is the fix for
 CVE-2014-8111.
 
 The proposed JK 1.2.41 release is:
 [ ] Broken - do not release
 [X] Stable - go ahead and release as 1.2.41

No problems detected in a development environment with a reasonable
amount of usage.

Notes:

On x86-64 Debian Linux 7 (Squeeze), gcc 4.7.2, m4 1.4.16, I get these
warnings/errors during configure:

Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
APRINCLUDEDIR is  -I/usr/include/apr-1.0 -I/usr/include/apr-1.0
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.
Use of uninitialized value $includedir in concatenation (.) or string at
(eval 9) line 1.

mod_jk compiles as a shared module cleanly, with no warnings or errors
in a few seconds.

It would be nice if 'make' would announce where to find the just-built
binaries.

-chris



signature.asc
Description: OpenPGP digital signature


svn commit: r1693429 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java

2015-07-30 Thread markt
Author: markt
Date: Thu Jul 30 14:12:17 2015
New Revision: 1693429

URL: http://svn.apache.org/r1693429
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58125
Avoid a possible ClassCircularityError when running under a security manager

Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java

Modified: 
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1693429r1=1693428r2=1693429view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Thu 
Jul 30 14:12:17 2015
@@ -1228,8 +1228,25 @@ public abstract class WebappClassLoaderB
 //   the webapp from overriding Java SE classes. This 
implements
 //   SRV.10.7.2
 String resourceName = binaryNameToPath(name, false);
+
 ClassLoader javaseLoader = getJavaseClassLoader();
-if (javaseLoader.getResource(resourceName) != null) {
+boolean tryLoadingFromJavaseLoader;
+try {
+// Use getResource as it won't trigger an expensive
+// ClassNotFoundException if the resource is not available from
+// the Java SE class loader. However (see
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=58125 for
+// details) when running under a security manager in rare cases
+// this call may trigger a ClassCircularityError.
+tryLoadingFromJavaseLoader = 
(javaseLoader.getResource(resourceName) != null);
+} catch (ClassCircularityError cce) {
+// The getResource() trick won't work for this class. We have 
to
+// try loading it directly and accept that we might get a
+// ClassNotFoundException.
+tryLoadingFromJavaseLoader = true;
+}
+
+if (tryLoadingFromJavaseLoader) {
 try {
 clazz = javaseLoader.loadClass(name);
 if (clazz != null) {



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



[Bug 58143] The WebppClassLoader doesn't call transformers on cached classes

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58143

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #3 from Mark Thomas ma...@apache.org ---
I don't think we can fix this.

The TomcatLoadTimeWeaver could be configured slightly earlier (in an SCI) but
that is the earliest specification defined hook that could be used. This still
isn't early enough to catch everything since any classes defined in a
HandlesType for an SCI will already have been loaded by this point.

Anything earlier requires Tomcat specific configuration at which point you
might as well use the TomcatInstrumentableClassLoader and configure it in a
META-INF/context.xml.

I'll bring this to the attention of the Spring folks via $dayjob to see if they
can come up with anything better.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 58125] java.lang.ClassCircularityError can occur if Tomcat is run with a Java Security Manager

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58125

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #4 from Mark Thomas ma...@apache.org ---
Thanks for the report. This has been fixed in trunk and 8.0.x for 8.0.25
onwards. 7.0.x does not use getResource() to avoid the CNFE so is not affected
by this bug.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r1693431 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

2015-07-30 Thread markt
Author: markt
Date: Thu Jul 30 14:15:43 2015
New Revision: 1693431

URL: http://svn.apache.org/r1693431
Log:
Correct xml

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

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1693431r1=1693430r2=1693431view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Jul 30 14:15:43 2015
@@ -82,8 +82,10 @@
 broke Comet support when running under a security manager. Based on a
 patch provided by Johno Crawford. (markt)
   /fix
-  fix58125/fix: Avoid a possible codeClassCircularityError/code 
when
-  running under a security manager. (markt)
+  fix
+bug58125/bug: Avoid a possible codeClassCircularityError/code
+when running under a security manager. (markt)
+  /fix
   fix
 bug58179/bug: Fix a thread safety issues that could mean concurrent
 threads setting the same attribute on a codeServletContext/code



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



[Bug 58192] ImageIO based applications fail to deploy in Tomcat 8.0.24 (worked in 8.0.23)

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58192

--- Comment #1 from Christopher Schultz ch...@christopherschultz.net ---
Is this possibly environmental?

http://stackoverflow.com/questions/7051603/jai-vendorname-null/18495658#18495658

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 58195] New: TldCache does not fallback

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58195

Bug ID: 58195
   Summary: TldCache does not fallback
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: jaredwiltsh...@gmail.com

I've got a problem loading a tld files from a location which is not in WEB-INF.
There is a null pointer exception on the first line of TldCache.getTaglibXml().

This is because the TldScanner only scans the WEB-INF directory which is fair
enough. But I believe the correct behaviour if tldResourcePathTaglibXmlMap
doesn't contain the resource path is to load the tld from the filesystem.

According to the JSP 2.1 specification, section 7.3.6.2 -
If uri is root_rel_uri, a relative URI that starts with /
Look in the taglib map for an entry whose taglib_uri is root_rel_uri. If found,
the corresponding taglib_location is the TLD resource path. If no such entry is
found, root_rel_uri is the TLD resource path.

http://download.oracle.com/otndocs/jcp/jsp-2.1-fr-eval-spec-oth-JSpec/

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 58192] ImageIO based applications fail to deploy in Tomcat 8.0.24 (worked in 8.0.23)

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58192

--- Comment #2 from Andrea Aime andrea.a...@gmail.com ---
I've read that stackoverflow article, it seems to be related to a fatjar usage,
which we don't use. The stack trace we're getting it about a class that's in
the stock imageio jar file, which we did not modify.

The GeoServer version used is also an official release, if you want to try, you
can pick this one for example:
http://sourceforge.net/projects/geoserver/files/GeoServer/2.7.1.1/geoserver-2.7.1.1-war.zip/download

I've just tried it, it works in Tomcat 8.0.23... while this cannot exclude an
enviroment dependnecy, it at least provies that there is a Tomcat version
dependency (the same war breaks deploying in 8.0.24).

I've tried both cases with Java 1.7.0_72 and 1.8.0_25, same results, does not
appear to be JDK dependent.

Oh, also the Tomcat versions tried were stock, just downloaded from the
official web site as tar.gz distros.
Native JAI and native JAI Image I/O are not installed in either case.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 58195] TldCache does not fallback

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58195

Jared Wiltshire jaredwiltsh...@gmail.com changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Jared Wiltshire jaredwiltsh...@gmail.com ---
Perhaps pass the TldScanner through to the TldCache in its constructor and use
TldScanner.parseTld(TldResourcePath path) to parse and cache the tld if doesn't
already exist in the map.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 58192] New: ImageIO based applications fail to deploy in Tomcat 8.0.24 (worked in 8.0.23)

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58192

Bug ID: 58192
   Summary: ImageIO based applications fail to deploy in Tomcat
8.0.24 (worked in 8.0.23)
   Product: Tomcat 8
   Version: 8.0.24
  Hardware: PC
OS: Linux
Status: NEW
  Severity: regression
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: andrea.a...@gmail.com

We have received several reports recently that GeoServer fails to deploy in
Tomcat 8, and with some discussion, we poinpointed 8.0.24 as the version where
this start happening, we have reports of deploys working without problems on
8.0.21 and 8.0.23 instead.

The issue happens as we try to initialize the ImageIO subsystem, here is the
stack trace:

java.util.ServiceConfigurationError: javax.imageio.spi.ImageReaderSpi: Provider
com.sun.media.imageioimpl.plugins.jpeg.CLibJPEGImageReaderSpi could not be
instantiated
at java.util.ServiceLoader.fail(ServiceLoader.java:232)
at java.util.ServiceLoader.access$100(ServiceLoader.java:185)
at java.util.ServiceLoader$LazyIterator.nextService(ServiceLoader.java:384)
at java.util.ServiceLoader$LazyIterator.next(ServiceLoader.java:404)
at java.util.ServiceLoader$1.next(ServiceLoader.java:480)
at
javax.imageio.spi.IIORegistry.registerApplicationClasspathSpis(IIORegistry.java:210)
at javax.imageio.spi.IIORegistry.init(IIORegistry.java:138)
at javax.imageio.spi.IIORegistry.getDefaultInstance(IIORegistry.java:159)
at
org.geoserver.GeoserverInitStartupListener.contextDestroyed(GeoserverInitStartupListener.java:295)
at
org.apache.catalina.core.StandardContext.listenerStop(StandardContext.java:4776)
at
org.apache.catalina.core.StandardContext.stopInternal(StandardContext.java:5390)
at org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:232)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:160)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:725)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:701)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:717)
at org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:945)
at
org.apache.catalina.startup.HostConfig$DeployWar.run(HostConfig.java:1768)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
Caused by: java.lang.IllegalArgumentException: vendorName == null!
at javax.imageio.spi.IIOServiceProvider.init(IIOServiceProvider.java:76)
at
javax.imageio.spi.ImageReaderWriterSpi.init(ImageReaderWriterSpi.java:231)
at javax.imageio.spi.ImageReaderSpi.init(ImageReaderSpi.java:212)
at
com.sun.media.imageioimpl.plugins.jpeg.CLibJPEGImageReaderSpi.init(CLibJPEGImageReaderSpi.java:80)
at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
at
sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
at
sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
at java.lang.reflect.Constructor.newInstance(Constructor.java:422)
at java.lang.Class.newInstance(Class.java:442)
at java.util

Here is the associated GeoServer ticket:
https://osgeo-org.atlassian.net/browse/GEOS-7122

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r1693461 - in /tomcat/trunk: java/org/apache/catalina/ant/AbstractCatalinaTask.java java/org/apache/catalina/ant/DeployTask.java test/org/apache/catalina/ant/TestDeployTask.java

2015-07-30 Thread violetagg
Author: violetagg
Date: Thu Jul 30 17:20:16 2015
New Revision: 1693461

URL: http://svn.apache.org/r1693461
Log:
Allow files bigger than 2G to be deployed using ant tasks.

Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1693461r1=1693460r2=1693461view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Jul 
30 17:20:16 2015
@@ -185,7 +185,7 @@ public abstract class AbstractCatalinaTa
  * @exception BuildException if an error occurs
  */
 public void execute(String command, InputStream istream,
-String contentType, int contentLength)
+String contentType, long contentLength)
 throws BuildException {
 
 URLConnection conn = null;

Modified: tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java?rev=1693461r1=1693460r2=1693461view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java Thu Jul 30 
17:20:16 2015
@@ -140,13 +140,13 @@ public class DeployTask extends Abstract
 // Building an input stream on the WAR to upload, if any
 BufferedInputStream stream = null;
 String contentType = null;
-int contentLength = -1;
+long contentLength = -1;
 if (war != null) {
 if (PROTOCOL_PATTERN.matcher(war).lookingAt()) {
 try {
 URL url = new URL(war);
 URLConnection conn = url.openConnection();
-contentLength = conn.getContentLength();
+contentLength = conn.getContentLengthLong();
 stream = new BufferedInputStream
 (conn.getInputStream(), 1024);
 } catch (IOException e) {
@@ -156,16 +156,8 @@ public class DeployTask extends Abstract
 FileInputStream fsInput = null;
 try {
 fsInput = new FileInputStream(war);
-long size = fsInput.getChannel().size();
-
-if (size  Integer.MAX_VALUE)
-throw new UnsupportedOperationException(
-DeployTask does not support WAR files  +
-greater than 2 Gb);
-contentLength = (int) size;
-
+contentLength = fsInput.getChannel().size();
 stream = new BufferedInputStream(fsInput, 1024);
-
 } catch (IOException e) {
 if (fsInput != null) {
 try {

Modified: tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.java?rev=1693461r1=1693460r2=1693461view=diff
==
--- tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.java (original)
+++ tomcat/trunk/test/org/apache/catalina/ant/TestDeployTask.java Thu Jul 30 
17:20:16 2015
@@ -35,7 +35,7 @@ public class TestDeployTask extends Tomc
 DeployTask deployTask = new DeployTask() {
 
 @Override
-public void execute(String command, InputStream istream, String 
contentType, int contentLength)
+public void execute(String command, InputStream istream, String 
contentType, long contentLength)
 throws BuildException {
 assertEquals(/deploy?path=somepath, command);
 assertEquals(application/octet-stream, contentType);
@@ -87,7 +87,7 @@ public class TestDeployTask extends Tomc
 DeployTask deployTask = new DeployTask() {
 
 @Override
-public void execute(String command, InputStream istream, String 
contentType, int contentLength)
+public void execute(String command, InputStream istream, String 
contentType, long contentLength)
 throws BuildException {
 assertEquals(/deploy?path=somepath, command);
 assertEquals(application/octet-stream, contentType);



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

[Bug 58151] High CPU Usage randomly on ajp-apr-8009-Poller

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58151

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #8 from Mark Thomas ma...@apache.org ---
I can't reproduce this on either Linux or Windows with the 8.0.24 code or the
latest 8.0.x code and tc-native 1.1.33. I've been hammering the Tomcat home
page (via httpd) using ab with the only impact of an httpd restart is that some
requests are delayed a little.

Steps to reproduce this with a clean Tomcat install would help.

Is the CPU spike you observe permanent or temporary? If temporary, how long
until it settles back down?

If this is permanent, figuring out what thread(s) are using the CPU [1] and
then remote debugging [2] to figure out what code path is causing the problem
would be extremely helpful.

[1] http://javadrama.blogspot.co.uk/2012/02/why-is-java-eating-my-cpu.html
[2] http://wiki.apache.org/tomcat/FAQ/Developing#Q1

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 58194] New: Tomcat crash EXCEPTION_ACCESS_VIOLATION in tcnative-1.dll

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58194

Bug ID: 58194
   Summary: Tomcat crash EXCEPTION_ACCESS_VIOLATION in
tcnative-1.dll
   Product: Tomcat Native
   Version: 1.1.32
  Hardware: PC
Status: NEW
  Severity: major
  Priority: P2
 Component: Library
  Assignee: dev@tomcat.apache.org
  Reporter: olga.ving...@gmail.com

Created attachment 32947
  -- https://bz.apache.org/bugzilla/attachment.cgi?id=32947action=edit
dump file

Hi,


Recently, we encountered Tomcat crash on EXCEPTION_ACCESS_VIOLATION in
tcnative-1.dll. I attached error log. 

# Problematic frame:
# C  [tcnative-1.dll+0x11982]
...
Stack: [0x2840,0x2850],  sp=0x284fed50,  free
space=1019k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
C  [tcnative-1.dll+0x11982]
C  [tcnative-1.dll+0x11e7]
C  0x04ad4e0a

Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
J 18420  org.apache.tomcat.jni.Address.get(IJ)J (0 bytes) @ 0x04ad4d84
[0x04ad4d40+0x44]


According to the stack it looks that the native implementation of Address.get()
does not check if sock is null before passing it to apr_socket_addr_get, which
will end up dereferencing the null pointer inside apr_socket_addr_get leading
to a crash.

TCN_IMPLEMENT_CALL(jlong, Address, get)(TCN_STDARGS, jint which,
jlong sock)
{
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
apr_sockaddr_t *sa = NULL;

UNREFERENCED(o);
TCN_THROW_IF_ERR(apr_socket_addr_get(sa,
(apr_interface_e)which, s-sock), sa);
cleanup:
return P2J(sa);
}

I don't know how the issue can be reproduced.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[Bug 58192] ImageIO based applications fail to deploy in Tomcat 8.0.24 (worked in 8.0.23)

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58192

--- Comment #3 from Christopher Schultz ch...@christopherschultz.net ---
I wonder if Tomcat's resource-locating implementation is failing, here. I seem
to recall something changing recently with how getPackage() works, or something
like that.

Can you produce a simple, self-contained test case? A binary WAR including
source would be best. I suspect you only need to bundle the imageio JAR file
and try to use it in, say, a simple JSP.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r1693462 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ant/AbstractCatalinaTask.java java/org/apache/catalina/ant/DeployTask.java test/org/apache/catalina/ant/TestDeployTask.java

2015-07-30 Thread violetagg
Author: violetagg
Date: Thu Jul 30 17:41:37 2015
New Revision: 1693462

URL: http://svn.apache.org/r1693462
Log:
Merged revision 1693461 from tomcat/trunk:
Allow files bigger than 2G to be deployed using ant tasks.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/DeployTask.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 30 17:41:37 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,168726
 

[Bug 58192] ImageIO based applications fail to deploy in Tomcat 8.0.24 (worked in 8.0.23)

2015-07-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58192

Martin Wegner martin.weg...@ebp.de changed:

   What|Removed |Added

 CC||martin.weg...@ebp.de

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