svn commit: r1840783 - /tomcat/trunk/build.xml
Author: isapir Date: Thu Sep 13 07:06:16 2018 New Revision: 1840783 URL: http://svn.apache.org/viewvc?rev=1840783&view=rev Log: Throw descriptive error if Ant is older than minimum required version per BZ 62705 Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1840783&r1=1840782&r2=1840783&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Thu Sep 13 07:06:16 2018 @@ -41,18 +41,20 @@ + + - + - - - - + + + + - + - + @@ -508,6 +510,17 @@ + + + + + + + + + + + @@ -680,7 +693,7 @@ - +
[Bug 62705] tomcat 8.5.33+ requires jdk 9
https://bz.apache.org/bugzilla/show_bug.cgi?id=62705 --- Comment #8 from Igal Sapir --- Descriptive error added in commit r1840783 if running Ant version is older than the minimum required 1.9.8 -- 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: r1840784 - in /tomcat/trunk: build.properties.default build.xml
Author: isapir Date: Thu Sep 13 07:25:26 2018 New Revision: 1840784 URL: http://svn.apache.org/viewvc?rev=1840784&view=rev Log: Simplified required Ant version check per BZ 62705 Modified: tomcat/trunk/build.properties.default tomcat/trunk/build.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1840784&r1=1840783&r2=1840784&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Thu Sep 13 07:25:26 2018 @@ -31,6 +31,7 @@ version.suffix=-dev # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed +ant.version.required=1.9.8 execute.validate=false execute.test.nio=true execute.test.nio2=true Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1840784&r1=1840783&r2=1840784&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Thu Sep 13 07:25:26 2018 @@ -33,6 +33,14 @@ + + + + + + + + @@ -41,8 +49,6 @@ - - @@ -510,17 +516,6 @@ - - - - - - - - - - - @@ -693,7 +688,7 @@ - +
[Bug 62705] tomcat 8.5.33+ requires jdk 9
https://bz.apache.org/bugzilla/show_bug.cgi?id=62705 --- Comment #9 from Igal Sapir --- (In reply to Igal Sapir from comment #8) > Descriptive error added in commit r1840783 if running Ant version is older > than the minimum required 1.9.8 Simplified check in commit r1840784 -- 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: r1840784 - in /tomcat/trunk: build.properties.default build.xml
1. The version of Ant is already available as ${ant.version}. There is
no need to call antversion task explicitly to get it.
See built-in properties in Ant Manual
http://ant.apache.org/manual-1.9.x/properties.html
2. This change can be mentioned in changelog (in subsection "Other").
чт, 13 сент. 2018 г. в 10:25, :
>
> Author: isapir
> Date: Thu Sep 13 07:25:26 2018
> New Revision: 1840784
>
> URL: http://svn.apache.org/viewvc?rev=1840784&view=rev
> Log:
> Simplified required Ant version check per BZ 62705
>
> Modified:
> tomcat/trunk/build.properties.default
> tomcat/trunk/build.xml
>
> Modified: tomcat/trunk/build.properties.default
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1840784&r1=1840783&r2=1840784&view=diff
> ==
> --- tomcat/trunk/build.properties.default (original)
> +++ tomcat/trunk/build.properties.default Thu Sep 13 07:25:26 2018
> @@ -31,6 +31,7 @@ version.suffix=-dev
>
> # - Build control flags -
> # Note enabling validation uses Checkstyle which is LGPL licensed
> +ant.version.required=1.9.8
> execute.validate=false
> execute.test.nio=true
> execute.test.nio2=true
>
> Modified: tomcat/trunk/build.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1840784&r1=1840783&r2=1840784&view=diff
> ==
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Thu Sep 13 07:25:26 2018
> @@ -33,6 +33,14 @@
>
>
>
> +
> +
> +
> +
> +
> +
> +
> +
>
>
>
> @@ -41,8 +49,6 @@
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1840786 - in /tomcat/tc8.5.x/trunk: ./ test/javax/el/TestImportHandlerStandardPackages.java
Author: markt Date: Thu Sep 13 08:21:50 2018 New Revision: 1840786 URL: http://svn.apache.org/viewvc?rev=1840786&view=rev Log: Fix Gump test failure Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/javax/el/TestImportHandlerStandardPackages.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 13 08:21:50 2018 @@ -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 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,
Tomcat 7.0.x?
It has been a while since we had a 7.0.x release. It would be good to get one completed before ApacheCon. Violeta, do you have the time available to do this? If not, I should be able to. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 7.0.x?
Yep I’ll do it I’ll start later today Regards, Violeta On Thu, 13 Sep 2018 at 11:24, Mark Thomas wrote: > It has been a while since we had a 7.0.x release. It would be good to > get one completed before ApacheCon. > > Violeta, do you have the time available to do this? If not, I should be > able to. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 62714] New: 403 access denied connection reset and csrf for new install after creating user
https://bz.apache.org/bugzilla/show_bug.cgi?id=62714 Bug ID: 62714 Summary: 403 access denied connection reset and csrf for new install after creating user Product: Tomcat 9 Version: 9.0.12 Hardware: PC Status: NEW Severity: major Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: myusualnickn...@gmail.com Target Milestone: - Hi, I'm trying to install tomcat to do a quick test of a web app... I installed tomcat on windows 10, gave a username and password... got to the manager-gui page, selected the war file, and immediately the connection was reset... I tried loading it again and got the 403 access denied I installed it with tomcat 8 on ubuntu 8.04 ... same error (I went in and created the user) Perhaps there is something wrong with the openmaint war file... but I surely would expect an error message about that being broken rather than something telling me I am not authorized to view... what I just was authorized to do by creating the user... so if the malfunction is with openmaint, there is a fault in tomcat's documentation or error messages that is just leaving me baffled.. I can't find anything useful online.. and it's happening with two of the latest releases... it makes me think that it is a recent error for some sort of security fix... or the documentation is just very poor. What I need is a step by step list of what to do and a small explanation of why... That has also not been found. -- 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 62714] 403 access denied connection reset and csrf for new install after creating user
https://bz.apache.org/bugzilla/show_bug.cgi?id=62714 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID OS||All --- Comment #1 from Mark Thomas --- Look in the log files. In a default install $CATALINA_BADE/logs/manager.-mm-dd.log will contain the error message and associated stack trace. Tomcat is also sending an appropriate HTTP response (including a helpful error message) to the client. This has been confirmed with Wireshark. That the user agent fails to display it is an issue with the user agent, not with Tomcat. Tomcat's behaviour when you try and reload is also correct. The CSRF protection engages and the appropriate error page is returned to the user agent. If you follow the installation documentation for OpenMaint you won't hit this issue as the OpenMaint installation documentation uses a different deployment method (direct copying on the file system). -- 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: Tomcat 7.0.x?
On 13/09/18 09:54, Violeta Georgieva wrote: > Yep I’ll do it > I’ll start later today Great. I've just checked the new issue in BZ and that was invalid so I don't have anything I want to commit before you tag. Mark > > Regards, > Violeta > > On Thu, 13 Sep 2018 at 11:24, Mark Thomas wrote: > >> It has been a while since we had a 7.0.x release. It would be good to >> get one completed before ApacheCon. >> >> Violeta, do you have the time available to do this? If not, I should be >> able to. >> >> Mark >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 7.0.x?
На чт, 13.09.2018 г. в 12:35 ч. Mark Thomas написа: > > On 13/09/18 09:54, Violeta Georgieva wrote: > > Yep I’ll do it > > I’ll start later today > > Great. > > I've just checked the new issue in BZ and that was invalid so I don't > have anything I want to commit before you tag. Thanks Violeta
svn commit: r1840812 - in /tomcat/trunk: java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml
Author: markt
Date: Thu Sep 13 13:26:54 2018
New Revision: 1840812
URL: http://svn.apache.org/viewvc?rev=1840812&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61692
Add the ability to control which HTTP methods are handled by the CGI Servlet
via a new initialization parameter cgiMethods.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/webapps/docs/cgi-howto.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1840812&r1=1840811&r2=1840812&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu Sep 13
13:26:54 2018
@@ -29,10 +29,12 @@ import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Date;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
import java.util.regex.Pattern;
@@ -242,6 +244,14 @@ public final class CGIServlet extends Ht
private static final long serialVersionUID = 1L;
+private static final Set DEFAULT_SUPER_METHODS = new HashSet<>();
+static {
+DEFAULT_SUPER_METHODS.add("HEAD");
+DEFAULT_SUPER_METHODS.add("OPTIONS");
+DEFAULT_SUPER_METHODS.add("TRACE");
+}
+
+
/**
* The CGI search path will start at
*webAppRootDir + File.separator + cgiPathPrefix
@@ -260,6 +270,11 @@ public final class CGIServlet extends Ht
private String parameterEncoding =
System.getProperty("file.encoding", "UTF-8");
+/* The HTTP methods this Servlet will pass to the CGI script */
+private Set cgiMethods = new HashSet<>();
+private boolean cgiMethodsAll = false;
+
+
/**
* The time (in milliseconds) to wait for the reading of stderr to complete
* before terminating the CGI process.
@@ -364,6 +379,23 @@ public final class CGIServlet extends Ht
enableCmdLineArguments =
Boolean.parseBoolean(config.getInitParameter("enableCmdLineArguments"));
}
+
+if (getServletConfig().getInitParameter("cgiMethods") != null) {
+String paramValue =
getServletConfig().getInitParameter("cgiMethods");
+paramValue.trim();
+if ("*".equals(paramValue)) {
+cgiMethodsAll = true;
+} else {
+String[] methods = paramValue.split(",");
+for (String method : methods) {
+String trimmedMethod = method.trim();
+cgiMethods.add(trimmedMethod);
+}
+}
+} else {
+cgiMethods.add("GET");
+cgiMethods.add("POST");
+}
}
@@ -497,20 +529,21 @@ public final class CGIServlet extends Ht
}
-/**
- * Provides CGI Gateway service -- delegates to
- * {@link #doGet(HttpServletRequest, HttpServletResponse)}.
- *
- * @param req HttpServletRequest passed in by servlet container
- * @param res HttpServletResponse passed in by servlet container
- *
- * @exception ServletException if a servlet-specific exception occurs
- * @exception IOException if a read/write exception occurs
- */
@Override
-protected void doPost(HttpServletRequest req, HttpServletResponse res)
-throws IOException, ServletException {
-doGet(req, res);
+protected void service(HttpServletRequest req, HttpServletResponse res)
+throws ServletException, IOException {
+
+String method = req.getMethod();
+if (cgiMethodsAll || cgiMethods.contains(method)) {
+doGet(req, res);
+} else if (DEFAULT_SUPER_METHODS.contains(method)){
+// If the CGI servlet is explicitly configured to handle one of
+// these methods it will be handled in the previous condition
+super.service(req, res);
+} else {
+// Unsupported method
+res.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+}
}
Modified: tomcat/trunk/webapps/docs/cgi-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cgi-howto.xml?rev=1840812&r1=1840811&r2=1840812&view=diff
==
--- tomcat/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cgi-howto.xml Thu Sep 13 13:26:54 2018
@@ -91,6 +91,12 @@ file affects all web applications. See
There are several servlet init parameters which can be used to
configure the behaviour of the CGI servlet.
svn commit: r1840813 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml
Author: markt Date: Thu Sep 13 13:27:45 2018 New Revision: 1840813 URL: http://svn.apache.org/viewvc?rev=1840813&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61692 Add the ability to control which HTTP methods are handled by the CGI Servlet via a new initialization parameter cgiMethods. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/tc8.5.x/trunk/webapps/docs/cgi-howto.xml tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 13 13:27:45 2018 @@ -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 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,176
svn commit: r1840816 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml
Author: markt Date: Thu Sep 13 13:32:20 2018 New Revision: 1840816 URL: http://svn.apache.org/viewvc?rev=1840816&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61692 Add the ability to control which HTTP methods are handled by the CGI Servlet via a new initialization parameter cgiMethods. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/tc7.0.x/trunk/webapps/docs/cgi-howto.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 13 13:32:20 2018 @@ -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,1
svn commit: r1840817 - /tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Author: markt
Date: Thu Sep 13 13:44:17 2018
New Revision: 1840817
URL: http://svn.apache.org/viewvc?rev=1840817&view=rev
Log:
Improve handling of OPTIONS request
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1840817&r1=1840816&r2=1840817&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu Sep 13
13:44:17 2018
@@ -588,6 +588,29 @@ public final class CGIServlet extends Ht
}
+@Override
+protected void doOptions(HttpServletRequest req, HttpServletResponse res)
+throws ServletException, IOException {
+// Note: This method will never be called if cgiMethods is "*" so that
+// case does nto need to be handled here.
+Set allowedMethods = new HashSet<>();
+allowedMethods.addAll(cgiMethods);
+allowedMethods.addAll(CGIServlet.DEFAULT_SUPER_METHODS);
+
+StringBuilder headerValue = new StringBuilder();
+
+for (String method : allowedMethods) {
+headerValue.append(method);
+headerValue.append(',');
+}
+
+// Remove trailing comma
+headerValue.deleteCharAt(headerValue.length() - 1);
+
+res.setHeader("allow", headerValue.toString());
+}
+
+
/**
* Behaviour depends on the status code.
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1840818 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/servlets/CGIServlet.java
Author: markt Date: Thu Sep 13 13:44:46 2018 New Revision: 1840818 URL: http://svn.apache.org/viewvc?rev=1840818&view=rev Log: Improve handling of OPTIONS request Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 13 13:44:46 2018 @@ -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 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,17636
svn commit: r1840819 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/servlets/CGIServlet.java
Author: markt Date: Thu Sep 13 13:45:04 2018 New Revision: 1840819 URL: http://svn.apache.org/viewvc?rev=1840819&view=rev Log: Improve handling of OPTIONS request Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 13 13:45:04 2018 @@ -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,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,1826830,1826874-1826875,182
[Bug 61692] CGIServlet should handle additional HTTP methods, for example MKCALENDAR, MKCOL, PROPFIND, PROPPATCH
https://bz.apache.org/bugzilla/show_bug.cgi?id=61692 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #10 from Mark Thomas --- I hadn't forgotten about this. I just hadn't found the time to come back to it and implement it. Fixed in: - trunk for 9.0.13 onwards - 8.5.x for 8.5.35 onwards - 7.0.x for 7.0.91 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
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1179 Buildbot URL: https://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] 1840819 Blamelist: markt BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62685] Changes to hostname parsing in HttpParser breaks hostname with trailing dot
https://bz.apache.org/bugzilla/show_bug.cgi?id=62685 --- Comment #4 from AG --- Very much appreciate for the quick resolution. Will test it again once the new releases are out. -- 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: r1840784 - in /tomcat/trunk: build.properties.default build.xml
On 9/13/2018 12:54 AM, Konstantin Kolinko wrote:
1. The version of Ant is already available as ${ant.version}. There is
no need to call antversion task explicitly to get it.
See built-in properties in Ant Manual
http://ant.apache.org/manual-1.9.x/properties.html
2. This change can be mentioned in changelog (in subsection "Other").
Sure, I'll correct that.
Best,
Igal
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1840845 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Author: markt
Date: Thu Sep 13 18:00:44 2018
New Revision: 1840845
URL: http://svn.apache.org/viewvc?rev=1840845&view=rev
Log:
Java 6
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1840845&r1=1840844&r2=1840845&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu
Sep 13 18:00:44 2018
@@ -618,7 +618,7 @@ public final class CGIServlet extends Ht
throws ServletException, IOException {
// Note: This method will never be called if cgiMethods is "*" so that
// case does nto need to be handled here.
-Set allowedMethods = new HashSet<>();
+Set allowedMethods = new HashSet();
allowedMethods.addAll(cgiMethods);
allowedMethods.addAll(CGIServlet.DEFAULT_SUPER_METHODS);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1840845 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Mark На чт, 13.09.2018 г. в 21:00 ч. написа: > > Author: markt > Date: Thu Sep 13 18:00:44 2018 > New Revision: 1840845 > > URL: http://svn.apache.org/viewvc?rev=1840845&view=rev > Log: > Java 6 > > Modified: > tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java I just wanted to fix that and you did it ;)
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1180 Buildbot URL: https://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] 1840845 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: r1840851 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml
Author: isapir Date: Thu Sep 13 19:07:22 2018 New Revision: 1840851 URL: http://svn.apache.org/viewvc?rev=1840851&view=rev Log: Improved fail fast error message when Ant required version is not installed Modified: tomcat/trunk/build.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1840851&r1=1840850&r2=1840851&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Thu Sep 13 19:07:22 2018 @@ -34,8 +34,7 @@ - - + Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1840851&r1=1840850&r2=1840851&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Sep 13 19:07:22 2018 @@ -41,7 +41,7 @@ There is no ordering by add/update/fix/scode. Other fixed issues are added to the end of the list, chronologically. - They eventually become mixed with the numbered issues. (I.e., numbered + They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> @@ -99,6 +99,12 @@ (2018-09-12) to pick up some bug fixes and enhancements. (markt) + + +62705: Added a fail fast check for minimum required Apache +Ant version 1.9.8 when building Tomcat. (isapir) + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1840853 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_91: ./ build.properties.default
Author: violetagg Date: Thu Sep 13 19:19:39 2018 New Revision: 1840853 URL: http://svn.apache.org/viewvc?rev=1840853&view=rev Log: Tag 7.0.91 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_91/ (props changed) - copied from r1840851, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_91/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_91/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_91/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_91/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Sep 13 19:19:39 2018 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_91/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_91/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_91/ -- --- svn:ignore (added) +++ svn:ignore Thu Sep 13 19:19:39 2018 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_91/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Sep 13 19:19:39 2018 @@ -0,0 +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,17
svn commit: r29368 [1/2] - in /dev/tomcat/tomcat-7/v7.0.91: ./ bin/ bin/embed/ bin/extras/ src/
Author: violetagg Date: Thu Sep 13 20:17:35 2018 New Revision: 29368 Log: Stage Tomcat 7.0.91 Added: dev/tomcat/tomcat-7/v7.0.91/ dev/tomcat/tomcat-7/v7.0.91/KEYS dev/tomcat/tomcat-7/v7.0.91/README.html dev/tomcat/tomcat-7/v7.0.91/RELEASE-NOTES dev/tomcat/tomcat-7/v7.0.91/bin/ dev/tomcat/tomcat-7/v7.0.91/bin/README.html dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-deployer.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-deployer.tar.gz.asc dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-deployer.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-deployer.zip (with props) dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-deployer.zip.asc dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-deployer.zip.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-fulldocs.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-fulldocs.tar.gz.asc dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-windows-x64.zip (with props) dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-windows-x64.zip.asc dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-windows-x64.zip.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-windows-x86.zip (with props) dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-windows-x86.zip.asc dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91-windows-x86.zip.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.exe (with props) dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.exe.asc dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.exe.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.tar.gz.asc dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.zip (with props) dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.zip.asc dev/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.zip.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/embed/ dev/tomcat/tomcat-7/v7.0.91/bin/embed/apache-tomcat-7.0.91-embed.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.91/bin/embed/apache-tomcat-7.0.91-embed.tar.gz.asc dev/tomcat/tomcat-7/v7.0.91/bin/embed/apache-tomcat-7.0.91-embed.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/embed/apache-tomcat-7.0.91-embed.zip (with props) dev/tomcat/tomcat-7/v7.0.91/bin/embed/apache-tomcat-7.0.91-embed.zip.asc dev/tomcat/tomcat-7/v7.0.91/bin/embed/apache-tomcat-7.0.91-embed.zip.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/extras/ dev/tomcat/tomcat-7/v7.0.91/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-7/v7.0.91/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-7/v7.0.91/bin/extras/catalina-jmx-remote.jar.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-7/v7.0.91/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-7/v7.0.91/bin/extras/catalina-ws.jar.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli-adapters.jar (with props) dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli-adapters.jar.asc dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli-adapters.jar.sha512 dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar (with props) dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar.asc dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar.sha512 dev/tomcat/tomcat-7/v7.0.91/src/ dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz.asc dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.zip (with props) dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.zip.asc dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.zip.sha512 Added: dev/tomcat/tomcat-7/v7.0.91/KEYS == --- dev/tomcat/tomcat-7/v7.0.91/KEYS (added) +++ dev/tomcat/tomcat-7/v7.0.91/KEYS Thu Sep 13 20:17:35 2018 @@ -0,0 +1,650 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +Type Bits/KeyIDDate User ID +pub 2048/F22C4FED 2001/07/02 Andy Armstrong + +-BEGIN PGP PUBLIC KEY BLOCK-
svn commit: r29368 [2/2] - in /dev/tomcat/tomcat-7/v7.0.91: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli-adapters.jar.sha512 == --- dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli-adapters.jar.sha512 (added) +++ dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli-adapters.jar.sha512 Thu Sep 13 20:17:35 2018 @@ -0,0 +1 @@ +39910d9ff331524462d7f9636aad825d926825edf86dd807f2dd9b75a85670cac64b8ca259119b5a7c3196ca15af338d3c7b8eff101a0a9c2ce616b3ffba9457 *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar.asc == --- dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar.asc Thu Sep 13 20:17:35 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAluawCgACgkQIIsKsdYw +Ecf3nw/5ATGZiNxhK62SWFuf4/s9jaAGNL7Uq0cWKQ0W5Xi7MRtRNU34zPWiyRnM +YQR/nrF6w4HcQxH4rMoRsCQsZ01o1C1kBnApzGIMkCu/QAflolGl2Od1lkZV3VoA +V1sHDsbpw5+tUt09wqfxt45TG03P2pR0n8COmybQxDpWabQfd6IGXQQTqTXpudgb +PG14oUlDI0gIXBq5O+e/3dW29l7kcoLE4M5GnN9BGT/KTOvMBQ5gvDx6MwIfUTFW +knxArvmR7tUswZj0ce3sAnmY15DKbPRJ0nFbbPWtUqcaguXBGKnEm3GrAqHz+8ym +l0TnL6T2LW+XpfERfcB1dMfER0a5aVE4iPEfN9fX2CVdV1YzG7IHOH5jbpFlV06a +3CijLBQBWSfKCdz7acT5EHOVJ85DAjnGsYHsLZShhPEEtRvtW3rPsBz6PofokZoy +d9jGQMhUgXh2J/M/guvGiztGVjGYl4fY9FVy35Hgnje5SCLV45aCSx9ZEy6AFjHn +ymUEM2YUdnKDt0VSqegsZCpbrNOdmi9ddNOJ/rh4Y49HUuX1umiFDUudVQWlp81a +GUk0bfVtjHI1pxbVP4HxOx6tz6cSzYBQipmkiqhAkK30Irv7zuPMypAx7c/mXzit +uUE4HLUWJktfa8QdrUHYalxW09jRcgOhgLZVsgWTbF00UuIV6d0= +=mxCY +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar.sha512 == --- dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar.sha512 (added) +++ dev/tomcat/tomcat-7/v7.0.91/bin/extras/tomcat-juli.jar.sha512 Thu Sep 13 20:17:35 2018 @@ -0,0 +1 @@ +7bcfdbb6d0f8baaa1762d41542cc9208c4e9b1bae8506d50e62e1e4bc3cd996eb1847482acd4ab6a57f0e81483a73d1eb4ace100743b94df6fb80064700e4735 *tomcat-juli.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz.asc == --- dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz.asc Thu Sep 13 20:17:35 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAluawWEACgkQIIsKsdYw +EccuvRAAlLdJITEQ8kae1FbXoQ4hgheEGLUQ/fmCFfDAc+c4SOJi3CCSCzdwz/01 +5BGTT2xzACDsO8hS6PjZvJKfQ7RgEJLoDWRJ2VJFjUlGmggDkz7hQ3Ba8i49cKqH +UJ/RAYR/YNz3RZJk7RmynJV3rleR46bgXLOBg3Geppsew5ScKorgk9tI8zBdvGsL +NpJB3diyMmCW1z0Gj0TDsc4juXQF4djebfGjSbHfm/0irGmck59xMTe5NxvK4clL +Dq7+L8ofvVwr2LAm3YjG9QjvQfJ9do9KzZgnBbTskknUP4Ebb07J99gESQPTkH7r +ttjAVLlaV+JtuiThFqjY1TiUQBfvcc7CsDj2AuNcFsWRmXs/a/RToS/qcB9uYWJ2 +Jlqh37BmU2vJhycdrgPTr7dhtwEJxYQeW00FWvgMDZt/17Q6Z9tLagXAF6FOG8e/ ++M10LlPGHEBneUjG3GwnAjvL6XzkyXtlXUbpea7P5+f6DPLL54tfFmHsFLMz4JN0 +xSv8DOFbxGzkGMl1VIMhqGicGDDaOlrWTSr4hiJZy0X6A2jiqQX5BSF67ulKfLPf +Ybq5mfg8W0XQDMVhMmYAMNIjDALXkHCRq3E2vOzIBauGbIavBmFMCtUxs0/PzQUf +AG1HePpvheInxzEB3e5RLQz3BOs/rsNKY8/xPSFRIhTdjaE4VNA= +=hco5 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz.sha512 == --- dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz.sha512 (added) +++ dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.tar.gz.sha512 Thu Sep 13 20:17:35 2018 @@ -0,0 +1 @@ +c693e39e5fc51c6478e27d21a1bc422fd7d8e1721f5013413eb9fa4098c970b2ef27f67d111d71af25dcf9492140388b19285a584641c979a83a493790c2e6f6 *apache-tomcat-7.0.91-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.91/src/apache-tomcat-7.0.91-src.zip --
[VOTE] Release Apache Tomcat 7.0.91
The proposed Apache Tomcat 7.0.91 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.91/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1195/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_91/ The proposed 7.0.91 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.91 Stable Regards, Violeta
svn commit: r1840865 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: violetagg Date: Thu Sep 13 20:33:12 2018 New Revision: 1840865 URL: http://svn.apache.org/viewvc?rev=1840865&view=rev Log: Increment version for next dev cycle Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1840865&r1=1840864&r2=1840865&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Thu Sep 13 20:33:12 2018 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=91 +version.build=92 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1840865&r1=1840864&r2=1840865&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Thu Sep 13 20:33:12 2018 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.91 +maven.asf.release.deploy.version=7.0.92 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1840865&r1=1840864&r2=1840865&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 13 20:33:12 2018 @@ -57,6 +57,8 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 44 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180914/bin/openssl -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-jni
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 6 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 36 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180914/bin/openssl -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/work
