tagging http://svn.apache.org/repos/asf/tomcat/native/trunk/

[jean-frederic clere]

Hi,

I think it is time to tag trunk of native to go forward for native

What tag should I use?

1.2.0 as it still work with the APR connector?

I am planning to drop APR and have an OpenSSL only native in a near 
future (that might takes times to lack of cycles).


Comments on that?


Cheers

Jean-Frederic

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

[Bug 58340] No error shown when some tag file in jar has compile error

[bugzilla]

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

--- Comment #2 from Mark Thomas  ---
If anyone had some feedback on this issue they would have commented on this
issue. Given the lack of comments it is safe to assume that - at this point -
no one has any feedback.

There were less than 36 hours between you posting the bug and you asking if
anyone had any feedback. You need to be more patient. The developers are aware
of the bug and it will get looked at. The more impatient you are, the greater
the chances of annoying the very people you want to look at this.

For some time now any bug raised against Tomact will be addressed (usually
fixed or declared invalid but sometimes put in the NEEDINFO state) before the
next release. Releases occur roughly monthly for 8.0.x and 7.0.x and very
roughly six monthly for 6.0.x. Only if a bug appears to have been ignored for
at least one release should you start to wonder if it has been overlooked.

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

buildbot exception in ASF Buildbot on tomcat-7-trunk

[buildbot]

The Buildbot has detected a build exception on builder tomcat-7-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-7-trunk/builds/73

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1701945
Blamelist: markt

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




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

[Bug 57583] Performance issue evaluating EL in custom tags (tagx) due to inefficient calls to java.lang.Class.forName()

[bugzilla]

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

--- Comment #3 from Arne Bultman  ---
Maybe I'm missing something, but even with this cache we still have this
problem. Since a en ELContextImpl seems to be created with every jsp render,
the cache has very limited effect, we're still seeing dramatically slower
rendertimes with this implementation. Am I missing something?

-- 
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: tagging http://svn.apache.org/repos/asf/tomcat/native/trunk/

[Mark Thomas]

On 09/09/2015 09:29, Rémy Maucherat wrote:
> 2015-09-09 10:18 GMT+02:00 Mark Thomas :
> 
>>> I am planning to drop APR and have an OpenSSL only native in a near
>>> future (that might takes times to lack of cycles).
>>
>> Interesting. That sounds like a 2.0.0 activity. Don't we get quite a bit
>> of functionality from APR? How much wheel re-invention would this involve?
>>
> The OpenSSL code used by the SSL engine doesn't need APR. But I'm not
> convinced it would actually be much easier for users.

Ah, OK. Now I understand. Going down that route implies dropping support
for the APR connector. I'm all in favour of that providing that the
performance of NIO + OpenSSL is similar.

Mark


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

svn commit: r1701945 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/resources/LocalStrings.properties

[markt]

Author: markt
Date: Wed Sep  9 08:21:31 2015
New Revision: 1701945

URL: http://svn.apache.org/r1701945
Log:
Fix escaping in error message

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

tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep  9 08:21:31 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 

Re: tagging http://svn.apache.org/repos/asf/tomcat/native/trunk/

[Mark Thomas]

On 09/09/2015 07:20, jean-frederic clere wrote:
> Hi,
> 
> I think it is time to tag trunk of native to go forward for native
> 
> What tag should I use?
> 
> 1.2.0 as it still work with the APR connector?

1.2.0 works for me.

I don't think we are finished with the API so anything we release needs
to come with some sort of health warning (alpha/beta tag and/or
something in the release notes) that the API is not stable.

> I am planning to drop APR and have an OpenSSL only native in a near
> future (that might takes times to lack of cycles).

Interesting. That sounds like a 2.0.0 activity. Don't we get quite a bit
of functionality from APR? How much wheel re-invention would this involve?

Mark


> 
> Comments on that?
> 
> 
> Cheers
> 
> Jean-Frederic
> 
> -
> 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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

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

Buildbot URL: http://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] 1701940
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: r1701940 - /tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

[markt]

Author: markt
Date: Wed Sep  9 08:03:47 2015
New Revision: 1701940

URL: http://svn.apache.org/r1701940
Log:
Fix the error message.
"\" must be escaped as "\\" due to property file escaping rules
"'" must be escaped as "''" due to MessageFormat escaping rules

Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1701940=1701939=1701940=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed 
Sep  9 08:03:47 2015
@@ -401,7 +401,7 @@ jsp.tldCache.noTldSummary=At least one J
 jsp.error.el_interpreter_class.instantiation=Failed to load or instantiate 
ELInterpreter class [{0}]
 
 org.apache.jasper.compiler.ELParser.invalidQuotesForStringLiteral=The String 
literal [{0}] is not valid. It must be contained within single or double quotes.
-org.apache.jasper.compiler.ELParser.invalidQuoting=The expression [{0}] is not 
valid. Within a quoted String only [\], ['] and ["] may be escaped with [\].
+org.apache.jasper.compiler.ELParser.invalidQuoting=The expression [{0}] is not 
valid. Within a quoted String only [\\], [''] and ["] may be escaped with [\\].
 
 org.apache.jasper.compiler.TldCache.servletContextNull=The provided 
SevletContext was null
 



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

svn commit: r1701944 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/resources/LocalStrings.properties

[markt]

Author: markt
Date: Wed Sep  9 08:19:24 2015
New Revision: 1701944

URL: http://svn.apache.org/r1701944
Log:
Fix escaping in error message

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

tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep  9 08:19:24 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,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

buildbot success in ASF Buildbot on tomcat-6-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-6-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc6.0.x/trunk] 1701946
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

Re: tagging http://svn.apache.org/repos/asf/tomcat/native/trunk/

[jean-frederic clere]

On 09/09/2015 10:18 AM, Mark Thomas wrote:

On 09/09/2015 07:20, jean-frederic clere wrote:

Hi,

I think it is time to tag trunk of native to go forward for native

What tag should I use?

1.2.0 as it still work with the APR connector?


1.2.0 works for me.

I don't think we are finished with the API so anything we release needs
to come with some sort of health warning (alpha/beta tag and/or
something in the release notes) that the API is not stable.


Agreed we need to check how java9 will handle APLN and make sure we 
aren't too incompatible with what we have in tomcat-native.


Cheers

Jean-Frederic

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

Re: tagging http://svn.apache.org/repos/asf/tomcat/native/trunk/

[Rémy Maucherat]

2015-09-09 10:18 GMT+02:00 Mark Thomas :

> > I am planning to drop APR and have an OpenSSL only native in a near
> > future (that might takes times to lack of cycles).
>
> Interesting. That sounds like a 2.0.0 activity. Don't we get quite a bit
> of functionality from APR? How much wheel re-invention would this involve?
>
> The OpenSSL code used by the SSL engine doesn't need APR. But I'm not
convinced it would actually be much easier for users.

Rémy

svn commit: r1701946 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/jasper/resources/LocalStrings.properties

[markt]

Author: markt
Date: Wed Sep  9 08:23:29 2015
New Revision: 1701946

URL: http://svn.apache.org/r1701946
Log:
Fix escaping in error message

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

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep  9 08:23:29 2015
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk: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,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,1696381
-/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,1693108,1694291,1696379
-/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,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95
 

[Bug 57583] Performance issue evaluating EL in custom tags (tagx) due to inefficient calls to java.lang.Class.forName()

[bugzilla]

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

--- Comment #5 from Arne Bultman  ---
Isn't that lookup relatively static, as in could the caching of lookups not be
shared across instances of ImportHandler rather than having a cache per
instance?

I need to read up on the spec more.

Thanks for your help, so far. Will look into adding the scopes.

-- 
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 57136] EL Parser escaping dollar sign not ${ or ${...}

[bugzilla]

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

--- Comment #17 from Mark Thomas  ---
I think I have found another, related, problem in attribute values.

The problem I described in comment #16 (where I was thinking about template
text) also applies to attribute values. Specifically, consider the following:


Currently, Tomcat applied attribute value escaping to the whole value. This is
not correct. The production in the JSP spec for QuotedChar (which is used in
attribute values) means that attribute escaping only applies outside the EL.
Inside the EL is handled by ELEXpressionBody which delegates to the EL spec.

I am currently extending the EL test cases to take all of this into account
before looking at what fixes are required.

-- 
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 57583] Performance issue evaluating EL in custom tags (tagx) due to inefficient calls to java.lang.Class.forName()

[bugzilla]

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

--- Comment #4 from Mark Thomas  ---
What you are missing is that with this change in the EL spec resolving of
unscoped attributes got a lot slower. We have fixed it as best we can and I am
not aware of any further improvements that could be made while staying spec
complaint. Suggestions for improvements are welcome but they do need to
maintain spec compliance.

The work-around is to add the appropriate scope to your attributes so use
${requestScope.foo}, ${applicationScope.foo} etc. rather than ${foo}.

-- 
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: r1701991 - /tomcat/jk/trunk/native/common/jk_status.c

[rjung]

Author: rjung
Date: Wed Sep  9 12:53:48 2015
New Revision: 1701991

URL: http://svn.apache.org/r1701991
Log:
Adjust timezone offset for DST.
Followup to r1698316.

Modified:
tomcat/jk/trunk/native/common/jk_status.c

Modified: tomcat/jk/trunk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1701991=1701990=1701991=diff
==
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Wed Sep  9 12:53:48 2015
@@ -785,11 +785,18 @@ static const char *windows_strftime_prep
 char *found = strstr(pattern, JK_WINDOWS_TIMEZONE_PLACEHOLDER);
 if (found != NULL && sz > strlen(pattern)) {
 TIME_ZONE_INFORMATION tz;
+DWORD rc;
 
 strcpy(buf, pattern);
 found = buf + (found - pattern);
 
-if (GetTimeZoneInformation() != TIME_ZONE_ID_INVALID) {
+rc = GetTimeZoneInformation();
+if (rc != TIME_ZONE_ID_INVALID) {
+if (rc == TIME_ZONE_ID_STANDARD) {
+tz.Bias += tz.StandardBias;
+} else if (rc == TIME_ZONE_ID_DAYLIGHT) {
+tz.Bias += tz.DaylightBias;
+}
 tz.Bias *= -1;
 snprintf(found, strlen(JK_WINDOWS_TIMEZONE_PLACEHOLDER), 
"%c%02d%02d",
  (tz.Bias >= 0 ? '+' : '-'), tz.Bias / 60, tz.Bias % 60);



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

[Bug 58286] Crash in jk-status on Windows (when producing HTML output)

[bugzilla]

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

--- Comment #7 from Rainer Jung  ---
Added r1701991 to the fix. The timezone offset was wrong for DST.

-- 
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 58351] New: Provide JMX access to server.built and server.number

[bugzilla]

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

Bug ID: 58351
   Summary: Provide JMX access to server.built and server.number
   Product: Tomcat 7
   Version: trunk
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: huxing.zh...@gmail.com

Created attachment 33087
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33087=edit
patch to provide JMX access to server built and server number

We are able to obtain Server Info, Server Built, and Server Number by running
"catalina.sh version",  those information are also logged to catalina.out by
VersionLoggerListener. 
However, we cannot get Server Built and Server Number via JMX, which I think is
inconsistent.
We should also provide JMX access to Server Built and Server Number.

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

[jira] [Commented] (MTOMCAT-81) mvn tomcat:run does not work with spring tomcat classloader

[albert kam (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-81?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=14738082#comment-14738082
 ] 

albert kam commented on MTOMCAT-81:
---

I'm using the plugin version of 2.3-SNAPSHOT and i still get this:
{quote}
SEVERE: LifecycleException 
java.lang.ClassNotFoundException: 
org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
at 
org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50)
at 
org.codehaus.plexus.classworlds.realm.ClassRealm.unsynchronizedLoadClass(ClassRealm.java:259)
at 
org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:235)
at 
org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:227)
at java.lang.Class.forName0(Native Method)
at java.lang.Class.forName(Class.java:191)
at 
org.apache.catalina.loader.WebappLoader.createClassLoader(WebappLoader.java:721)
at 
org.apache.catalina.loader.WebappLoader.startInternal(WebappLoader.java:582)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
at 
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5389)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
at 
org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1575)
at 
org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1565)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
{quote}

My configurations area:
{quote}
${basedir}/src/main/webapp/META-INF/context.xml

true
{quote}

> mvn tomcat:run does not work with spring tomcat classloader
> ---
>
> Key: MTOMCAT-81
> URL: https://issues.apache.org/jira/browse/MTOMCAT-81
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>Affects Versions: 1.1
> Environment: Ubuntu 10.10
>Reporter: Jothi Shankar Kumar
>Priority: Blocker
>
> I have been trying for weeks to get the mvn tomcat:run work for my Spring 
> based project. I use the spring-tomcat-weaver.jar for doing the class loading 
> in Tomcat. When I run my project using mvn tomcat:run command it gives me a 
> class not found. Below is a stack trace of what I get:
> SEVERE: LifecycleException 
> java.lang.ClassNotFoundException: 
> org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
>   at 
> org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50)
>   at 
> org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244)
>   at 
> org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230)
>   at java.lang.Class.forName0(Native Method)
>   at java.lang.Class.forName(Class.java:169)
>   at 
> org.apache.catalina.loader.WebappLoader.createClassLoader(WebappLoader.java:801)
>   at org.apache.catalina.loader.WebappLoader.start(WebappLoader.java:661)
>   at 
> org.apache.catalina.core.StandardContext.start(StandardContext.java:4504)
>   at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
>   at org.apache.catalina.core.StandardHost.start(StandardHost.java:785)
>   at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
>   at 
> org.apache.catalina.core.StandardEngine.start(StandardEngine.java:445)
>   at org.apache.catalina.startup.Embedded.start(Embedded.java:825)
>   at 
> org.codehaus.mojo.tomcat.AbstractRunMojo.startContainer(AbstractRunMojo.java:558)
>   at 
> org.codehaus.mojo.tomcat.AbstractRunMojo.execute(AbstractRunMojo.java:255)
>   at 
> org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:107)
>   at 
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:195)
>   at 
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:148)
>   at 
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:140)
>   at 
> org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
>   at 
> org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
>   at 
> org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
>   at 
> org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
>   at 

[jira] [Commented] (MTOMCAT-81) mvn tomcat:run does not work with spring tomcat classloader

[albert kam (JIRA)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-81?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=14738086#comment-14738086
 ] 

albert kam commented on MTOMCAT-81:
---

Sorry, the configurations are:
{quote}
basedir/src/main/webapp/META-INF/context.xml
true
org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
true
{quote}

My context.xml file is:
{quote}




{quote}

I'm having the same situation with the original poster, running embedded tomcat 
with mvn:run

> mvn tomcat:run does not work with spring tomcat classloader
> ---
>
> Key: MTOMCAT-81
> URL: https://issues.apache.org/jira/browse/MTOMCAT-81
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>Affects Versions: 1.1
> Environment: Ubuntu 10.10
>Reporter: Jothi Shankar Kumar
>Priority: Blocker
>
> I have been trying for weeks to get the mvn tomcat:run work for my Spring 
> based project. I use the spring-tomcat-weaver.jar for doing the class loading 
> in Tomcat. When I run my project using mvn tomcat:run command it gives me a 
> class not found. Below is a stack trace of what I get:
> SEVERE: LifecycleException 
> java.lang.ClassNotFoundException: 
> org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
>   at 
> org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50)
>   at 
> org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244)
>   at 
> org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230)
>   at java.lang.Class.forName0(Native Method)
>   at java.lang.Class.forName(Class.java:169)
>   at 
> org.apache.catalina.loader.WebappLoader.createClassLoader(WebappLoader.java:801)
>   at org.apache.catalina.loader.WebappLoader.start(WebappLoader.java:661)
>   at 
> org.apache.catalina.core.StandardContext.start(StandardContext.java:4504)
>   at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
>   at org.apache.catalina.core.StandardHost.start(StandardHost.java:785)
>   at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045)
>   at 
> org.apache.catalina.core.StandardEngine.start(StandardEngine.java:445)
>   at org.apache.catalina.startup.Embedded.start(Embedded.java:825)
>   at 
> org.codehaus.mojo.tomcat.AbstractRunMojo.startContainer(AbstractRunMojo.java:558)
>   at 
> org.codehaus.mojo.tomcat.AbstractRunMojo.execute(AbstractRunMojo.java:255)
>   at 
> org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:107)
>   at 
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:195)
>   at 
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:148)
>   at 
> org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:140)
>   at 
> org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
>   at 
> org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
>   at 
> org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
>   at 
> org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
>   at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:316)
>   at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:153)
>   at org.apache.maven.cli.MavenCli.execute(MavenCli.java:451)
>   at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:188)
>   at org.apache.maven.cli.MavenCli.main(MavenCli.java:134)
>   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:597)
>   at 
> org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290)
>   at 
> org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
>   at 
> org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409)
>   at 
> org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352)



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

[Bug 57836] Empty REMOTE_USER is translated to ""

[bugzilla]

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

--- Comment #9 from George Stanchev  ---
Rainer, thanks for this fix! I apologize for not getting back to you quick but
I was out of the office over the Labor Day weekend with no access to email. Let
me know if you still need anything tested. Thanks again for getting the fix in!

-- 
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 57836] Empty REMOTE_USER is translated to ""

[bugzilla]

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

Rainer Jung  changed:

   What|Removed |Added

 Status|NEEDINFO|NEW

--- Comment #7 from Rainer Jung  ---
I could now test the behavior. Unfortunately GetServerVariable does not return
size 0 but instead size 1 in this case. So it really returns an exmpty string
and there's no way to make a dstinction between a NULL and an empty string.

That means we have to make a distinction based on the semantics of the various
variables. I'll keep most of them as empty strings for compatibility and will
replace the empty string by NULL for REMOTE_USER. We can let it control by
another argument, so it will be easy to switch more variables from empty string
to NULL as the need arises.

-- 
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 57836] Empty REMOTE_USER is translated to ""

[bugzilla]

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

Rainer Jung  changed:

   What|Removed |Added

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

--- Comment #8 from Rainer Jung  ---
I implemented the overwriting of the empty string return value with an
additional arg in r1702073. Especially REMOTE_USER and AUTH_TYPE will now be
NULL instead of empty string. Closing this issue now. Will be part of 1.2.42.

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

Project Jigsaw: Early-Access Builds available on jdk9.java.net/jigsaw

[Rory O'Donnell]

Hi Mark/Mladen,

Early-access builds of JDK 9 with Project Jigsaw are available for 
download at jdk9.java.net/jigsaw .


The EA builds contain the latest prototype implementation of JSR 376 
, the Java Platform Module 
System,
as well as that of the JDK-specific APIs and tools described in JEP 261 
.


If you'd like to try out the EA builds, by far the most helpful things 
you can do are:


 *

   Try to run existing applications, without change, on these builds to
   see whether the module system, or the modularization of the
   platform, breaks your code or identifies code that depends upon
   JDK-internal APIs or other unspecified aspects of the platform.

 *

   Experiment with the module system itself, perhaps by following the
   quick start guide
   , and start
   thinking about how to migrate existing libraries and application
   components to modules. We hope to publish some specific migration
   tips shortly.

Please send usage questions and experience reports to the jigsaw-dev 
 list. 
Specific suggestions about the design of the module system should be 
sent to the JSR 376 Expert Group's comments list 
.


For more information please seen Mark Reinhold's mail [1]

Rgds,Rory

[1]http://mail.openjdk.java.net/pipermail/jigsaw-dev/2015-September/004480.html

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

svn commit: r1702073 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

[rjung]

Author: rjung
Date: Wed Sep  9 18:24:13 2015
New Revision: 1702073

URL: http://svn.apache.org/r1702073
Log:
IIS: Allow to overwrite empty string returned
by GetServerVariable. Keep empty string in cases
we are unsure, and use NULL were NULL is safe or
needed.

Followup to r1701497.

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1702073=1702072=1702073=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Wed Sep  9 18:24:13 2015
@@ -445,11 +445,12 @@ static struct error_reasons {
 
 #define ISIZEOF(X)  (int)sizeof(X)
 
-#define GET_SERVER_VARIABLE_VALUE(name, place)  \
+#define GET_SERVER_VARIABLE_VALUE(name, place, def) \
   do {  \
 (place) = dup_server_value(private_data->lpEcb, \
(name),  \
-   _data->p);   \
+   _data->p,\
+   def);\
   } while(0)
 
 #define GET_SERVER_VARIABLE_VALUE_INT(name, place, def) \
@@ -593,7 +594,8 @@ static BOOL get_server_value(LPEXTENSION
  char *buf, size_t bufsz);
 
 static char *dup_server_value(LPEXTENSION_CONTROL_BLOCK lpEcb,
-  const char *name, jk_pool_t *p);
+  const char *name, jk_pool_t *p,
+  const char *def);
 
 static int base64_encode_cert_len(int len);
 
@@ -3186,22 +3188,22 @@ static int init_ws_service(isapi_private
 s->write = iis_write;
 s->done  = iis_done;
 
-GET_SERVER_VARIABLE_VALUE(HTTP_URI_HEADER_NAME, s->req_uri);
+GET_SERVER_VARIABLE_VALUE(HTTP_URI_HEADER_NAME, s->req_uri, NULL);
 
 if (s->req_uri == NULL) {
 if (JK_IS_DEBUG_LEVEL(logger))
 jk_log(logger, JK_LOG_DEBUG, "No URI header value provided. 
Defaulting to old behaviour" );
 s->query_string = private_data->lpEcb->lpszQueryString;
 *worker_name = DEFAULT_WORKER_NAME;
-GET_SERVER_VARIABLE_VALUE("URL", s->req_uri);
+GET_SERVER_VARIABLE_VALUE("URL", s->req_uri, "");
 if (unescape_url(s->req_uri) < 0) {
 JK_TRACE_EXIT(logger);
 return JK_FALSE;
 }
 getparents(s->req_uri);
 } else {
-GET_SERVER_VARIABLE_VALUE(HTTP_QUERY_HEADER_NAME, s->query_string);
-GET_SERVER_VARIABLE_VALUE(HTTP_WORKER_HEADER_NAME, (*worker_name));
+GET_SERVER_VARIABLE_VALUE(HTTP_QUERY_HEADER_NAME, s->query_string, "");
+GET_SERVER_VARIABLE_VALUE(HTTP_WORKER_HEADER_NAME, (*worker_name), "");
 GET_SERVER_VARIABLE_VALUE_INT(HTTP_WORKER_HEADER_INDEX, worker_index, 
-1);
 }
 
@@ -3212,16 +3214,16 @@ static int init_ws_service(isapi_private
 jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s", 
HTTP_QUERY_HEADER_NAME, s->query_string);
 }
 
-GET_SERVER_VARIABLE_VALUE("AUTH_TYPE", s->auth_type);
-GET_SERVER_VARIABLE_VALUE("REMOTE_USER", s->remote_user);
-GET_SERVER_VARIABLE_VALUE("SERVER_PROTOCOL", s->protocol);
-GET_SERVER_VARIABLE_VALUE("REMOTE_HOST", s->remote_host);
-GET_SERVER_VARIABLE_VALUE("REMOTE_ADDR", s->remote_addr);
-GET_SERVER_VARIABLE_VALUE("REMOTE_PORT", s->remote_port);
-GET_SERVER_VARIABLE_VALUE("SERVER_NAME", s->server_name);
-GET_SERVER_VARIABLE_VALUE("LOCAL_ADDR", s->local_addr);
+GET_SERVER_VARIABLE_VALUE("AUTH_TYPE", s->auth_type, NULL);
+GET_SERVER_VARIABLE_VALUE("REMOTE_USER", s->remote_user, NULL);
+GET_SERVER_VARIABLE_VALUE("SERVER_PROTOCOL", s->protocol, "");
+GET_SERVER_VARIABLE_VALUE("REMOTE_HOST", s->remote_host, "");
+GET_SERVER_VARIABLE_VALUE("REMOTE_ADDR", s->remote_addr, "");
+GET_SERVER_VARIABLE_VALUE("REMOTE_PORT", s->remote_port, "");
+GET_SERVER_VARIABLE_VALUE("SERVER_NAME", s->server_name, "");
+GET_SERVER_VARIABLE_VALUE("LOCAL_ADDR", s->local_addr, "");
 GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT", s->server_port, 80);
-GET_SERVER_VARIABLE_VALUE("SERVER_SOFTWARE", s->server_software);
+GET_SERVER_VARIABLE_VALUE("SERVER_SOFTWARE", s->server_software, "");
 GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT_SECURE", s->is_ssl, 0);
 
 s->method = private_data->lpEcb->lpszMethod;
@@ -3317,7 +3319,7 @@ static int init_ws_service(isapi_private
 unsigned int num_of_vars = 0;
 
 for (i = 0; i < 9; i++) {
-GET_SERVER_VARIABLE_VALUE(ssl_env_names[i], ssl_env_values[i]);
+GET_SERVER_VARIABLE_VALUE(ssl_env_names[i], ssl_env_values[i], 
NULL);
 if (ssl_env_values[i]) {
 num_of_vars++;
 }
@@ -3373,7 

[Bug 56005] ISAPI redirector WEB-INF/META-INF Path Check false positive (#51769 is back)

[bugzilla]

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

Rainer Jung  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEEDINFO|RESOLVED

--- Comment #3 from Rainer Jung  ---
No feedback providedfor 1.5 years. I can't see any error with web-inf /
meta-inf handling currently. So closing as INVALID.

-- 
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: r1702092 - in /tomcat/trunk: java/org/apache/el/parser/ELParser.jjt java/org/apache/el/parser/ELParserTokenManager.java test/org/apache/el/TestELEvaluation.java

[markt]

Author: markt
Date: Wed Sep  9 19:30:52 2015
New Revision: 1702092

URL: http://svn.apache.org/r1702092
Log:
Fix an edge case parser bug found while investigating BZ 57136

Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/trunk/test/org/apache/el/TestELEvaluation.java

Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?rev=1702092=1702091=1702092=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Wed Sep  9 19:30:52 2015
@@ -473,7 +473,7 @@ java.util.Deque deque = new jav
*/
   < LITERAL_EXPRESSION:
 (   (~["$", "#", "\\"])* "\\" (["$", "#"])?
-  | (~["$", "#"])* (["$", "#"] ~["{", "$", "#"])
+  | (~["$", "#"])* (["$", "#"] ~["{", "$", "#", "\\"])
   | (~["$", "#"])+
 )+
 | "$"

Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=1702092=1702091=1702092=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Wed Sep  9 
19:30:52 2015
@@ -1,7 +1,5 @@
 /* Generated By:JJTree: Do not edit this line. 
ELParserTokenManager.java */
 package org.apache.el.parser;
-import java.io.StringReader;
-import javax.el.ELException;
 
 /** Token Manager. */
 @SuppressWarnings("all") // Ignore warnings in generated code
@@ -187,7 +185,7 @@ private int jjMoveNfa_0(int startState,
   jjCheckNAddTwoStates(3, 4);
   break;
case 5:
-  if ((0xf7ffL & l) == 0L)
+  if ((0xf7ffefffL & l) == 0L)
  break;
   if (kind > 1)
  kind = 1;

Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=1702092=1702091=1702092=diff
==
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Wed Sep  9 19:30:52 
2015
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.el.lang.ELSupport;
@@ -207,6 +208,32 @@ public class TestELEvaluation {
 assertNotNull(e);
 }
 
+@Test
+public void testEscape01() {
+Assert.assertEquals("$${", evaluateExpression("$\\${"));
+}
+
+@Test
+public void testBug49081a() {
+Assert.assertEquals("$2", evaluateExpression("$${1+1}"));
+}
+
+@Test
+public void testBug49081b() {
+Assert.assertEquals("#2", evaluateExpression("##{1+1}"));
+}
+
+@Test
+public void testBug49081c() {
+Assert.assertEquals("#2", evaluateExpression("#${1+1}"));
+}
+
+@Test
+public void testBug49081d() {
+Assert.assertEquals("$2", evaluateExpression("$#{1+1}"));
+}
+
+
 // 
 
 private String evaluateExpression(String expression) {



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

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

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

Buildbot URL: http://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] 1702092
Blamelist: markt

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

[Bug 54112] ISAPI redirector not working when IIS recycles

[bugzilla]

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

Rainer Jung  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |INVALID

--- Comment #9 from Rainer Jung  ---
I can't see any problems with app pool recycling and the redirector for current
versions (1.2.42-dev on Windows 7 with IIS 7.5. Furthermore no feedback on the
questions for several months, so closing as INVALID.

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