Author: kkolinko
Date: Thu Dec 6 13:44:12 2012
New Revision: 1417882
URL: http://svn.apache.org/viewvc?rev=1417882&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54054
Do not share shell environment variables between multiple instances of the CGI
servlet. (markt)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1417882&r1=1417881&r2=1417882&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 6 13:44:12 2012
@@ -79,13 +79,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54054
- Do not share shell environment variables between multiple instances of the
CGI
- servlet.
- http://svn.apache.org/viewvc?rev=1402644&view=rev
- +1: markt, kkolinko, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54080
"Comma related bug in org.apache.catalina.valves.RemoteIpValve"
Documentation-only patch:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1417882&r1=1417881&r2=1417882&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu
Dec 6 13:44:12 2012
@@ -277,7 +277,7 @@ public final class CGIServlet extends Ht
static Object expandFileLock = new Object();
/** the shell environment variables to be passed to the CGI script */
- static Hashtable<String,String> shellEnv = new Hashtable<String,String>();
+ Hashtable<String,String> shellEnv = new Hashtable<String,String>();
/**
* Sets instance variables.
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1417882&r1=1417881&r2=1417882&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Dec 6 13:44:12 2012
@@ -44,6 +44,14 @@
General, Catalina, Coyote, Jasper, Cluster, Web applications, Other
-->
<section name="Tomcat 6.0.37 (jfclere)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>54054</bug>: Do not share shell environment variables between
+ multiple instances of the CGI servlet. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
