[GitHub] [tomcat] euske opened a new pull request #217: Made some variable names more consistent with the other parts.

2019-10-21 Thread GitBox
euske opened a new pull request #217: Made some variable names more consistent 
with the other parts.
URL: https://github.com/apache/tomcat/pull/217
 
 
   Hello, we're developing an automated system that detects inconsistent 
variable names in a large software project. Our system checks if each variable 
name is consistent with other variables in the project in its usage pattern, 
and proposes correct candidates if inconsistency is detected. This is a part of 
academic research that we hope to publish soon, but as a part of the 
evaluation, we applied our systems to your projects and got a few interesting 
results. We carefully reviewed our system output and manually created a patch 
to correct a few variable names. We would be delighted if this patch is found 
to be useful. If you have a question or suggestion regarding this patch, we'd 
happily answer. Thank you.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[tomcat] branch master updated: Update Korean translations

2019-10-21 Thread woonsan
This is an automated email from the ASF dual-hosted git repository.

woonsan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new d252ad8  Update Korean translations
d252ad8 is described below

commit d252ad857e1046c322a1087adb90320fc0380420
Author: Woonsan Ko 
AuthorDate: Mon Oct 21 20:05:57 2019 +0900

Update Korean translations
---
 java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
index d2c02eb..c24992f 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
@@ -14,6 +14,8 @@
 # limitations under the License.
 
 jre9Compat.invalidModuleUri=[{0}](으)로 제공된 모듈 URI는 JarScanner가 처리할 수 있는 URL로 
변환될 수 없습니다.
+jre9Compat.javaPre9=Java 9 클래스가 발견되지 않습니다. Java 9 이전 버전에서 동작하고 있는 것으로 보입니다.
+jre9Compat.unexpected=Java 9 클래스들과 메소드들을 참조할 수 없습니다.
 
 jreCompat.noApplicationProtocol=자바 런타임이 SSLEngine.getApplicationProtocol()을 
지원하지 않습니다. 이 기능을 사용하려면 Java 9를 사용해야 합니다.
 jreCompat.noApplicationProtocols=자바 런타임이 
SSLParameters.setApplicationProtocols()을 지원하지 않습니다. 이 기능을 사용하려면 Java 9를 사용해야 
합니다.


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



Re: JDK 14 - Early Access build 19 is available

2019-10-21 Thread Mark Thomas
On 20/10/2019 08:10, Rory O'Donnell wrote:
> Hi Mark,
> 
> *OpenJDK builds  - JDK 14 *- Early Access build 19 is available at
> http://jdk.java.net/14/

Tomcat 9.0.x builds without issue and then passes a simple smoke test.

Tomcat 9.0.x unit tests also all pass (on Linux)

So, all looks good. No issues.

Tx,

Mark

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



[Bug 63828] Allow WebdavServlet to serve only a subset of a WebResourceRoot

2019-10-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63828

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #3 from Mark Thomas  ---
The way the WebDAV servlet is implemented, it just isn't designed to serve
arbitrary locations within the web app at arbitrary paths. Refactoring that
would be a lot of work.

Taking the use case here you want /WEB-INF/diforms to be accessible via WebDAV
at /diforms (and any similar example) then I would suggest the following
approach:

Use security constraints to limit WebDAV methods to the target URL:

  
Block WebDAV

  All
  /*
  GET
  POST
  OPTIONS


  

  
Allow WebDAV

  Diforms
  /diforms/*

  



Use Resources to map the required resources to the desired target URL:


  

  



I am resolving this as WORKSFORME on the basis that I believe the configuration
approach above solves the general problem. If not, the users@ list is probably
the best place to continue the discussion as it is likely that a configuration
solution will exists even if the one above is insufficient.

-- 
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 63828] Allow WebdavServlet to serve only a subset of a WebResourceRoot

2019-10-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63828

--- Comment #4 from Michael Osipov  ---
(In reply to Mark Thomas from comment #3)
> The way the WebDAV servlet is implemented, it just isn't designed to serve
> arbitrary locations within the web app at arbitrary paths. Refactoring that
> would be a lot of work.
> 
> Taking the use case here you want /WEB-INF/diforms to be accessible via
> WebDAV at /diforms (and any similar example) then I would suggest the
> following approach:
> 
> Use security constraints to limit WebDAV methods to the target URL:
> 
>   
> Block WebDAV
> 
>   All
>   /*
>   GET
>   POST
>   OPTIONS
> 
> 
>   
> 
>   
> Allow WebDAV
> 
>   Diforms
>   /diforms/*
> 
>   
> 
> 
> 
> Use Resources to map the required resources to the desired target URL:
> 
> 
>   
>  className="org.apache.catalina.webresources.DirResourceSet"
> base="${catalina.base}/webapps/ROOT/WEB-INF/diforms"
> webAppMount="/diforms" />
>   
> 
> 
> 
> I am resolving this as WORKSFORME on the basis that I believe the
> configuration approach above solves the general problem. If not, the users@
> list is probably the best place to continue the discussion as it is likely
> that a configuration solution will exists even if the one above is
> insufficient.

I accept this as one possible workaround, but don't see have the WebDAV servlet
will serve this path only. It simply can. It will also serve the entire
context. But it is good that you documented that the servlet has never been
designed for that.

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



[tomcat] branch master updated: Made some variable names more consistent with the other parts.

2019-10-21 Thread schultz
This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new fc5ddda  Made some variable names more consistent with the other parts.
 new 386da63  Merge pull request #217 from euske/master
fc5ddda is described below

commit fc5dddae560209200d02b59926a7f109dc1199df
Author: Yusuke Shinyama 
AuthorDate: Mon Oct 21 17:35:02 2019 +0900

Made some variable names more consistent with the other parts.
---
 java/javax/servlet/GenericServlet.java   |  6 +++---
 .../org/apache/catalina/filters/AddDefaultCharsetFilter.java | 12 ++--
 java/org/apache/jasper/JspCompilationContext.java|  7 +++
 java/org/apache/jasper/compiler/Generator.java   |  4 ++--
 java/org/apache/tomcat/util/buf/CharChunk.java   |  4 ++--
 .../apache/tomcat/util/security/ConcurrentMessageDigest.java |  6 +++---
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/java/javax/servlet/GenericServlet.java 
b/java/javax/servlet/GenericServlet.java
index f040cb7..da70a61 100644
--- a/java/javax/servlet/GenericServlet.java
+++ b/java/javax/servlet/GenericServlet.java
@@ -180,12 +180,12 @@ public abstract class GenericServlet implements Servlet, 
ServletConfig,
  * Writes the specified message to a servlet log file, prepended by the
  * servlet's name. See {@link ServletContext#log(String)}.
  *
- * @param msg
+ * @param message
  *a String specifying the message to be written to
  *the log file
  */
-public void log(String msg) {
-getServletContext().log(getServletName() + ": " + msg);
+public void log(String message) {
+getServletContext().log(getServletName() + ": " + message);
 }
 
 /**
diff --git a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
index b146764..98adb4f 100644
--- a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
+++ b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
@@ -106,17 +106,17 @@ public class AddDefaultCharsetFilter extends FilterBase {
 }
 
 @Override
-public void setContentType(String ct) {
+public void setContentType(String contentType) {
 
-if (ct != null && ct.startsWith("text/")) {
-if (!ct.contains("charset=")) {
-super.setContentType(ct + ";charset=" + encoding);
+if (contentType != null && contentType.startsWith("text/")) {
+if (!contentType.contains("charset=")) {
+super.setContentType(contentType + ";charset=" + encoding);
 } else {
-super.setContentType(ct);
+super.setContentType(contentType);
 encoding = getCharacterEncoding();
 }
 } else {
-super.setContentType(ct);
+super.setContentType(contentType);
 }
 
 }
diff --git a/java/org/apache/jasper/JspCompilationContext.java 
b/java/org/apache/jasper/JspCompilationContext.java
index 9f602be..bdf669b 100644
--- a/java/org/apache/jasper/JspCompilationContext.java
+++ b/java/org/apache/jasper/JspCompilationContext.java
@@ -454,11 +454,11 @@ public class JspCompilationContext {
 if (isTagFile()) {
 String className = tagInfo.getTagClassName();
 int lastIndex = className.lastIndexOf('.');
-String pkgName = "";
+String packageName = "";
 if (lastIndex != -1) {
-pkgName = className.substring(0, lastIndex);
+packageName = className.substring(0, lastIndex);
 }
-return pkgName;
+return packageName;
 } else {
 String dPackageName = getDerivedPackageName();
 if (dPackageName.length() == 0) {
@@ -767,4 +767,3 @@ public class JspCompilationContext {
 return result.toString();
 }
 }
-
diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 72a40ff..c5678ec 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3695,8 +3695,8 @@ class Generator {
 String className = tagInfo.getTagClassName();
 int lastIndex = className.lastIndexOf('.');
 if (lastIndex != -1) {
-String pkgName = className.substring(0, lastIndex);
-genPreamblePackage(pkgName);
+String packageName = className.substring(0, lastIndex);
+genPreamblePackage(packageName);
 className = className.substring(lastIndex + 1);
 }
 
diff --git a/java/org/apache/tomcat/util/buf/CharChunk.java 
b/java/org

[GitHub] [tomcat] ChristopherSchultz merged pull request #217: Made some variable names more consistent with the other parts.

2019-10-21 Thread GitBox
ChristopherSchultz merged pull request #217: Made some variable names more 
consistent with the other parts.
URL: https://github.com/apache/tomcat/pull/217
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[Bug 63867] Add option for reason phrase

2019-10-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63867

--- Comment #7 from Ken DeLong  ---
Wow. That must be the biggest middle finger in software history. If I may
paraphrase: "Yeah, I could fix your problem in about 10 minutes and save you a
huge amount of hassle... but I'm not going to. Go screw yourself."

If I spoke to one of our customers like this, it would be instant termination.
Not to mention I'd feel like the biggest dick on the block.

It's good to know that users in pain can count on the Tomcat dev team to turn
the screws even harder.

It's become clear that the use of Tomcat is a major risk to our business - not
only can we not expect support, but we can expect anti-support.  I will begin
migrating to Jetty this week.

-- 
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 63872] New: ContextConfig -> Invalid docBase if the exploded war is a sym-link

2019-10-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63872

Bug ID: 63872
   Summary: ContextConfig -> Invalid docBase if the exploded war
is a sym-link
   Product: Tomcat 8
   Version: 8.5.35
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: kilian.fel...@nextstride.com
  Target Milestone: 

The sym-link was working until version 8.5.34, but since 8.5.35 and higher it
does not work anymore.

This problem has been reported in Bug #60022 and should be fixed!

Somewhere I found a link where this problem has been discussed again ->
http://tomcat.10.x6.nabble.com/Followup2-Changed-behaviour-of-Tomcat-Deployment-Context-Lifecycle-Manager-concerning-symbolic-links-td5083666.html

The cause is located within the ContextConfig class.

diff ContextConfig.java-8.5.34 ContextConfig.java-8.5.35
:
582c586
< docBase = (new File(appBase, docBase)).getPath();
---
> docBase = (new File(appBase, docBase)).getCanonicalPath();

-- 
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 63872] ContextConfig -> Invalid docBase if the exploded war is a sym-link

2019-10-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63872

Kilian Felder  changed:

   What|Removed |Added

Version|8.5.35  |8.5.47

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