[Bug 61803] Documentation for sslEnabledProtocols describes the incorrect way to set this option

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61803

--- Comment #1 from Simon Dawson  ---
Here is the original patch that changed this for version 8.
https://svn.apache.org/viewvc?view=revision=1681779

It did include some documentation updates but not to sslEnabledProtocols.

-- 
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 61803] New: Documentation for sslEnabledProtocols describes the incorrect way to set this option

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61803

Bug ID: 61803
   Summary: Documentation for sslEnabledProtocols describes the
incorrect way to set this option
   Product: Tomcat 8
   Version: 8.5.23
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: simon.daw...@sas.com
  Target Milestone: 

In webapps/docs/security-howto.xml the following documentation is provided for
the sslEnabledProtocols option.

304   The sslEnabledProtocols attribute determines
which
305   versions of the SSL/TLS protocol are used.  Since the POODLE attack
in
306   2014, all SSL protocols are considered unsafe and a secure setting
for
307   this attribute in a standalone Tomcat setup might be
308   sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2"

This documentation also includes an example of setting this option.

When this is syntax is used you get the following warning text printed into
the log.

WARN - The protocol [TLSv1.1] was added to the list of protocols on the 
SSLHostConfig named [_default_]. Check if a +/- prefix is missing.

Inside org/apache/tomcat/util/net/SSLHostConfig.java there is a comment
describing
the expected format for this options and how its parsed.

441 // List of protocol names, separated by ",", "+" or "-".
442 // Semantics is adding ("+") or removing ("-") from left
443 // to right, starting with an empty protocol set.
444 // Tokens are individual protocol names or "all" for a
445 // default set of supported protocols.
446 // Separator "," is only kept for compatibility and has the
447 // same semantics as "+", except that it warns about a potentially
448 // missing "+" or "-".

I've never written a patch before but I'm keen to assist if I can get some
guidance.

-- 
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: [PROPOSAL] Drop some JK components

2017-11-22 Thread Christopher Schultz 
Mark,

On 11/21/17 7:58 AM, Mark Thomas wrote:
> All,
> 
> I've been looking at jk/trunk with a view to rolling a release in the
> near future. (It has been just over a year since the last release.)
> 
> As I have been looking through the source, I have noticed a number of
> components that we still include in the source that I think we
> can/should remove before the next release. I've listed each of them
> below along with a short rationale. Feel free to +1 / -1 their removal
> either individually or as a group.
> 
> Cheers,
> 
> Mark
> 
> 
> jkant - Ant wrapper around various native compilers. Code is untouched
> (in any meaningful way for 14+ years)
> 
> native/apache-1.3
>   - httpd 1.3 reached end of life over 12 years ago
> 
> native/iis/installer
>   - InstallShield installer last released over 12 years ago
> (we don't have a license for InstallShield)
> 
> native/iis/Makefile.ia64 (and any similar files)
>   - Itanium support

+1 for removal of all of these items.

-chris



signature.asc
Description: OpenPGP digital signature

buildbot success in on tomcat-trunk

2017-11-22 Thread 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/2836

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

[Bug 61733] lb_mult changes caused by status worker changing a subworker's factor are not propagated to all processes correctly.

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61733

--- Comment #5 from Rainer Jung  ---
Created attachment 35549
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35549=edit
Reorder update actions and introduce flag for demanding updates for all members

I think both of your analysis are right:

- we only sync via shared memory lb_mult for the worker whose factor changed
- the order of steps in case only one member is changes is wrong

The attached patch should fix both issues, correct the order - similar to what
Mark suggests - plus letting jk_lb_push know, that it should not only push none
or one member, but instead needs to push all members of an lb. To make this
possible we change the signature of jk_lb_push and introduce a new flag.

The patch compiles, but I'm short of time to aczually test it. it would be
great if one or both of you could give it a try.

Comments very welcome.

-- 
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: r1816088 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 21:33:03 2017
New Revision: 1816088

URL: http://svn.apache.org/viewvc?rev=1816088=rev
Log:
Fix test failure

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

tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 22 21:33:03 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747
 
404,1747506,1747536,1747924,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-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205

svn commit: r1816087 - /tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 21:32:19 2017
New Revision: 1816087

URL: http://svn.apache.org/viewvc?rev=1816087=rev
Log:
Fix test failure

Modified:

tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java?rev=1816087=1816086=1816087=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
 Wed Nov 22 21:32:19 2017
@@ -77,6 +77,11 @@ public class TestJaspicCallbackHandlerIn
 
 class TestCallbackHandlerImpl implements CallbackHandler {
 
+public TestCallbackHandlerImpl() {
+// Default constructor required by reflection
+}
+
+
 @Override
 public void handle(Callback[] callbacks) throws IOException, 
UnsupportedCallbackException {
 // don't have to do anything; needed only for instantiation



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

[Bug 51496] NSIS - Warn that duplicate service name will result in install failure

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=51496

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #8 from Mark Thomas  ---
Thanks for the patch. I fixed a typo - otherwise it was applied as provided.

Fixed in:
- trunk for 9.0.2 onwards
- 8.5.x for 8.5.24 onwards
- 8.0.x for 8.0.48 onwards
- 7.0.x for 7.0.83 onwards

-- 
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: r1816086 - in /tomcat/tc7.0.x/trunk: ./ res/tomcat.nsi webapps/docs/changelog.xml

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 21:29:26 2017
New Revision: 1816086

URL: http://svn.apache.org/viewvc?rev=1816086=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=51496
When using the Windows installer, check if the requested service name already 
exists and, if it does, prompt the user to select an alternative service name.
Patch provided by Ralph Plawetzki.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/res/tomcat.nsi
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1816085 - in /tomcat/tc8.0.x/trunk: ./ res/tomcat.nsi webapps/docs/changelog.xml

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 21:28:43 2017
New Revision: 1816085

URL: http://svn.apache.org/viewvc?rev=1816085=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=51496
When using the Windows installer, check if the requested service name already 
exists and, if it does, prompt the user to select an alternative service name.
Patch provided by Ralph Plawetzki.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/res/tomcat.nsi
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 22 21:28:43 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956
-/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

svn commit: r1816084 - in /tomcat/tc8.5.x/trunk: ./ res/tomcat.nsi webapps/docs/changelog.xml

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 21:27:31 2017
New Revision: 1816084

URL: http://svn.apache.org/viewvc?rev=1816084=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=51496
When using the Windows installer, check if the requested service name already 
exists and, if it does, prompt the user to select an alternative service name.
Patch provided by Ralph Plawetzki.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/res/tomcat.nsi
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 22 21:27:31 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747
 
404,1747506,1747536,1747924,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-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205

svn commit: r1816083 - in /tomcat/trunk: res/tomcat.nsi webapps/docs/changelog.xml

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 21:25:42 2017
New Revision: 1816083

URL: http://svn.apache.org/viewvc?rev=1816083=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=51496
When using the Windows installer, check if the requested service name already 
exists and, if it does, prompt the user to select an alternative service name.
Patch provided by Ralph Plawetzki.

Modified:
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1816083=1816082=1816083=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Wed Nov 22 21:25:42 2017
@@ -57,6 +57,7 @@ Var TomcatPortAjp
 Var TomcatMenuEntriesEnable
 Var TomcatShortcutAllUsers
 Var TomcatServiceName
+Var TomcatServiceNameAlreadyInstalled
 Var TomcatServiceDefaultName
 Var TomcatServiceFileName
 Var TomcatServiceManagerFileName
@@ -632,6 +633,15 @@ Function pageConfigurationLeave
 Abort "Config not right"
 Goto exit
   ${EndIf}
+
+  ReadRegStr $TomcatServiceNameAlreadyInstalled HKLM 
"SYSTEM\CurrentControlSet\Services\$TomcatServiceName" \
+"DisplayName"
+  ${If} $TomcatServiceNameAlreadyInstalled != ""
+MessageBox MB_ICONEXCLAMATION|MB_OK 'A service with the given Service Name 
is already installed on this machine. \
+  Please choose another Service Name'
+Abort "Config not right"
+Goto exit
+  ${EndIf}
 
   Push $TomcatServiceName
   Call validateServiceName

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1816083=1816082=1816083=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 22 21:25:42 2017
@@ -249,6 +249,12 @@
 such attempted use of the endorsed directory mechanism will trigger an
 error and Tomcat will fail to start. (rjung)
   
+  
+51496: When using the Windows installer, check if the
+requested service name already exists and, if it does, prompt the user
+to select an alternative service name. Patch provided by Ralph
+Plawetzki. (markt)
+  
   
 61590: Enable service.bat to recognise when
 JAVA_HOME is configured for a Java 9 JDK. (markt)



-
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

2017-11-22 Thread 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/2834

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] 1816078
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 61795] Make JASPIC callback handler class configurable via a property of the authenticator

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61795

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
Yet again, many thanks. Patch applied.

Fixed in:
- trunk for 9.0.2 onwards
- 8.5.x for 8.5.24 onwards

-- 
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: r1816080 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/authenticator/AuthenticatorBase.java test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java w

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 20:49:06 2017
New Revision: 1816080

URL: http://svn.apache.org/viewvc?rev=1816080=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61795
Add a property to the Authenticator implementations to enable a custom JASPIC 
CallbackHandler to be specified.
Patch provided by Lazar.

Added:

tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
  - copied unchanged from r1816078, 
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 22 20:49:06 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747
 
404,1747506,1747536,1747924,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-1

[GitHub] tomcat pull request #93: Make JASPIC callback handler class configurable via...

2017-11-22 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/tomcat/pull/93


---

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

svn commit: r1816078 - in /tomcat/trunk: java/org/apache/catalina/authenticator/AuthenticatorBase.java test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java webapps/docs

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 20:48:39 2017
New Revision: 1816078

URL: http://svn.apache.org/viewvc?rev=1816078=rev
Log:
Add a property to the Authenticator implementations to enable a custom JASPIC 
CallbackHandler to be specified.
Patch provided by Lazar.
This closes #93

Added:

tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
   (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/valve.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1816078=1816077=1816078=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
Wed Nov 22 20:48:39 2017
@@ -27,6 +27,7 @@ import java.util.Optional;
 import java.util.Set;
 
 import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.message.AuthException;
 import javax.security.auth.message.AuthStatus;
 import javax.security.auth.message.MessageInfo;
@@ -211,6 +212,13 @@ public abstract class AuthenticatorBase
  */
 protected String secureRandomProvider = null;
 
+/**
+ * The name of the JASPIC callback handler class. If none is specified the
+ * default {@link 
org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl}
+ * will be used.
+ */
+protected String jaspicCallbackHandlerClass = null;
+
 protected SessionIdGeneratorBase sessionIdGenerator = null;
 
 /**
@@ -407,6 +415,25 @@ public abstract class AuthenticatorBase
 this.secureRandomProvider = secureRandomProvider;
 }
 
+/**
+ * Return the JASPIC callback handler class name
+ *
+ * @return The name of the JASPIC callback handler
+ */
+public String getJaspicCallbackHandlerClass() {
+return jaspicCallbackHandlerClass;
+}
+
+/**
+ * Set the JASPIC callback handler class name
+ *
+ * @param jaspicCallbackHandlerClass
+ *The new JASPIC callback handler class name
+ */
+public void setJaspicCallbackHandlerClass(String 
jaspicCallbackHandlerClass) {
+this.jaspicCallbackHandlerClass = jaspicCallbackHandlerClass;
+}
+
 // - Public Methods
 
 /**
@@ -640,8 +667,9 @@ public abstract class AuthenticatorBase
 new MessageInfoImpl(request.getRequest(), 
response.getResponse(), authMandatory);
 
 try {
+CallbackHandler callbackHandler = createCallbackHandler();
 ServerAuthConfig serverAuthConfig = 
jaspicProvider.getServerAuthConfig(
-"HttpServlet", jaspicAppContextID, 
CallbackHandlerImpl.getInstance());
+"HttpServlet", jaspicAppContextID, callbackHandler);
 String authContextID = 
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
 jaspicState.serverAuthContext = 
serverAuthConfig.getAuthContext(authContextID, null, null);
 } catch (AuthException e) {
@@ -653,6 +681,32 @@ public abstract class AuthenticatorBase
 return jaspicState;
 }
 
+private CallbackHandler createCallbackHandler() {
+CallbackHandler callbackHandler = null;
+if (jaspicCallbackHandlerClass == null) {
+callbackHandler = CallbackHandlerImpl.getInstance();
+} else {
+Class clazz = null;
+try {
+clazz = Class.forName(jaspicCallbackHandlerClass, true,
+Thread.currentThread().getContextClassLoader());
+} catch (ClassNotFoundException e) {
+// Proceed with the retry below
+}
+
+try {
+if (clazz == null) {
+clazz = Class.forName(jaspicCallbackHandlerClass);
+}
+callbackHandler = 
(CallbackHandler)clazz.getConstructor().newInstance();
+} catch (ReflectiveOperationException e) {
+throw new SecurityException(e);
+}
+}
+
+return callbackHandler;
+}
+
 
 // -- Protected Methods
 

Added: 
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicCallbackHandlerInAuthenticator.java?rev=1816078=auto
==
---

[Bug 61784] NPE if AuthConfigFactoryImpl.registerConfigProvider() is called with null provider name parameter

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61784

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #7 from Mark Thomas  ---
Thanks for the updated patch and test cases.

Fixed in:
- trunk for 9.0.2 onwards
- 8.5.x for 8.5.24 onwards

-- 
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: r1816077 - in /tomcat/tc8.5.x/trunk: ./ conf/ java/org/apache/catalina/authenticator/jaspic/ test/org/apache/catalina/authenticator/jaspic/ webapps/docs/

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 20:18:37 2017
New Revision: 1816077

URL: http://svn.apache.org/viewvc?rev=1816077=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61784
Correctly handle the case when AuthConfigFactoryImpl.registerConfigProvider() 
is called with a provider name of null.
Patch provided by Lazar.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/conf/jaspic-providers.xsd

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 22 20:18:37 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747
 
404,1747506,1747536,1747924,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-1

[GitHub] tomcat pull request #94: Support null for provider class name when registeri...

2017-11-22 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/tomcat/pull/94


---

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

svn commit: r1816076 - in /tomcat/trunk: conf/ java/org/apache/catalina/authenticator/jaspic/ test/org/apache/catalina/authenticator/jaspic/ webapps/docs/

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 20:17:53 2017
New Revision: 1816076

URL: http://svn.apache.org/viewvc?rev=1816076=rev
Log:
Correctly handle the case when AuthConfigFactoryImpl.registerConfigProvider() 
is called with a provider name of null.
Patch provided by Lazar.
This closes #94

Modified:
tomcat/trunk/conf/jaspic-providers.xsd

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java

tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/conf/jaspic-providers.xsd
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/jaspic-providers.xsd?rev=1816076=1816075=1816076=diff
==
--- tomcat/trunk/conf/jaspic-providers.xsd (original)
+++ tomcat/trunk/conf/jaspic-providers.xsd Wed Nov 22 20:17:53 2017
@@ -35,7 +35,7 @@
 
   
 
-
+
 
 
 

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java?rev=1816076=1816075=1816076=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
 Wed Nov 22 20:17:53 2017
@@ -105,6 +105,22 @@ public class AuthConfigFactoryImpl exten
 log.debug(sm.getString("authConfigFactoryImpl.registerClass",
 className, layer, appContext));
 }
+
+AuthConfigProvider provider = null;
+if (className != null) {
+provider = createAuthConfigProvider(className, properties);
+}
+
+String registrationID = getRegistrationID(layer, appContext);
+RegistrationContextImpl registrationContextImpl = new 
RegistrationContextImpl(
+layer, appContext, description, true, provider, properties);
+addRegistrationContextImpl(layer, appContext, registrationID, 
registrationContextImpl);
+return registrationID;
+}
+
+
+private AuthConfigProvider createAuthConfigProvider(String className,
+@SuppressWarnings("rawtypes") Map properties) throws 
SecurityException {
 Class clazz = null;
 AuthConfigProvider provider = null;
 try {
@@ -121,12 +137,7 @@ public class AuthConfigFactoryImpl exten
 } catch (ReflectiveOperationException | IllegalArgumentException e) {
 throw new SecurityException(e);
 }
-
-String registrationID = getRegistrationID(layer, appContext);
-RegistrationContextImpl registrationContextImpl = new 
RegistrationContextImpl(
-layer, appContext, description, true, provider, properties);
-addRegistrationContextImpl(layer, appContext, registrationID, 
registrationContextImpl);
-return registrationID;
+return provider;
 }
 
 
@@ -365,7 +376,9 @@ public class AuthConfigFactoryImpl exten
 if (registrationContextImpl != null && 
registrationContextImpl.isPersistent()) {
 Provider provider = new Provider();
 provider.setAppContext(registrationContextImpl.getAppContext());
-
provider.setClassName(registrationContextImpl.getProvider().getClass().getName());
+if (registrationContextImpl.getProvider() != null) {
+
provider.setClassName(registrationContextImpl.getProvider().getClass().getName());
+}
 provider.setDescription(registrationContextImpl.getDescription());
 provider.setLayer(registrationContextImpl.getMessageLayer());
 for (Entry property : 
registrationContextImpl.getProperties().entrySet()) {

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java?rev=1816076=1816075=1816076=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
 Wed Nov 22 20:17:53 2017
@@ -121,12 +121,12 @@ final class PersistentProviderRegistrati
 "xsi:schemaLocation=\"http://tomcat.apache.org/xml 
jaspic-providers.xsd\"\n" +
 "version=\"1.0\">\n");
 for (Provider provider : providers.providers)

svn commit: r1816074 - in /tomcat/jk/trunk/native: ./ common/

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 19:47:24 2017
New Revision: 1816074

URL: http://svn.apache.org/viewvc?rev=1816074=rev
Log:
Ignore generated files

Modified:
tomcat/jk/trunk/native/   (props changed)
tomcat/jk/trunk/native/common/   (props changed)

Propchange: tomcat/jk/trunk/native/
--
--- svn:ignore (original)
+++ svn:ignore Wed Nov 22 19:47:24 2017
@@ -7,3 +7,4 @@ config.cache
 libtool
 config.status
 build.properties
+config.nice

Propchange: tomcat/jk/trunk/native/common/
--
--- svn:ignore (original)
+++ svn:ignore Wed Nov 22 19:47:24 2017
@@ -7,3 +7,6 @@ stamp-h.in
 list.mk
 stamp-h
 config.h.in
+config.h
+stamp-h1
+jk_types.h



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

[Bug 61692] CGIServlet should handle additional HTTP methods, for example MKCALENDAR, MKCOL, PROPFIND, PROPPATCH

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61692

--- Comment #6 from Mark Thomas  ---
Good point. Fixing that starts heading in the direction of the original patch
again. More thought 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 61733] lb_mult changes caused by status worker changing a subworker's factor are not propagated to all processes correctly.

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61733

--- Comment #4 from Jonathan Oddy  ---
Created attachment 35547
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35547=edit
Force update all subworkers for multiplier change

Here's an attempt at doing that.

This hasn't been as heavily tested as my original patch.

However, I'm now wondering if it ought to be treated like lb_value, and read
straight from shm rather than being copied to lb_sub_worker. That'd be simpler,
and also get rid of the lag on lb_mult changes being picked up everywhere. Are
there any advantages to it being synced to lb_sub_worker? I wondered if there
was some performance implication, but if that's the case then access to
lb_value would surely be much more of a bottleneck already.

-- 
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: [Bug 61733] lb_mult changes caused by status worker changing a subworker's factor are not propagated to all processes correctly.

2017-11-22 Thread Rainer Jung 

Will look this evening.

Rainer

Am 22.11.2017 um 11:59 schrieb Mark Thomas:

Hi,

A review from someone who knows the jk code better than I do would be
appreciated.

Does my alternative patch look appropriate? If not, is the OP's patch
appropriate? If neither is appropriate, what might an appropriate patch
look like and I'll see what I can do.

Thanks,

Mark


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

[Bug 61784] NPE if AuthConfigFactoryImpl.registerConfigProvider() is called with null provider name parameter

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61784

--- Comment #6 from Lazar Kirchev  ---
Thanks Mark! Agree.

Here is a pull request with patch + tests:
https://github.com/apache/tomcat/pull/94

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

[GitHub] tomcat pull request #94: Support null for provider class name when registeri...

2017-11-22 Thread lkirchev 
GitHub user lkirchev opened a pull request:

https://github.com/apache/tomcat/pull/94

Support null for provider class name when registering a provider

Patch for https://bz.apache.org/bugzilla/show_bug.cgi?id=61784

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/lkirchev/tomcat null_provider_name

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/94.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #94


commit 0eea71fff6affdb2f1a18f2851619cdfacd70558
Author: Lazar Kirchev 
Date:   2017-11-22T15:05:55Z

Support null for provider class name when registering a provider




---

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

svn commit: r1816058 - /tomcat/jk/trunk/native/configure.ac

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 14:33:11 2017
New Revision: 1816058

URL: http://svn.apache.org/viewvc?rev=1816058=rev
Log:
Follow-up to r1816043
kkolinko review
Ensure correct version of apxs is specified

Modified:
tomcat/jk/trunk/native/configure.ac

Modified: tomcat/jk/trunk/native/configure.ac
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1816058=1816057=1816058=diff
==
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Wed Nov 22 14:33:11 2017
@@ -110,6 +110,9 @@ AC_ARG_WITH(apxs,
 
 dnl test apache version
 APA=`${GREP} STANDARD20 ${APXS}`
+if ${TEST} -z "$APA" ; then
+AC_MSG_ERROR(No Apache 2.x found)
+fi
 WEBSERVER="apache-2.0"
 APRINCLUDEDIR=""
 INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"



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

[Bug 61621] Content-Type is forced to lowercase when it goes through mod_jk

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61621

Mark Thomas  changed:

   What|Removed |Added

   Severity|normal  |enhancement

--- Comment #1 from Mark Thomas  ---
It is worth noting that ap_content_type_to_lower() only changes the type and
sub-type. Parameter names and values remain unchanged.

Removing this call in mod_jk breaks the use of AddOutputFilterByType.

Testing with mod_proxy confirms that it doesn't change the case of the
Content-type but also demonstrates that the use of AddOutputFilterByType is
broken with mod_proxy if the Content-type is not lower case.

I looked, but could not find, any bug reports against mod_proxy for
AddOutputFilterByType not working.

I don't have any objections to making the mod_jk behaviour configurable
although I do think that the current behaviour should remain the default. I am
therefore moving this issue to an enhancement request.

-- 
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: svn commit: r1816043 - in /tomcat/jk/trunk/native: BUILDING.txt configure.ac

2017-11-22 Thread Konstantin Kolinko 
2017-11-22 15:06 GMT+03:00  :
> Author: markt
> Date: Wed Nov 22 12:06:41 2017
> New Revision: 1816043
>
> URL: http://svn.apache.org/viewvc?rev=1816043=rev
> Log:
> Remove apache-1.3 references
>
> Modified:
> tomcat/jk/trunk/native/BUILDING.txt
> tomcat/jk/trunk/native/configure.ac
>
> Modified: tomcat/jk/trunk/native/BUILDING.txt
> URL: 
> http://svn.apache.org/viewvc/tomcat/jk/trunk/native/BUILDING.txt?rev=1816043=1816042=1816043=diff
> ==
> --- tomcat/jk/trunk/native/BUILDING.txt (original)
> +++ tomcat/jk/trunk/native/BUILDING.txt Wed Nov 22 12:06:41 2017
> @@ -44,7 +44,7 @@
>
>The resulting module file mod_jk.so of mod_jk will be
>located in the directory apache-2.0 (for any version
> -  of Apache 2.x) respectively apache-1.3 (for Apache 1.3).
> +  of Apache 2.x).
>
>Simply copy the file to your web server modules or libexec
>directory.
>
> Modified: tomcat/jk/trunk/native/configure.ac
> URL: 
> http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1816043=1816042=1816043=diff
> ==
> --- tomcat/jk/trunk/native/configure.ac (original)
> +++ tomcat/jk/trunk/native/configure.ac Wed Nov 22 12:06:41 2017
> @@ -110,27 +110,19 @@ AC_ARG_WITH(apxs,
>
>  dnl test apache version
>  APA=`${GREP} STANDARD20 ${APXS}`

The above line is no longer used.
Maybe keep the below -z test and use AC_MSG_ERROR() to say "No Apache
2.x found".

> -if ${TEST} -z "$APA" ; then
> -WEBSERVER="apache-1.3"
> -APXSCC="`$APXS -q CC`"
> -APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK"
> -APXSCPPFLAGS=""
> -APXSLDFLAGS="`$APXS -q LDFLAGS_SHLIB`"
> -else
> -WEBSERVER="apache-2.0"
> -APRINCLUDEDIR=""
> -INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
> -for INC in ${INCTEMP}; do
> -APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
> -done
> -AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
> -APXSCC="`$APXS -q CC`"
> -APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` 
> -DHAVE_APR ${APRINCLUDEDIR}"
> -APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
> -APXSLDFLAGS="`$APXS -q LDFLAGS`"
> -APACHE_CONFIG_VARS="`${APXS} -q 
> exp_installbuilddir`/config_vars.mk"
> -LIBTOOL=`$APXS -q LIBTOOL`
> -fi
> +WEBSERVER="apache-2.0"
> +APRINCLUDEDIR=""
> +INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
> +for INC in ${INCTEMP}; do
> +APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
> +done
> +AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
> +APXSCC="`$APXS -q CC`"
> +APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` 
> -DHAVE_APR ${APRINCLUDEDIR}"
> +APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
> +APXSLDFLAGS="`$APXS -q LDFLAGS`"
> +APACHE_CONFIG_VARS="`${APXS} -q 
> exp_installbuilddir`/config_vars.mk"
> +LIBTOOL=`$APXS -q LIBTOOL`
>  AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
>  if ${TEST} -z "${CC}" ; then
>  CC="${APXSCC}"
> @@ -705,8 +697,6 @@ dnl automake needs the path it does not
>  dnl that why useless Makefiles are build.
>  AC_OUTPUT([
>  Makefile
> -apache-1.3/Makefile
> -apache-1.3/Makefile.apxs
>  apache-2.0/Makefile
>  apache-2.0/Makefile.apxs
>  common/Makefile
>

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

svn commit: r1816045 - in /tomcat/jk/trunk/native: common/ scripts/build/unix/

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 12:13:58 2017
New Revision: 1816045

URL: http://svn.apache.org/viewvc?rev=1816045=rev
Log:
Ignore files generated by buildconf.sh

Modified:
tomcat/jk/trunk/native/common/   (props changed)
tomcat/jk/trunk/native/scripts/build/unix/   (props changed)

Propchange: tomcat/jk/trunk/native/common/
--
--- svn:ignore (original)
+++ svn:ignore Wed Nov 22 12:13:58 2017
@@ -6,3 +6,4 @@ Makefile
 stamp-h.in
 list.mk
 stamp-h
+config.h.in

Propchange: tomcat/jk/trunk/native/scripts/build/unix/
--
--- svn:ignore (added)
+++ svn:ignore Wed Nov 22 12:13:58 2017
@@ -0,0 +1,4 @@
+compile
+install-sh
+ltmain.sh
+missing



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

[Bug 61733] lb_mult changes caused by status worker changing a subworker's factor are not propagated to all processes correctly.

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61733

--- Comment #3 from Mark Thomas  ---
That sounds reasonable. That does seem to be consistent with the general
approach which looks to be calculate / update stuff once, put in in shared
memory, have everything that needs to update from shared memory.

-- 
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: r1816043 - in /tomcat/jk/trunk/native: BUILDING.txt configure.ac

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 12:06:41 2017
New Revision: 1816043

URL: http://svn.apache.org/viewvc?rev=1816043=rev
Log:
Remove apache-1.3 references

Modified:
tomcat/jk/trunk/native/BUILDING.txt
tomcat/jk/trunk/native/configure.ac

Modified: tomcat/jk/trunk/native/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/BUILDING.txt?rev=1816043=1816042=1816043=diff
==
--- tomcat/jk/trunk/native/BUILDING.txt (original)
+++ tomcat/jk/trunk/native/BUILDING.txt Wed Nov 22 12:06:41 2017
@@ -44,7 +44,7 @@
 
   The resulting module file mod_jk.so of mod_jk will be
   located in the directory apache-2.0 (for any version
-  of Apache 2.x) respectively apache-1.3 (for Apache 1.3).
+  of Apache 2.x).
 
   Simply copy the file to your web server modules or libexec
   directory.

Modified: tomcat/jk/trunk/native/configure.ac
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1816043=1816042=1816043=diff
==
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Wed Nov 22 12:06:41 2017
@@ -110,27 +110,19 @@ AC_ARG_WITH(apxs,
 
 dnl test apache version
 APA=`${GREP} STANDARD20 ${APXS}`
-if ${TEST} -z "$APA" ; then
-WEBSERVER="apache-1.3"
-APXSCC="`$APXS -q CC`"
-APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK"
-APXSCPPFLAGS=""
-APXSLDFLAGS="`$APXS -q LDFLAGS_SHLIB`"
-else
-WEBSERVER="apache-2.0"
-APRINCLUDEDIR=""
-INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
-for INC in ${INCTEMP}; do
-APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
-done
-AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
-APXSCC="`$APXS -q CC`"
-APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` 
-DHAVE_APR ${APRINCLUDEDIR}"
-APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
-APXSLDFLAGS="`$APXS -q LDFLAGS`"
-APACHE_CONFIG_VARS="`${APXS} -q 
exp_installbuilddir`/config_vars.mk"
-LIBTOOL=`$APXS -q LIBTOOL`
-fi
+WEBSERVER="apache-2.0"
+APRINCLUDEDIR=""
+INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
+for INC in ${INCTEMP}; do
+APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
+done
+AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
+APXSCC="`$APXS -q CC`"
+APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` 
-DHAVE_APR ${APRINCLUDEDIR}"
+APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
+APXSLDFLAGS="`$APXS -q LDFLAGS`"
+APACHE_CONFIG_VARS="`${APXS} -q 
exp_installbuilddir`/config_vars.mk"
+LIBTOOL=`$APXS -q LIBTOOL`
 AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
 if ${TEST} -z "${CC}" ; then
 CC="${APXSCC}"
@@ -705,8 +697,6 @@ dnl automake needs the path it does not
 dnl that why useless Makefiles are build.
 AC_OUTPUT([
 Makefile
-apache-1.3/Makefile
-apache-1.3/Makefile.apxs
 apache-2.0/Makefile
 apache-2.0/Makefile.apxs
 common/Makefile



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

svn commit: r1816042 - /tomcat/jk/trunk/native/build.xml

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 12:06:03 2017
New Revision: 1816042

URL: http://svn.apache.org/viewvc?rev=1816042=rev
Log:
Remove build file that used jkant

Removed:
tomcat/jk/trunk/native/build.xml


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

svn commit: r1816041 - in /tomcat/jk/trunk: native/iis/Makefile.ia64 xdocs/webserver_howto/iis.xml

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 11:44:50 2017
New Revision: 1816041

URL: http://svn.apache.org/viewvc?rev=1816041=rev
Log:
Remove references to building the ISAPI redirector for Itanium

Removed:
tomcat/jk/trunk/native/iis/Makefile.ia64
Modified:
tomcat/jk/trunk/xdocs/webserver_howto/iis.xml

Modified: tomcat/jk/trunk/xdocs/webserver_howto/iis.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/iis.xml?rev=1816041=1816040=1816041=diff
==
--- tomcat/jk/trunk/xdocs/webserver_howto/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/iis.xml Wed Nov 22 11:44:50 2017
@@ -581,17 +581,14 @@ Alternatively the steps for an nmake com
 Issue "nmake -f Makefile.x86" for a 32 Bit build, or
 
 
-Issue "nmake -f Makefile.amd64" for a 64 Bit build, or
-
-
-Issue "nmake -f Makefile.i64" for a Itanium Bit build
+Issue "nmake -f Makefile.amd64" for a 64 Bit build
 
 
 The resulting file isapi_redirect.dll (and the debug symbol file
-isapi_redirect.pdb) is located in the "Release_x86" resp. "Release_amd64"
-resp. "Release_ia64" sub directory. As an intermediate step the build
-first creates a static PCRE library named pcre.lib in the sub directory
-"pcre/Release_x86" resp. "pcre/Release_amd64" resp. "pcre/Release_ia64.
+isapi_redirect.pdb) is located in the "Release_x86" or "Release_amd64"
+sub directory. As an intermediate step the build first creates a static
+PCRE library named pcre.lib in the sub directory "pcre/Release_x86" or
+"pcre/Release_amd64".
 
 
 



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

svn commit: r1816039 - /tomcat/jk/trunk/native/iis/installer/

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 11:38:30 2017
New Revision: 1816039

URL: http://svn.apache.org/viewvc?rev=1816039=rev
Log:
Remove the iis/installer component
Last released 12+ years ago and requires an InstallShield license we do not 
have.

Removed:
tomcat/jk/trunk/native/iis/installer/


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

svn commit: r1816038 - /tomcat/jk/trunk/native/apache-1.3/

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 11:36:45 2017
New Revision: 1816038

URL: http://svn.apache.org/viewvc?rev=1816038=rev
Log:
Remove the apache-1.3 component
httpd 1.3 reached EOL over 12 years ago

Removed:
tomcat/jk/trunk/native/apache-1.3/


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

svn commit: r1816037 - /tomcat/jk/trunk/jkant/

2017-11-22 Thread markt 
Author: markt
Date: Wed Nov 22 11:36:04 2017
New Revision: 1816037

URL: http://svn.apache.org/viewvc?rev=1816037=rev
Log:
Remove the jkant component
The code has been untouched (in any meaningful way) for 14+ years.

Removed:
tomcat/jk/trunk/jkant/


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

Re: [PROPOSAL] Drop some JK components

2017-11-22 Thread Mark Thomas 
On 21/11/17 14:50, Rémy Maucherat wrote:
> On Tue, Nov 21, 2017 at 1:58 PM, Mark Thomas  wrote:
> 
>> All,
>>
>> I've been looking at jk/trunk with a view to rolling a release in the
>> near future. (It has been just over a year since the last release.)
>>
>> As I have been looking through the source, I have noticed a number of
>> components that we still include in the source that I think we
>> can/should remove before the next release. I've listed each of them
>> below along with a short rationale. Feel free to +1 / -1 their removal
>> either individually or as a group.
>>
>> Cheers,
>>
>> Mark
>>
>>
>> jkant - Ant wrapper around various native compilers. Code is untouched
>> (in any meaningful way for 14+ years)
>>
>> native/apache-1.3
>>   - httpd 1.3 reached end of life over 12 years ago
>>
>> native/iis/installer
>>   - InstallShield installer last released over 12 years ago
>> (we don't have a license for InstallShield)
>>
>> native/iis/Makefile.ia64 (and any similar files)
>>   - Itanium support
>>
>> +1

Thanks all. There seems to be general consensus to go ahead so I'll make
these changes shortly. I'll do it one component at a time so should we
ever want to restore one of them, it would be a simple revert.

Mark

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

[Bug 61733] lb_mult changes caused by status worker changing a subworker's factor are not propagated to all processes correctly.

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61733

--- Comment #2 from Jonathan Oddy  ---
I hadn't spotted that, but I don't think it helps. jk_lb_push() only pushes
changes for subworkers where the sequence number has changed. update_worker()
sets the sequence number to -1 for the subworker that had its weight explicitly
changed, however update_mult() affects the other subworkers as well.

I guess an alternative solution would be for update_worker() to set sequence to
-1 for all subworkers if JK_STATUS_NEEDS_UPDATE_MULT?

-- 
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: [Bug 61733] lb_mult changes caused by status worker changing a subworker's factor are not propagated to all processes correctly.

2017-11-22 Thread Mark Thomas 
Hi,

A review from someone who knows the jk code better than I do would be
appreciated.

Does my alternative patch look appropriate? If not, is the OP's patch
appropriate? If neither is appropriate, what might an appropriate patch
look like and I'll see what I can do.

Thanks,

Mark


On 22/11/17 10:56, bugzi...@apache.org wrote:
> https://bz.apache.org/bugzilla/show_bug.cgi?id=61733
> 
> --- Comment #1 from Mark Thomas  ---
> Created attachment 35544
>   --> https://bz.apache.org/bugzilla/attachment.cgi?id=35544=edit
> Possible alternative solution
> 
> Having reviewed the source code it appears that after the lb_factor is changed
> the shared memory is updated before the lb_mult is recalculated. I wonder if
> swapping the order of those actions would be an alternative fix? I have
> attached a possible patch.
> 


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

[Bug 61733] lb_mult changes caused by status worker changing a subworker's factor are not propagated to all processes correctly.

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61733

--- Comment #1 from Mark Thomas  ---
Created attachment 35544
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35544=edit
Possible alternative solution

Having reviewed the source code it appears that after the lb_factor is changed
the shared memory is updated before the lb_mult is recalculated. I wonder if
swapping the order of those actions would be an alternative fix? I have
attached a possible patch.

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

[GitHub] tomcat issue #92: Support null for provider class name when registering a pr...

2017-11-22 Thread lkirchev 
Github user lkirchev commented on the issue:

https://github.com/apache/tomcat/pull/92
  
Will replace it with a new PR.


---

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

[GitHub] tomcat pull request #92: Support null for provider class name when registeri...

2017-11-22 Thread lkirchev 
Github user lkirchev closed the pull request at:

https://github.com/apache/tomcat/pull/92


---

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

[Bug 61795] Make JASPIC callback handler class configurable via a property of the authenticator

2017-11-22 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61795

Lazar Kirchev  changed:

   What|Removed |Added

   Severity|normal  |enhancement

--- Comment #2 from Lazar Kirchev  ---
Thanks Mark! As I want to test only the creation logic, I also prefer b). 

I updated the pull request with tests and added the property to the
documentation.

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