svn commit: r1555047 - in /tomcat/jk/trunk: jkstatus/build.xml native/NOTICE native/common/jk_status.c native/iis/jk_isapi_plugin.c xdocs/style.xsl
Author: rjung Date: Fri Jan 3 10:43:27 2014 New Revision: 1555047 URL: http://svn.apache.org/r1555047 Log: Happy new 2014. Modified: tomcat/jk/trunk/jkstatus/build.xml tomcat/jk/trunk/native/NOTICE tomcat/jk/trunk/native/common/jk_status.c tomcat/jk/trunk/native/iis/jk_isapi_plugin.c tomcat/jk/trunk/xdocs/style.xsl Modified: tomcat/jk/trunk/jkstatus/build.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/jkstatus/build.xml?rev=1555047r1=1555046r2=1555047view=diff == --- tomcat/jk/trunk/jkstatus/build.xml (original) +++ tomcat/jk/trunk/jkstatus/build.xml Fri Jan 3 10:43:27 2014 @@ -120,7 +120,7 @@ version=true windowtitle=Jk Status Internal API Documentation doctitle=Jk Status API - bottom=Copyright amp;#169; 2000-2013 Apache Software Foundation. All Rights Reserved. + bottom=Copyright amp;#169; 2000-2014 Apache Software Foundation. All Rights Reserved. / /target Modified: tomcat/jk/trunk/native/NOTICE URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/NOTICE?rev=1555047r1=1555046r2=1555047view=diff == --- tomcat/jk/trunk/native/NOTICE (original) +++ tomcat/jk/trunk/native/NOTICE Fri Jan 3 10:43:27 2014 @@ -1,5 +1,5 @@ Apache Tomcat Connectors -Copyright 2002-2013 The Apache Software Foundation +Copyright 2002-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/jk/trunk/native/common/jk_status.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1555047r1=1555046r2=1555047view=diff == --- tomcat/jk/trunk/native/common/jk_status.c (original) +++ tomcat/jk/trunk/native/common/jk_status.c Fri Jan 3 10:43:27 2014 @@ -215,7 +215,7 @@ html xmlns=\http://www.w3.org/1999/xhtml\; xml:lang=\en\ lang=\en\ \ headtitleJK Status Manager/title -#define JK_STATUS_COPYRIGHTCopyright #169; 1999-2013, The Apache Software Foundationbr / \ +#define JK_STATUS_COPYRIGHTCopyright #169; 1999-2014, The Apache Software Foundationbr / \ Licensed under the a href=\http://www.apache.org/licenses/LICENSE-2.0\; \ Apache License, Version 2.0/a. Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1555047r1=1555046r2=1555047view=diff == --- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original) +++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Fri Jan 3 10:43:27 2014 @@ -208,7 +208,7 @@ char HTML_ERROR_TAIL[] =P\nB BR/nbsp;\n HR/\n P id=\footer\\n -Copyright copy; 1999-2013 Apache Software FoundationBR/\n +Copyright copy; 1999-2014 Apache Software FoundationBR/\n All Rights Reserved\n /P\n/BODY\n/HTML\n; Modified: tomcat/jk/trunk/xdocs/style.xsl URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/style.xsl?rev=1555047r1=1555046r2=1555047view=diff == --- tomcat/jk/trunk/xdocs/style.xsl (original) +++ tomcat/jk/trunk/xdocs/style.xsl Fri Jan 3 10:43:27 2014 @@ -178,7 +178,7 @@ xsl:commentPAGE FOOTER/xsl:comment trtd colspan=2 div align=centerfont color={$body-link} size=-1em -Copyright #169; 1999-2013, Apache Software Foundation +Copyright #169; 1999-2014, Apache Software Foundation /em/font/div /td/tr - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of ContributorsGroup by SebastianBazley
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The ContributorsGroup page has been changed by SebastianBazley: https://wiki.apache.org/tomcat/ContributorsGroup?action=diffrev1=15rev2=16 Comment: Use [[ ]] for embedded spaces * EmericVernat * GlenIhrig * jboynes - * [Krzysztof Gil] + * [[Krzysztof Gil]] * LucaVisconti * NevenCvetkovic * ShawnYu - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55943] Provide a way prevent looking at the System classloader before the webapp classloaders
https://issues.apache.org/bugzilla/show_bug.cgi?id=55943 --- Comment #2 from chris.d...@gmail.com --- Switching to use a different classloader does sound a lot easier. Should I use the parent of the system classloader? It sounds like we really want the bootstrap loader. Couldn't I recursively get the parent loaders, until I run out, to get the bootstrap loader? -- 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: Permissions to create release directory for taglibs?
On Jan 2, 2014, at 2:55 PM, Olivier Lamy ol...@apache.org wrote: Just did that: mb-olamy:sirona olamy$ svn mkdir https://dist.apache.org/repos/dist/release/tomcat/taglibs Committed revision 4030. mb-olamy:sirona olamy$ svn mv https://dist.apache.org/repos/dist/dev/tomcat/taglibs/taglibs-standard-1.2.1 https://dist.apache.org/repos/dist/release/tomcat/taglibs Committed revision 4031. Should be ok now. Thank you. signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r1555163 - in /tomcat/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ modules/jdbc-pool/ modules/jdbc-pool/doc/ webapps/manager/WEB-INF/jsp/
Author: rjung Date: Fri Jan 3 17:35:54 2014 New Revision: 1555163 URL: http://svn.apache.org/r1555163 Log: Happy new 2014. Modified: tomcat/trunk/NOTICE tomcat/trunk/java/org/apache/catalina/manager/Constants.java tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java tomcat/trunk/modules/jdbc-pool/NOTICE tomcat/trunk/modules/jdbc-pool/doc/package.xsl tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Modified: tomcat/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=1555163r1=1555162r2=1555163view=diff == --- tomcat/trunk/NOTICE (original) +++ tomcat/trunk/NOTICE Fri Jan 3 17:35:54 2014 @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2013 The Apache Software Foundation +Copyright 1999-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/Constants.java?rev=1555163r1=1555162r2=1555163view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/Constants.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/Constants.java Fri Jan 3 17:35:54 2014 @@ -201,7 +201,7 @@ public class Constants { HTML_TAIL_SECTION = hr size=\1\ noshade=\noshade\\n + centerfont size=\-1\ color=\#525D76\\n + - emCopyright copy; 1999-2013, Apache Software Foundation/em + + emCopyright copy; 1999-2014, Apache Software Foundation/em + /font/center\n + \n + /body\n + Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1555163r1=1555162r2=1555163view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Fri Jan 3 17:35:54 2014 @@ -762,7 +762,7 @@ public final class HTMLManagerServlet ex */ @Override public String getServletInfo() { -return HTMLManagerServlet, Copyright (c) 1999-2013, The Apache Software Foundation; +return HTMLManagerServlet, Copyright (c) 1999-2014, The Apache Software Foundation; } /** Modified: tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1555163r1=1555162r2=1555163view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java Fri Jan 3 17:35:54 2014 @@ -111,7 +111,7 @@ public class Constants { public static final String HTML_TAIL_SECTION = hr size=\1\ noshade=\noshade\\n + centerfont size=\-1\ color=\#525D76\\n + - emCopyright copy; 1999-2013, Apache Software Foundation/em + + emCopyright copy; 1999-2014, Apache Software Foundation/em + /font/center\n + \n + /body\n + Modified: tomcat/trunk/modules/jdbc-pool/NOTICE URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/NOTICE?rev=1555163r1=1555162r2=1555163view=diff == --- tomcat/trunk/modules/jdbc-pool/NOTICE (original) +++ tomcat/trunk/modules/jdbc-pool/NOTICE Fri Jan 3 17:35:54 2014 @@ -1,5 +1,5 @@ Apache Tomcat JDBC Pool -Copyright 2008-2013 The Apache Software Foundation +Copyright 2008-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/trunk/modules/jdbc-pool/doc/package.xsl URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/package.xsl?rev=1555163r1=1555162r2=1555163view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/package.xsl (original) +++ tomcat/trunk/modules/jdbc-pool/doc/package.xsl Fri Jan 3 17:35:54 2014 @@ -150,7 +150,7 @@ td#mainBody {width: 100%;} xsl:commentPAGE FOOTER/xsl:comment trtd colspan=2 div align=centerfont color={$body-link} size=-1em -Copyright #169; 1999-2013, Apache Software Foundation +Copyright #169;
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5369 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1555163 Blamelist: rjung BUILD FAILED: exception compile upload_2 sincerely, -The Buildbot
svn commit: r1555165 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ modules/jdbc-pool/ modules/jdbc-pool/doc/ webapps/manager/WEB-INF/jsp/
Author: rjung Date: Fri Jan 3 17:42:07 2014 New Revision: 1555165 URL: http://svn.apache.org/r1555165 Log: Happy new year 2014. Backport of r1555163 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/NOTICE tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1555163 Modified: tomcat/tc7.0.x/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/NOTICE?rev=1555165r1=1555164r2=1555165view=diff == --- tomcat/tc7.0.x/trunk/NOTICE (original) +++ tomcat/tc7.0.x/trunk/NOTICE Fri Jan 3 17:42:07 2014 @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2013 The Apache Software Foundation +Copyright 1999-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=1555165r1=1555164r2=1555165view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java Fri Jan 3 17:42:07 2014 @@ -201,7 +201,7 @@ public class Constants { HTML_TAIL_SECTION = hr size=\1\ noshade=\noshade\\n + centerfont size=\-1\ color=\#525D76\\n + - emCopyright copy; 1999-2013, Apache Software Foundation/em + + emCopyright copy; 1999-2014, Apache Software Foundation/em + /font/center\n + \n + /body\n + Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1555165r1=1555164r2=1555165view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Fri Jan 3 17:42:07 2014 @@ -776,7 +776,7 @@ public final class HTMLManagerServlet ex */ @Override public String getServletInfo() { -return HTMLManagerServlet, Copyright (c) 1999-2013, The Apache Software Foundation; +return HTMLManagerServlet, Copyright (c) 1999-2014, The Apache Software Foundation; } /** Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1555165r1=1555164r2=1555165view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java Fri Jan 3 17:42:07 2014 @@ -111,7 +111,7 @@ public class Constants { public static final String HTML_TAIL_SECTION = hr size=\1\ noshade=\noshade\\n + centerfont size=\-1\ color=\#525D76\\n + - emCopyright copy; 1999-2013, Apache Software Foundation/em + + emCopyright copy; 1999-2014, Apache Software Foundation/em + /font/center\n + \n + /body\n + Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE?rev=1555165r1=1555164r2=1555165view=diff == --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE Fri Jan 3 17:42:07 2014 @@ -1,5 +1,5 @@ Apache Tomcat JDBC Pool -Copyright 2008-2013 The Apache Software Foundation +Copyright 2008-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl?rev=1555165r1=1555164r2=1555165view=diff
[Tomcat Wiki] Update of Cookies by jboynes
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The Cookies page has been changed by jboynes: https://wiki.apache.org/tomcat/Cookies?action=diffrev1=13rev2=14 == Generating the Set-Cookie header by Tomcat == - TODO: Need to define behaviour for each of the issues above. + === Requirements as defined by the specifications === + ||'''Requirement'''||'''Servlet'''||'''Netscape'''||'''RFC2109'''||'''RFC6265'''|| + ||Format of name||Must conform to RFC2109. Vendors may provide option to allow Netscape format||A sequence of characters excluding semi-colon, comma and white space. Browsers generally stop at first equals,||token||token|| + ||Format of value||The value can be anything the server chooses to send. With Version 0 cookies, values should not contain white space, brackets, parentheses, equals signs, commas, double quotes, slashes, question marks, at signs, colons, and semicolons. Empty values may not behave the same way on all browsers.||This string is a sequence of characters excluding semi-colon, comma and white space.||token | quoted-string||cookie-value|| + ||Domain||String, per RFC2109||domain=DOMAIN_NAME||Domain = value||Domain= domain-value|| + ||Path||String, per RFC2109||path=PATH||Path = value||Path= path-value|| + ||Secure||boolean||secure||Secure||Secure|| + ||HttpOnly||boolean||N/A||N/A||HttpOnly|| + ||Expires||N/A||expires=DATE as Wdy, DD-Mon- HH:MM:SS GMT||N/A||Expires= sane-cookie-date|| + ||Max-Age||int in seconds||N/A||Max-Age = value||Max-Age= non-zero-digit *DIGIT|| + ||Comment||String||N/A||Comment = value||allowed by extension|| + ||Version||int (0 or 1)||N/A||Version = 1*DIGIT||allowed by extension|| + ||Extension||N/A||N/A||N/A||any CHAR except CTLs or ;|| + + === Current Implementation === + TODO: write up + === Proposed Implementation === + TBD + + == RFC2616 definitions == + {{{ + token = 1*any CHAR except CTLs or separators + separators = ( | ) | | | @ | , | ; | : | \ | | / | [ | ] | ? | = | { | } | SP | HT + CHAR = any US-ASCII character (octets 0 - 127) + CTL= any US-ASCII control character (octets 0 - 31) and DEL (127) + quoted-string = ( *(qdtext | quoted-pair ) ) + qdtext = any TEXT except + quoted-pair= \ CHAR + TEXT = any OCTET except CTLs, but including LWS + rfc1123-date = wkday , SP date1 SP time SP GMT + }}} + == RFC6265 definitions == + {{{ + cookie-value = *cookie-octet / ( DQUOTE *cookie-octet DQUOTE ) + cookie-octet = %x21 / %x23-2B / %x2D-3A / %x3C-5B / %x5D-7E + domain-value = subdomain ; defined in [RFC1034], Section 3.5, as enhanced by [RFC1123], Section 2.1 + path-value= any CHAR except CTLs or ; + sane-cookie-date = rfc1123-date, defined in [RFC2616], Section 3.3.1 + }}} == References == 1. [[http://www.ietf.org/mail-archive/web/http-state/current/msg01232.html|RFC6265 discussion on 0x80-0xFF]] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1555167 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ webapps/docs/tribes/ webapps/manager/WEB-INF/jsp/
Author: rjung Date: Fri Jan 3 17:54:53 2014 New Revision: 1555167 URL: http://svn.apache.org/r1555167 Log: Happy new 2014! Backport of r1555163 from trunk resp. r1555165 from tc7 plus tomcat-docs.xsl in tribes docs. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/NOTICE tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1555163 Modified: tomcat/tc6.0.x/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/NOTICE?rev=1555167r1=1555166r2=1555167view=diff == --- tomcat/tc6.0.x/trunk/NOTICE (original) +++ tomcat/tc6.0.x/trunk/NOTICE Fri Jan 3 17:54:53 2014 @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2013 The Apache Software Foundation +Copyright 1999-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=1555167r1=1555166r2=1555167view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java Fri Jan 3 17:54:53 2014 @@ -182,7 +182,7 @@ public class Constants { public static final String HTML_TAIL_SECTION = hr size=\1\ noshade=\noshade\\n + centerfont size=\-1\ color=\#525D76\\n + - emCopyright copy; 1999-2013, Apache Software Foundation/em + + emCopyright copy; 1999-2014, Apache Software Foundation/em + /font/center\n + \n + /body\n + Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1555167r1=1555166r2=1555167view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Fri Jan 3 17:54:53 2014 @@ -676,7 +676,7 @@ public final class HTMLManagerServlet ex * @see javax.servlet.Servlet#getServletInfo() */ public String getServletInfo() { -return HTMLManagerServlet, Copyright (c) 1999-2013, The Apache Software Foundation; +return HTMLManagerServlet, Copyright (c) 1999-2014, The Apache Software Foundation; } /** Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1555167r1=1555166r2=1555167view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java Fri Jan 3 17:54:53 2014 @@ -186,7 +186,7 @@ public class Constants { public static final String HTML_TAIL_SECTION = hr size=\1\ noshade=\noshade\\n + centerfont size=\-1\ color=\#525D76\\n + - emCopyright copy; 1999-2013, Apache Software Foundation/em + + emCopyright copy; 1999-2014, Apache Software Foundation/em + /font/center\n + \n + /body\n + Modified: tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl?rev=1555167r1=1555166r2=1555167view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl Fri Jan 3 17:54:53 2014 @@ -182,7 +182,7 @@ xsl:commentPAGE FOOTER/xsl:comment trtd colspan=2 div align=centerfont color={$body-link} size=-1em -Copyright #169; 1999-2013, Apache Software Foundation +Copyright #169; 1999-2014, Apache Software Foundation /em/font/div /td/tr Modified: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp URL:
svn commit: r1555168 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Fri Jan 3 17:56:18 2014 New Revision: 1555168 URL: http://svn.apache.org/r1555168 Log: Remove stalled proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1555168r1=1555167r2=1555168view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 3 17:56:18 2014 @@ -149,20 +149,3 @@ PATCHES PROPOSED TO BACKPORT: PATCHES/ISSUES THAT ARE STALLED -* Backport JSP unloading patch (BZ48358). - The patch has substantially changed since the original version. - Original revisions are: 937787, 1028377, 1028389, 1028396, 1028861, 1028862, 1028863, - 1028935, 1028939, 1028940, 1028944, 1028950, 1030014, 1030037 - Combined TC 6 patch: - http://people.apache.org/~rjung/patches/BZ48358-JSP_Unloading-TC6_20101118.patch - +1: rjung - -0: markt - http://markmail.org/thread/777be426ulcfmdd3 suggests there may be - a memory leak in this code somewhere. I'd like to get to the - bottom of that before porting this - rjung: I started a discussion about JSPs and memory on the dev list. - The updated patch fixes a race condition. - We can stall this item until we get some feedback about 7.0.5. - markt - r1172614 needs to be included in this proposal. With that patch, - my testing shows that the unloading works as designed - kkolinko - r1428358 (r1428355) is needed - a fix for BZ 54260. - -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1555177 - in /tomcat/taglibs: extended/trunk/ rdc/trunk/ rdc/trunk/taglibs-rdc-dist/ rdc/trunk/taglibs-rdc-examples/ rdc/trunk/taglibs-rdc/ site/ standard/trunk/ taglibs-parent/trunk/
Author: rjung Date: Fri Jan 3 18:08:32 2014 New Revision: 1555177 URL: http://svn.apache.org/r1555177 Log: Happy new 2014! Modified: tomcat/taglibs/extended/trunk/NOTICE.txt tomcat/taglibs/rdc/trunk/NOTICE.txt tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/NOTICE.txt tomcat/taglibs/rdc/trunk/taglibs-rdc-examples/NOTICE.txt tomcat/taglibs/rdc/trunk/taglibs-rdc/NOTICE.txt tomcat/taglibs/site/NOTICE.txt tomcat/taglibs/standard/trunk/NOTICE tomcat/taglibs/taglibs-parent/trunk/NOTICE Modified: tomcat/taglibs/extended/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/extended/trunk/NOTICE.txt?rev=1555177r1=1555176r2=1555177view=diff == --- tomcat/taglibs/extended/trunk/NOTICE.txt (original) +++ tomcat/taglibs/extended/trunk/NOTICE.txt Fri Jan 3 18:08:32 2014 @@ -1,5 +1,5 @@ Apache Extended Taglib -Copyright 2009-2012 The Apache Software Foundation +Copyright 2009-2014 The Apache Software Foundation -This product includes software developed by +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/taglibs/rdc/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/NOTICE.txt?rev=1555177r1=1555176r2=1555177view=diff == --- tomcat/taglibs/rdc/trunk/NOTICE.txt (original) +++ tomcat/taglibs/rdc/trunk/NOTICE.txt Fri Jan 3 18:08:32 2014 @@ -1,5 +1,5 @@ Apache Jakarta Taglibs Reusable Dialog Components (RDC) Tag Library -Copyright 2004-2012 The Apache Software Foundation +Copyright 2004-2014 The Apache Software Foundation -This product includes software developed by +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/NOTICE.txt?rev=1555177r1=1555176r2=1555177view=diff == --- tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/NOTICE.txt (original) +++ tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/NOTICE.txt Fri Jan 3 18:08:32 2014 @@ -1,5 +1,5 @@ Apache Jakarta Taglibs Reusable Dialog Components (RDC) Tag Library Distributions -Copyright 2004-2012 The Apache Software Foundation +Copyright 2004-2014 The Apache Software Foundation -This product includes software developed by +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/taglibs/rdc/trunk/taglibs-rdc-examples/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/taglibs-rdc-examples/NOTICE.txt?rev=1555177r1=1555176r2=1555177view=diff == --- tomcat/taglibs/rdc/trunk/taglibs-rdc-examples/NOTICE.txt (original) +++ tomcat/taglibs/rdc/trunk/taglibs-rdc-examples/NOTICE.txt Fri Jan 3 18:08:32 2014 @@ -1,5 +1,5 @@ Apache Jakarta Taglibs Reusable Dialog Components (RDC) Tag Library Examples Application -Copyright 2004-2012 The Apache Software Foundation +Copyright 2004-2014 The Apache Software Foundation -This product includes software developed by +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/taglibs/rdc/trunk/taglibs-rdc/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/taglibs-rdc/NOTICE.txt?rev=1555177r1=1555176r2=1555177view=diff == --- tomcat/taglibs/rdc/trunk/taglibs-rdc/NOTICE.txt (original) +++ tomcat/taglibs/rdc/trunk/taglibs-rdc/NOTICE.txt Fri Jan 3 18:08:32 2014 @@ -1,5 +1,5 @@ Apache Jakarta Taglibs Reusable Dialog Components (RDC) Tag Library -Copyright 2004-2012 The Apache Software Foundation +Copyright 2004-2014 The Apache Software Foundation -This product includes software developed by +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/taglibs/site/NOTICE.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/NOTICE.txt?rev=1555177r1=1555176r2=1555177view=diff == --- tomcat/taglibs/site/NOTICE.txt (original) +++ tomcat/taglibs/site/NOTICE.txt Fri Jan 3 18:08:32 2014 @@ -1,5 +1,5 @@ Apache Jakarta Taglib Website -Copyright 2009-2012 The Apache Software Foundation +Copyright 2009-2014 The Apache Software Foundation -This product includes software developed by +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/taglibs/standard/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/NOTICE?rev=1555177r1=1555176r2=1555177view=diff
svn commit: r1555185 - in /tomcat/native/branches/1.1.x: ./ NOTICE build.xml xdocs/style.xsl
Author: rjung Date: Fri Jan 3 18:22:30 2014 New Revision: 1555185 URL: http://svn.apache.org/r1555185 Log: Happy new 2014! Backport of r1555184 from trunk. Modified: tomcat/native/branches/1.1.x/ (props changed) tomcat/native/branches/1.1.x/NOTICE tomcat/native/branches/1.1.x/build.xml tomcat/native/branches/1.1.x/xdocs/style.xsl Propchange: tomcat/native/branches/1.1.x/ -- Merged /tomcat/native/trunk:r1555184 Modified: tomcat/native/branches/1.1.x/NOTICE URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/NOTICE?rev=1555185r1=1555184r2=1555185view=diff == --- tomcat/native/branches/1.1.x/NOTICE (original) +++ tomcat/native/branches/1.1.x/NOTICE Fri Jan 3 18:22:30 2014 @@ -1,5 +1,5 @@ Apache Tomcat Native Library -Copyright 2002-2013 The Apache Software Foundation +Copyright 2002-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/native/branches/1.1.x/build.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=1555185r1=1555184r2=1555185view=diff == --- tomcat/native/branches/1.1.x/build.xml (original) +++ tomcat/native/branches/1.1.x/build.xml Fri Jan 3 18:22:30 2014 @@ -30,7 +30,7 @@ property name=project value=tomcat-native / property name=name value=Tomcat Native / property name=title value=Tomcat Native Library/ -property name=year value=2013 / +property name=year value=2014 / property name=version.major value=1 / property name=version.minor value=1 / property name=version.build value=29 / @@ -175,7 +175,7 @@ packagenames=org.apache.tomcat.* windowtitle=${title} (Version ${version}) doctitle=lt;h1gt;${title} (Version ${version})lt;/h1gt; -bottom=Copyright 2002-2013 The Apache Software Foundation.lt;!-- +bottom=Copyright 2002-2014 The Apache Software Foundation.lt;!-- Licensed under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License. Modified: tomcat/native/branches/1.1.x/xdocs/style.xsl URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/style.xsl?rev=1555185r1=1555184r2=1555185view=diff == --- tomcat/native/branches/1.1.x/xdocs/style.xsl (original) +++ tomcat/native/branches/1.1.x/xdocs/style.xsl Fri Jan 3 18:22:30 2014 @@ -127,7 +127,7 @@ !-- Footer -- footerdiv id=footer -Copyright © 2008-2013, The Apache Software Foundation +Copyright © 2008-2014, The Apache Software Foundation /div/footer /div /body - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1555184 - in /tomcat/native/trunk: NOTICE build.xml xdocs/style.xsl
Author: rjung Date: Fri Jan 3 18:20:29 2014 New Revision: 1555184 URL: http://svn.apache.org/r1555184 Log: Happy new 2014! Modified: tomcat/native/trunk/NOTICE tomcat/native/trunk/build.xml tomcat/native/trunk/xdocs/style.xsl Modified: tomcat/native/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/native/trunk/NOTICE?rev=1555184r1=1555183r2=1555184view=diff == --- tomcat/native/trunk/NOTICE (original) +++ tomcat/native/trunk/NOTICE Fri Jan 3 18:20:29 2014 @@ -1,5 +1,5 @@ Apache Tomcat Native Library -Copyright 2002-2013 The Apache Software Foundation +Copyright 2002-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/native/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=1555184r1=1555183r2=1555184view=diff == --- tomcat/native/trunk/build.xml (original) +++ tomcat/native/trunk/build.xml Fri Jan 3 18:20:29 2014 @@ -30,7 +30,7 @@ property name=project value=tomcat-native / property name=name value=Tomcat Native / property name=title value=Tomcat Native Library/ -property name=year value=2013 / +property name=year value=2014 / property name=version.major value=2 / property name=version.minor value=0 / property name=version.build value=0 / @@ -179,7 +179,7 @@ packagenames=org.apache.tomcat.* windowtitle=${title} (Version ${version}) doctitle=lt;h1gt;${title} (Version ${version})lt;/h1gt; -bottom=Copyright 2002-2013 The Apache Software Foundation.lt;!-- +bottom=Copyright 2002-2014 The Apache Software Foundation.lt;!-- Licensed under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License. Modified: tomcat/native/trunk/xdocs/style.xsl URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/style.xsl?rev=1555184r1=1555183r2=1555184view=diff == --- tomcat/native/trunk/xdocs/style.xsl (original) +++ tomcat/native/trunk/xdocs/style.xsl Fri Jan 3 18:20:29 2014 @@ -127,7 +127,7 @@ !-- Footer -- footerdiv id=footer -Copyright © 2008-2013, The Apache Software Foundation +Copyright © 2008-2014, The Apache Software Foundation /div/footer /div /body - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1555191 - in /tomcat/site/trunk/xdocs: legal.xml stylesheets/tomcat-site.xsl stylesheets/tomcat.css
Author: rjung Date: Fri Jan 3 18:31:34 2014 New Revision: 1555191 URL: http://svn.apache.org/r1555191 Log: Happy new 2014! Modified: tomcat/site/trunk/xdocs/legal.xml tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl tomcat/site/trunk/xdocs/stylesheets/tomcat.css Modified: tomcat/site/trunk/xdocs/legal.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1555191r1=1555190r2=1555191view=diff == --- tomcat/site/trunk/xdocs/legal.xml (original) +++ tomcat/site/trunk/xdocs/legal.xml Fri Jan 3 18:31:34 2014 @@ -11,7 +11,7 @@ section name=Legal Stuff They Make Us Say p -All material on this website is Copyright #169; 1999-2013, The Apache +All material on this website is Copyright #169; 1999-2014, The Apache Software Foundation /p Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1555191r1=1555190r2=1555191view=diff == --- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original) +++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Fri Jan 3 18:31:34 2014 @@ -136,7 +136,7 @@ !-- Footer -- footerdiv id=footer -Copyright © 1999-2013, The Apache Software Foundation +Copyright © 1999-2014, The Apache Software Foundation br/ Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat.css URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat.css?rev=1555191r1=1555190r2=1555191view=diff == --- tomcat/site/trunk/xdocs/stylesheets/tomcat.css (original) +++ tomcat/site/trunk/xdocs/stylesheets/tomcat.css Fri Jan 3 18:31:34 2014 @@ -1,6 +1,6 @@ @charset utf-8; /* -* Copyright 2002-2013 The Apache Software Foundation +* Copyright 2002-2014 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. @@ -276,4 +276,4 @@ table.defaultTable th, table.defaultTabl .noPrint { display: none; } #middle div div#mainLeft { display: none; } a { color: inherit; text-decoration: none; } -} \ No newline at end of file +} - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1555192 - in /tomcat/site/trunk/docs: ./ stylesheets/
Author: rjung Date: Fri Jan 3 18:33:54 2014 New Revision: 1555192 URL: http://svn.apache.org/r1555192 Log: Regenerate the site after year update. Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/docs/oldnews-2011.html tomcat/site/trunk/docs/oldnews-2012.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/stylesheets/tomcat.css tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/tools.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1555192r1=1555191r2=1555192view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Fri Jan 3 18:33:54 2014 @@ -973,7 +973,7 @@ See a href=security.htmlSecurity Rep /div footer div id=footer -Copyright copy; 1999-2013, The Apache Software Foundation +Copyright copy; 1999-2014, The Apache Software Foundation br Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1555192r1=1555191r2=1555192view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Fri Jan 3 18:33:54 2014 @@ -661,7 +661,7 @@ prepared and published by ASF Buildbot, /div footer div id=footer -Copyright copy; 1999-2013, The Apache Software Foundation +Copyright copy; 1999-2014, The Apache Software Foundation br Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1555192r1=1555191r2=1555192view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Fri Jan 3 18:33:54 2014 @@ -248,7 +248,7 @@ Apache sites at once. /div footer div id=footer -Copyright copy; 1999-2013, The Apache Software Foundation +Copyright copy; 1999-2014, The Apache Software Foundation br Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1555192r1=1555191r2=1555192view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Fri Jan 3 18:33:54 2014 @@ -379,7 +379,7 @@ /div footer div id=footer -Copyright copy; 1999-2013, The Apache Software Foundation +Copyright copy; 1999-2014, The Apache Software Foundation br Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1555192r1=1555191r2=1555192view=diff ==
BZ53814, Acrobat Reader workaround, Can be removed after 26 June 2013
When checking for copyright year updates etc. I found the following: 80 result.append(';'); 81 // Workaround for Adobe Read 9 plug-in on IE bug 82 // Can be removed after 26 June 2013 (EOL of Reader 9) 83 // See BZ 53814 84 result.append(' '); 85 result.append(entry.getKey()); 86 result.append('='); 87 result.append(value); in file java/org/apache/tomcat/util/http/parser/MediaType.java. That date has passed, but of course Acrobat Reader is very popular and EOL is only the formal part of the argument. I guess we can risk removing the result.append(' '); line tight now from TC 8 and keep it a bit longer in TC 7? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of Cookies by jboynes
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The Cookies page has been changed by jboynes: https://wiki.apache.org/tomcat/Cookies?action=diffrev1=14rev2=15 ||Domain||String, per RFC2109||domain=DOMAIN_NAME||Domain = value||Domain= domain-value|| ||Path||String, per RFC2109||path=PATH||Path = value||Path= path-value|| ||Secure||boolean||secure||Secure||Secure|| - ||HttpOnly||boolean||N/A||N/A||HttpOnly|| + ||!HttpOnly||boolean||N/A||N/A||!HttpOnly|| ||Expires||N/A||expires=DATE as Wdy, DD-Mon- HH:MM:SS GMT||N/A||Expires= sane-cookie-date|| ||Max-Age||int in seconds||N/A||Max-Age = value||Max-Age= non-zero-digit *DIGIT|| ||Comment||String||N/A||Comment = value||allowed by extension|| @@ -40, +40 @@ ||Extension||N/A||N/A||N/A||any CHAR except CTLs or ;|| === Current Implementation === - TODO: write up + Cookie + The constructor of javax.servlet.http.Cookie will throw an !IllegalArgumentException if any of the following conditions are met: + * name is null or zero length + * if name is not a token + * if name equalsIgnoreCase any of Comment Discard Domain Expires Max-Age Path Secure Version + * if name startsWith $ + + By default, a token comprises characters 0x21..0x7E except comma, semicolon and space. If STRICT_NAMING is true, then token also excludes characters from ()@,;:\\\[]?={} \t which corresponds to RFC2616 separators without / (i.e. / is allowed); if FWD_SLASH_IS_SEPARATOR is true than / is also excluded. These properties will default to true if STRICT_SERVLET_COMPLIANCE is true. + + Issues:: + :: the !HttpOnly attribute is not covered by the check + :: by default, a = character is allowed in a name (browsers treat the name as everything up to the first equals) + + No checks are made in any of the other setters. + + The domain value is converted to lower case (per Locale.ENGLISH) when set as IE allegedly needs this. + + HttpServletRequest + TODO: document this + === Proposed Implementation === TBD - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of Cookies by jboynes
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The Cookies page has been changed by jboynes: https://wiki.apache.org/tomcat/Cookies?action=diffrev1=15rev2=16 The domain value is converted to lower case (per Locale.ENGLISH) when set as IE allegedly needs this. - HttpServletRequest + HttpServletResponse - TODO: document this + This is typically implemented by o.a.c.connector.Response whose addCookie method delegates generation of the Set-Cookie header to o.a.t.util.http.ServerCookie#appendCookieValue. This first appends the name (relying on checks performed by Cookie), = and then the value using RFC2109 quoting rules: + * if the value is null or empty, append empty quoted-string + * if the value starts and ends with '', output as is after escaping any '' characters between the outer quotes + * if ALLOW_HTTP_SEPARATORS_IN_V0 is false and the value contains a RFC2616 separator, output as a quoted-string after escaping '' and force Version=1 + * if ALLOW_HTTP_SEPARATORS_IN_V0 is true and the value contains a Netscape separator, output as a quoted-string after escaping '' and force Version=1 + * otherwise, output as is + + Netscape separators are {',', ';', ' ', '\t'} + RFC2616 separators by default do not include / unless FWD_SLASH_IS_SEPARATOR is set (or implied by STRICT_SERVLET_COMPLIANCE). + Characters outside the set { HT, 0x20..0x7E } will result in a !IllegalArgumentException when the check for token characters is performed. + + The same quoting rules are applied when outputting any Domain or Path value. + + If maxAge =, then the Max-Age attribute will be set for V1 cookies and the Expires attribute for V0 cookies. If the property ALWAYS_ADD_EXPIRES is true then Expires will also be set for V1 cookies. + + Issues:: + :: relies on the browser supporting RFC2109 quoting rules when Version=1 (most apply Netscape rules) + :: Domain is not strictly checked + :: Path is quoted using the same rules as Value; browsers treat them differently (e.g. IE treats quoted paths as invalid) === Proposed Implementation === TBD - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: BZ53814, Acrobat Reader workaround, Can be removed after 26 June 2013
2014/1/3 Rainer Jung rainer.j...@kippdata.de: When checking for copyright year updates etc. I found the following: 80 result.append(';'); 81 // Workaround for Adobe Read 9 plug-in on IE bug 82 // Can be removed after 26 June 2013 (EOL of Reader 9) 83 // See BZ 53814 84 result.append(' '); 85 result.append(entry.getKey()); 86 result.append('='); 87 result.append(value); in file java/org/apache/tomcat/util/http/parser/MediaType.java. That date has passed, but of course Acrobat Reader is very popular and EOL is only the formal part of the argument. I guess we can risk removing the result.append(' '); line tight now from TC 8 and keep it a bit longer in TC 7? I think let's keep it. One good thing with that whitespace is that it allows to wrap the header into several lines if needed. BTW, as of now, Adobe Reader 9.5 is still downloadable from get.adobe.com site. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of Cookies by jboynes
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The Cookies page has been changed by jboynes: https://wiki.apache.org/tomcat/Cookies?action=diffrev1=16rev2=17 ||Comment||String||N/A||Comment = value||allowed by extension|| ||Version||int (0 or 1)||N/A||Version = 1*DIGIT||allowed by extension|| ||Extension||N/A||N/A||N/A||any CHAR except CTLs or ;|| + + The RI defines a vendor system property org.glassfish.web.rfc2109_cookie_names_enforced (default true) that controls the characters permitted in the name argument. If true, RFC2616 separators (including /) will trigger an !IllegalArgumentException; if false, only comma, semicolon and space are considered invalid. === Current Implementation === Cookie - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of Cookies by jboynes
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The Cookies page has been changed by jboynes: https://wiki.apache.org/tomcat/Cookies?action=diffrev1=17rev2=18 = Cookies = == Parsing the Cookie header by Tomcat == + The various specifications define the following formats for the Cookie header sent by the user-agent: + ||'''Specification'''||'''Format of Cookie header'''|| + ||Netscape||{{{Cookie: NAME1=OPAQUE_STRING1; NAME2=OPAQUE_STRING2 ...}}}|| + ||RFC2109||{{{Cookie: $Version = value 1*((; | ,) cookie-value)}}}|| + ||RFC6265||{{{Cookie: OWS cookie-pair *( ; SP cookie-pair ) OWS}}}|| + + Chrome-31, Firefox-26, Firefox Aurora-28, Internet Explorer-11 and Safari-7.01 all send a single header in Netscape/RFC6265 format with name=value pairs separated by semicolon and space. The name and value correspond to whatever was stored in the browser when the Set-Cookie header was parsed. These may contain commas, spaces, other separators or 8-bit characters. + + None of them add any of the $ attributes ($Version $Domain or $Path) from RFC2109 and specifically do not send the leading $Version attribute that is part of that specification's syntax. All except Safari support a unnamed value-only cookie that is sent as is (without a name or =); i.e. a unnamed cookie with value foo (including quotes) is sent as the line: + {{{ + Cookie: foo + }}} + + When set through !JavaScript, any Unicode codepoints in the text are encoded as UTF-8 in the header. For example, in Chrome the statement {{{document.cookie = foo=b\u00e1r;}}} will result in a header containing the octets + {{{ + 43 6f 6f 6b 69 65 3a 20 66 6f 6f 3d 62 c3 a1 72 + }}} + showing codepoint U+00E1 being converted to its UTF-8 equivalent 0xC3 0xA1. This matches the behaviour defined by [[http://www.w3.org/html/wg/drafts/html/master/single-page.html#cookie|HTML5.]] ||'''Issue'''||'''Current behaviour (8.0.0-RC10/7.0.50)'''||'''Proposed new behaviour'''||'''Servlet + Netscape + RFC2109'''||'''Servlet + RFC 6265'''|| ||0x80 to 0xFF in cookie value ([[https://issues.apache.org/bugzilla/show_bug.cgi?id=55917|Bug 55917]])||IAE||TBD||Netscape yes. RFC2109 requires quotes.||RFC 6265 never allowed.|| @@ -95, +113 @@ TEXT = any OCTET except CTLs, but including LWS rfc1123-date = wkday , SP date1 SP time SP GMT }}} + == RFC2109 definitions == + {{{ + cookie-value = NAME = VALUE [; path] [; domain] + }}} == RFC6265 definitions == {{{ + cookie-pair = cookie-name = cookie-value cookie-value = *cookie-octet / ( DQUOTE *cookie-octet DQUOTE ) cookie-octet = %x21 / %x23-2B / %x2D-3A / %x3C-5B / %x5D-7E domain-value = subdomain ; defined in [RFC1034], Section 3.5, as enhanced by [RFC1123], Section 2.1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: 8-bit text in cookie values
Adding more confusion to the pile, HTML5[1] now specifies that JavaScript can set Unicode characters through document.cookie and that they must be encoded as UTF-8 in the header. Quick testing with Chrome shows it does just that (i.e. U+00E1 is sent as 0xC3 0xA1). If client and server-side application code is going to interoperate then we would need to accept them in a Cookie header and allow them to be sent in a Set-Cookie header. However, this is ambiguous when compared to Netscape and its implicit assumption of ISO-8859-1. [1] http://www.w3.org/html/wg/drafts/html/master/single-page.html#cookie On Jan 1, 2014, at 10:18 AM, Jeremy Boynes jboy...@apache.org wrote: On Jan 1, 2014, at 8:59 AM, Mark Thomas ma...@apache.org wrote: Signed PGP part On 26/12/2013 19:23, Jeremy Boynes wrote: On Dec 26, 2013, at 2:47 AM, Mark Thomas ma...@apache.org wrote: Focusing on the 8-bit issue address by the patch, leaving the other RFC6265 thread for broader discussion ... The change only allows these characters in values if version == 0 where Netscape’s rather than RFC2109’s syntax applies (per the Servlet spec). The Netscape spec is vague in that it does not define “OPAQUE_STRING at all and defines “VALUE” as containing equally undefined “characters” although historically[1] those have been taken to be OCTETs as permitted by RFC2616’s “*TEXT” variant of “field-content.” The change will continue to reject these characters in names and in unquoted values when version != 0 (RFC2109’s “word rule) [1] based on comments by Fielding et al. on http-state and what I’ve seen in the wild Can you provide references for [1]? This is the mail in the run up to RFC6265 that triggered the discussion: http://www.ietf.org/mail-archive/web/http-state/current/msg01232.html Thanks for that reference. What a complete mess. RFC6265 really dropped the ball on this. The grammar for cookie-value is a disaster. So far the issues include: - no support for 0x80 to 0xFF - no support for \ sequences - no support for using whitespace, comma, semi-colon, backslash I was beginning to think that factoring out the cookie generation / parsing and then providing different implementations (one for Netscape + RFC2109 - roughly what we have now with a few fixes, one for RFC6265 and maybe one very relaxed) would be the way to go. Having looked at the first issue that plan already looks like it needs a re-think. I'm still hoping that by documenting all the various issues in one place we will be able to come up with a solution that both addresses all the issues you have raised and is better than the handful of system properties we have currently. I think they did a reasonable job given the mess cookies are in the wild today. They summarize this in the preamble: The recommendations for cookie generation provided in Section 4 represent a preferred subset of current server behavior, and even the more liberal cookie processing algorithm provided in Section 5 does not recommend all of the syntactic and semantic variations in use today. Section 4 recommends guidelines for servers generating cookies. I interpret that as being “if you follow these guidelines, you have a good chance of actually getting back the value you tried to set.” The rules above (no 8-bit, no escaping, no Netscape delimiters) reflect that principle. A server application can step outside those guidelines but thar ther be dragons. — Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail