Re: Tomcat source layout (was: JDK 11 EA 18)
Le 26/06/2018 à 05:21, William L. Thomson Jr. a écrit : > Because I am crazy :) I personally would support a move to a Maven directory layout even if we stick to Ant as the main build system for now. I think it's good to use a standard project layout, it looks immediately familiar to newcomers. That said, I don't really understand why you can't use Ant to build Tomcat in Gentoo. Ant is rather reasonably easy to bootstrap and we have no problem using it to build Tomcat from sources in Debian/Ubuntu. Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r27735 - /dev/tomcat/tomcat-8/v8.5.32/ /dev/tomcat/tomcat-9/v9.0.10/ /release/tomcat/tomcat-8/v8.5.32/ /release/tomcat/tomcat-9/v9.0.10/
Author: markt Date: Tue Jun 26 08:46:27 2018 New Revision: 27735 Log: Release 9.0.10 and 8.5.32 Added: release/tomcat/tomcat-8/v8.5.32/ - copied from r27734, dev/tomcat/tomcat-8/v8.5.32/ release/tomcat/tomcat-9/v9.0.10/ - copied from r27734, dev/tomcat/tomcat-9/v9.0.10/ Removed: dev/tomcat/tomcat-8/v8.5.32/ dev/tomcat/tomcat-9/v9.0.10/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1834411 - in /tomcat/trunk: java/org/apache/catalina/realm/LockOutRealm.java java/org/apache/catalina/realm/mbeans-descriptors.xml webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 26 10:12:38 2018
New Revision: 1834411
URL: http://svn.apache.org/viewvc?rev=1834411&view=rev
Log:
Make the isLocked() method of the LockOutRealm public and expose the method via
JMX.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java?rev=1834411&r1=1834410&r2=1834411&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java Tue Jun 26
10:12:38 2018
@@ -241,7 +241,7 @@ public class LockOutRealm extends Combin
* a login attempt, then the last access time will be recorded and any
* attempt to authenticated a locked user will log a warning.
*/
-private boolean isLocked(String username) {
+public boolean isLocked(String username) {
LockRecord lockRecord = null;
synchronized (this) {
lockRecord = failedUsers.get(username);
Modified: tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml?rev=1834411&r1=1834410&r2=1834411&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml Tue Jun
26 10:12:38 2018
@@ -519,6 +519,15 @@
type="org.apache.catalina.Realm"/>
+
+
+
+
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1834411&r1=1834410&r2=1834411&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 26 10:12:38 2018
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Make the isLocked() method of the
LockOutRealm
+public and expose the method via JMX. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
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/3398 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] 1834411 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 62453] Tomcat tries to resolve uninitialized tag attributes in EL as java class names and this behavior causes performance problems.
https://bz.apache.org/bugzilla/show_bug.cgi?id=62453 Mark Thomas changed: What|Removed |Added Attachment #35975|0 |1 is obsolete|| --- Comment #8 from Mark Thomas --- Created attachment 35990 --> https://bz.apache.org/bugzilla/attachment.cgi?id=35990&action=edit Updated patch with test cases to check class lists Given the general approach of Java EE (which I assume will continue in Jakarta EE) to backwards compatibility, I don't think the behaviour required by the specification is going to change. The performance implications of adding imports to EL were not realised at the time. They are now part of the spec and, for the same reason as above, I don't think that will change. Using a non-specification compliant work-around is an option. The work-around proposed looks reasonable to me. However, experience tells me that it is hard to judge what proportion of users would benefit from it vs would see failures with it. Clearly, it would be optional. The question would be whether to enable it by default or not. One of the benefits of the Java 9 module system is that it is possible to enumerate all the classes in java.lang. I have attached an updated test case that does this and also checks the Servlet/JSP spec classes too. The patch is undoubtedly a hack but with the test cases ongoing maintenance is minimal and users are saved the hassle of having to go through their code and add explicit scopes everywhere. Unless there are objections, I plan to commit this to trunk. -- 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 62459] mod_jk: Forwarding URLs containing escaped slashes (e.g. for REST services) fail with syntactical-wrong double-escaping
https://bz.apache.org/bugzilla/show_bug.cgi?id=62459
--- Comment #1 from Guido Jäkel ---
I think the issue have to be handled within native/common/jk_url.c , L.116ff.
at function jk_canonenc().
Here, the percent sign isn't in "allowed", therefore it will be escaped.
But concerning the issue, the incoming string have the sequence '%2F', which
MUST NOT be not re-encoded. I'm not sure to claim that ANY legal '%hh' MUST NOT
be re-encoded at this point. Maybe this will be more the truth if one take care
of the actual semantic position inside the URL pattern.
If I'm able to get spare time, i'll try to propose a patch.
/*
* Convert a URL-encoded string to canonical form.
* It encodes those which must be encoded, and does not touch
* those which must not be touched.
* String x must be '\0'-terminated.
* String y must be pre-allocated with len maxlen
* (including the terminating '\0').
*/
int jk_canonenc(const char *x, char *y, int maxlen)
{
int i, j;
int ch = x[0];
char *allowed; /* characters which should not be encoded */
char *reserved; /* characters which much not be en/de-coded */
/*
* N.B. in addition to :@&=, this allows ';' in an http path
* and '?' in an ftp path -- this may be revised
*/
allowed = "~$-_.+!*'(),;:@&=";
reserved = "/";
for (i = 0, j = 0; ch != '\0' && j < maxlen; i++, j++, ch=x[i]) {
/* always handle '/' first */
if (strchr(reserved, ch)) {
y[j] = ch;
continue;
}
/* recode it, if necessary */
if (!jk_isalnum(ch) && !strchr(allowed, ch)) {
if (j+2
Re: Tomcat source layout (was: JDK 11 EA 18)
On Tue, 26 Jun 2018 09:07:32 +0200 Emmanuel Bourg wrote: > Le 26/06/2018 à 05:21, William L. Thomson Jr. a écrit : > > > Because I am crazy :) > > I personally would support a move to a Maven directory layout even if > we stick to Ant as the main build system for now. I think it's good > to use a standard project layout, it looks immediately familiar to > newcomers. That is the idea, just to standardize stuff. Not switch build systems. > That said, I don't really understand why you can't use Ant to build > Tomcat in Gentoo. Ant is rather reasonably easy to bootstrap and we > have no problem using it to build Tomcat from sources in > Debian/Ubuntu. The problem with Ant and Gentoo has nothing to do with Tomcat really. Tomcat has built fine for years via Ant on Gentoo and still does. But it is the Gentoo specific Ant eclass, bash functions library. Plus packaging and dealing with Ant Tasks. That is a bit cumbersome to maintain. All around dealing with Ant is more work. I rather avoid. Presently Gentoo is stuck on <= 1.8 till ant eclass and others are updated, and other things. The ant eclass also requires complicated XML re-writers in python to modify classpath, source/target and now release in build.xml. Which adds more overhead, complexity, and things to maintain. For some things like Netbeans and other projects it failed to re-write all source/targets. I tossed these rather than maintain, to complex, there are better ways. https://github.com/gentoo/gentoo/blob/master/eclass/java-ant-2.eclass https://github.com/gentoo/gentoo/blob/master/eclass/ant-tasks.eclass I am using a more simplistic method of straight javac using a Gentoo bash eclass. That looks for stuff in standard locations. Reason for my request to change Tomcat directory layout. Most the logic is here https://github.com/Obsidian-StudiosInc/os-xtoo/blob/master/eclass/java-pkg-simple.eclass Plus legacy eclass till I re-write, it is already heavily modified. https://github.com/Obsidian-StudiosInc/os-xtoo/blob/master/eclass/java-utils-2.eclass My way does not require build.xml modifications, or anything there. I can ensure always source/target/release, as I am doing the compile directly. No worries on classpath pollution, accidentally using shipped jars, or other. Which for ant at times required symlinks to system jars in build system and other cumbersome stuff. Dealing with Ant is a lot of work and things to maintain. For example for tomcat-serlvet-api, always used a stand alone build.xml, separate from one tomcat ships with. Since there is no means to build only those jars easily. Without heavy modifications to default build.xml. Thus creating a standalone build.xml, more to maintain. https://github.com/gentoo/gentoo/tree/master/dev-java/tomcat-servlet-api/files Then to prevent downloads, and other things not needed in the default build.xml. You need to modify build.xml and usually create a patch. Which is also cumbersome to deal with, more to maintain. https://github.com/gentoo/gentoo/tree/master/www-servers/tomcat/files My way requires no patches, guaranteed source/target/release, classpath, etc. All in a more reliable and simple way that requires less effort to maintain over a long term. Across hundreds of packages, maintained by a single person :) -- William L. Thomson Jr. pgpmBIIIwsIWp.pgp Description: OpenPGP digital signature
[Bug 53387] SSI: Allow to use $1 to get result of regular expression matching
https://bz.apache.org/bugzilla/show_bug.cgi?id=53387 --- Comment #2 from Mark Thomas --- I've tested httpd and the behaviour is as follows: Before any matches are attempted, $1 and friends are set to the empty string After a successful match, $1 and friends remember the contents of the group until the next match is attempted (not is successful) After an unsuccessful match, $1 and friends are set to the empty string At first glance, this looks fairly easy to implement. -- 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
Tag Tomcat 7/8.0
Hi, I'm planning to tag Tomcat 7/8.0 tomorrow. If you want to include something please reply here. Please note that this will be the last Tomcat 8.0 release. Regards, Violeta
Slides for ApacheCon EU Roadshow 2018
Hi All, I have check the presentation page[1] but could only find slide of Mark's "State of the Cat" topic. Do we have slides/recordings for the other topics? [1] http://tomcat.apache.org/presentations.html -- Best Regards！ Huxing - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
