[PATCH] Bug 22905 - set secure option in cookie for JSESSIONID when communicating via SSL

2003-09-03 Thread Kubo Hiroshi
This patch adds  secureCookie option to SessionId Intercepter.

For example, 

SessionId cookiesFirst=true noCookies=false secureCookie=true /

If secureCookie is set to be true, cookie for JSESSIONID sent via SSL connection
will have Secure option.

The patch below is for Tomcat-3.3.1a.


Hiroshi

===
--- src/share/org/apache/tomcat/modules/session/SessionId.java.orig Wed Sep  3 
15:34:11 2003
+++ src/share/org/apache/tomcat/modules/session/SessionId.java  Wed Sep  3 15:04:22 
2003
@@ -96,6 +96,7 @@
 boolean noCookies=false;
 boolean cookiesFirst=true;
 boolean checkSSLSessionId=false;
+boolean secureCookie=false;
 
 public SessionId() {
 }
@@ -112,6 +113,10 @@
 this.checkSSLSessionId = checkSSLSessionId;
 }
 
+public void setSecureCookie(boolean secureCookie) {
+this.secureCookie = secureCookie;
+}
+
 
 /** Extract the session id from the request.
  * SessionInterceptor will have to be called _before_ mapper,
@@ -341,6 +346,9 @@
StringBuffer buf = new StringBuffer();
buf.append( JSESSIONID= ).append( reqSessionId );
buf.append( ;Path= ).append(  sessionPath  );
+   if ( secureCookie  rrequest.isSecure() ) {
+buf.append( ;Secure );
+}
response.addHeader( Set-Cookie,
buf.toString());
if( debug0) log( Setting cookie  + buf );

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [PATCH] Bug 22905 - set secure option in cookie for JSESSIONID when communicating via SSL

2003-09-03 Thread Bill Barker
I know that patches are always welcome, but a variant of this has been in
3.3.2-dev (aka nightly) for a very long time.

- Original Message - 
From: Kubo Hiroshi [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Wednesday, September 03, 2003 12:13 AM
Subject: [PATCH] Bug 22905 - set secure option in cookie for JSESSIONID when
communicating via SSL


 This patch adds  secureCookie option to SessionId Intercepter.

 For example,

 SessionId cookiesFirst=true noCookies=false secureCookie=true /

 If secureCookie is set to be true, cookie for JSESSIONID sent via SSL
connection
 will have Secure option.

 The patch below is for Tomcat-3.3.1a.


 Hiroshi

 ===
 --- src/share/org/apache/tomcat/modules/session/SessionId.java.orig Wed
Sep  3 15:34:11 2003
 +++ src/share/org/apache/tomcat/modules/session/SessionId.java Wed Sep  3
15:04:22 2003
 @@ -96,6 +96,7 @@
  boolean noCookies=false;
  boolean cookiesFirst=true;
  boolean checkSSLSessionId=false;
 +boolean secureCookie=false;

  public SessionId() {
  }
 @@ -112,6 +113,10 @@
  this.checkSSLSessionId = checkSSLSessionId;
  }

 +public void setSecureCookie(boolean secureCookie) {
 +this.secureCookie = secureCookie;
 +}
 +

  /** Extract the session id from the request.
   * SessionInterceptor will have to be called _before_ mapper,
 @@ -341,6 +346,9 @@
   StringBuffer buf = new StringBuffer();
   buf.append( JSESSIONID= ).append( reqSessionId );
   buf.append( ;Path= ).append(  sessionPath  );
 + if ( secureCookie  rrequest.isSecure() ) {
 +buf.append( ;Secure );
 +}
   response.addHeader( Set-Cookie,
   buf.toString());
   if( debug0) log( Setting cookie  + buf );

 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]



This message is intended only for the use of the person(s) listed above as the 
intended recipient(s), and may contain information that is PRIVILEGED and 
CONFIDENTIAL.  If you are not an intended recipient, you may not read, copy, or 
distribute this message or any attachment. If you received this communication in 
error, please notify us immediately by e-mail and then delete all copies of this 
message and any attachments.

In addition you should be aware that ordinary (unencrypted) e-mail sent through the 
Internet is not secure. Do not send confidential or sensitive information, such as 
social security numbers, account numbers, personal identification numbers and 
passwords, to us via ordinary (unencrypted) e-mail.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

mirror-enable tomcat-connector downloads

2003-09-03 Thread Stefan Bodewig
Hi,

as by now you most probably know, all releases should go through
www.apache.org/dist so they will be mirrored and we (the ASF) can save
money as we pay for the transferred data.  For details please see
http://www.apache.org/dev/mirrors.html and
http://jakarta.apache.org/site/convert-to-mirror.html.

Tomcat 4.1 is using the official distribution location, but AFAICS
no connector distribution is doing so.

I'll be happy to help with the migration ranging from giving advice to
doing it myself, just let me know what is needed.

On a related note: How does anybody find the connector distributions?

Yesterday I had a customer who insists on placing Tomcat behind IIS
rant about that damned open source software as he failed to locate
iis_redirect.dll.  He started from the location he used to download
the version bundled with 3.2.4 as he couldn't find a link on Tomcat's
pages.  It's rather hard to find them that way.

Even before Robert changed the Jakarta download pages a few hours ago,
there has been no link to a connector download and I cannot find a
link in Tomcat's part of the Jakarta website at all.

I found the JK2 download by following the link in Tomcat's README in
http://www.apache.org/dist/jakarta/tomcat-4/binaries/, but please
note that (1) mirrors may not display that file at all[1] and (2)
almost nobody is going to see the README after the redesign of the
Jakarta download page.

Cheers

Stefan

Footnotes: 
[1]  for example http://www.apache.de/dist/jakarta/tomcat-4/binaries/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/docs setup.xml

2003-09-03 Thread remm
remm2003/09/03 02:48:16

  Modified:webapps/docs setup.xml
  Log:
  - Too many things are called jsvc: to make it easier to use, the prefix changes
to jsvc-src.
  
  Revision  ChangesPath
  1.5   +1 -1  jakarta-tomcat-catalina/webapps/docs/setup.xml
  
  Index: setup.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/setup.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- setup.xml 16 Aug 2003 03:37:48 -  1.4
  +++ setup.xml 3 Sep 2003 09:48:16 -   1.5
  @@ -82,7 +82,7 @@
   source
   cd $CATALINA_HOME/bin
   tar xvfz jsvc.tar.gz
  -cd jsvc
  +cd jsvc-src
   autoconf
   ./configure
   make
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [Patch] Multiple user patterns in JNDIRealm

2003-09-03 Thread Tim Funk
Thanks Jeff, I'll take a look at this this week.

-Tim

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


Re: mirror-enable tomcat-connector downloads

2003-09-03 Thread Glenn Nielsen
Stefan Bodewig wrote:
Hi,

as by now you most probably know, all releases should go through
www.apache.org/dist so they will be mirrored and we (the ASF) can save
money as we pay for the transferred data.  For details please see
http://www.apache.org/dev/mirrors.html and
http://jakarta.apache.org/site/convert-to-mirror.html.
Tomcat 4.1 is using the official distribution location, but AFAICS
no connector distribution is doing so.
I'll be happy to help with the migration ranging from giving advice to
doing it myself, just let me know what is needed.
We have a release pending for mod_jk 1.2.5, I can take care of this
when I do the release.  I migrated jakarta-taglibs to support the
mirror months ago.  Thanks for the offer to help.
On a related note: How does anybody find the connector distributions?

Yesterday I had a customer who insists on placing Tomcat behind IIS
rant about that damned open source software as he failed to locate
iis_redirect.dll.  He started from the location he used to download
the version bundled with 3.2.4 as he couldn't find a link on Tomcat's
pages.  It's rather hard to find them that way.
Even before Robert changed the Jakarta download pages a few hours ago,
there has been no link to a connector download and I cannot find a
link in Tomcat's part of the Jakarta website at all.
I found the JK2 download by following the link in Tomcat's README in
http://www.apache.org/dist/jakarta/tomcat-4/binaries/, but please
note that (1) mirrors may not display that file at all[1] and (2)
almost nobody is going to see the README after the redesign of the
Jakarta download page.
Yeah, this should be made clearer and can be done as part of migrating
mod_jk to support the mirror.  I can publish to the jakarta site so
I will look into this.
Thanks for prodding us Stefan.

Regards,

Glenn



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


Re: mirror-enable tomcat-connector downloads

2003-09-03 Thread Stefan Bodewig
On Wed, 03 Sep 2003, Glenn Nielsen [EMAIL PROTECTED] wrote:

 We have a release pending for mod_jk 1.2.5,

Does that affect JK2 and JNI and what not as well?

 I can take care of this when I do the release.

Please do.  And while you are at it, please move all old releases to
archive.apache.org.

The ultimate goal should be that jakarta/builds is empty (nightlies
are supposed to be on cvs.apache.org for some reason).

Thanks

Stefan

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: mirror-enable tomcat-connector downloads

2003-09-03 Thread Glenn Nielsen


Stefan Bodewig wrote:
On Wed, 03 Sep 2003, Glenn Nielsen [EMAIL PROTECTED] wrote:


We have a release pending for mod_jk 1.2.5,


Does that affect JK2 and JNI and what not as well?

No. Just the mod_jk 1.2 connector source and binary distributions.


I can take care of this when I do the release.


Please do.  And while you are at it, please move all old releases to
archive.apache.org.
Sure.

The ultimate goal should be that jakarta/builds is empty (nightlies
are supposed to be on cvs.apache.org for some reason).
Nightlies were moved to cvs.apache.org a while ago when daedalus was
running out of disk space. Now that jakarta.apache.org and cvs.apache.org
are on the same server it doesn't matter.
Regards,

Glenn

--
Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder|
MOREnet System Programming   |  * if iz ina coment.  |
Missouri Research and Education Network  |  */   |
--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


[PROPOSAL] archive old unmirrored tomcat releases

2003-09-03 Thread robert burrell donkin
(as many you will know) the apache software foundation policy concerning 
releases is now that all releases should be available only through:

1. the main mirrored ASF distribution directories
2. the main ASF archives
tomcat releases are still available through the older unmirrored 
directories. the download statistics (supply by infrastructure) show that 
unmirrored tomcat downloads from these directories are still proving far 
too popular. this is a major issue since the ASF has to pay for bandwidth.

my proposal is that:

1. all available distributables for the latest tomcat 3, tomcat 4 and 
tomcat 5 releases be added to the appropriate mirrored directories and 
linked to jakarta download pages. if necessary, md5's and signatures will 
be created for these distributables. (except for tomcat 3 this should just 
be checking and tidying up).

2. the older releases for tomcat 3, tomcat 4 and tomcat 5 be moved into 
the ASF archives (where they will remain available for download) and that 
all requests be redirected to the main jakarta binary download page where 
the latest release can be downloaded or the link to the archives can be 
followed.

(unless someone else steps forward) i'll volunteer to carry out this work.
 (unless someone corrects me) i'll assume that the decision will proceed 
by lazy consensus. (unless someone forces a vote before then) i'll carry 
out this work sometime after 12 noon GMT on this friday (5th september).

- robert

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


[PATCH] jakarta-servletapi-5 Clarification to IterationTag

2003-09-03 Thread Mark Roth
jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
- Clarified that doAfterBody() is not called if there is no body.
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java,v
retrieving revision 1.6
diff -u -r1.6 IterationTag.java
--- jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java 31 Mar 2003 17:52:26 
-  1.6
+++ jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java 3 Sep 2003 19:53:38 
-
@@ -91,21 +91,23 @@
  *
  * pBEmpty and Non-Empty Action/B
  * p If the TagLibraryDescriptor file indicates that the action must
- * always have an empty action, by an lt;body-contentgt; entry of empty,
- * then the doStartTag() method must return SKIP_BODY.
+ * always have an empty element body, by a lt;body-contentgt; entry of 
+ * empty, then the doStartTag() method must return SKIP_BODY.
  *
- * Otherwise, the doStartTag() method may return SKIP_BODY or
- * EVAL_BODY_INCLUDE.
+ * pNote that which methods are invoked after the doStartTag() depends on
+ * both the return value and on if the custom action element is empty
+ * or not in the JSP page, not on how it's declared in the TLD.
  *
  * p
  * If SKIP_BODY is returned the body is not evaluated, and then doEndTag()
  * is invoked.
  *
  * p
- * If EVAL_BODY_INCLUDE is returned, the body is evaluated and
- * passed through to the current out, then doAfterBody() is invoked
- * and, after zero or more iterations, doEndTag() is invoked.
-*/
+ * If EVAL_BODY_INCLUDE is returned, and the custom action element is not
+ * empty, the body is evaluated and passed through to the current out, 
+ * then doAfterBody() is invoked and, after zero or more iterations, 
+ * doEndTag() is invoked.
+ */
 
 public interface IterationTag extends Tag {
 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 22770] - Logger element within Context element in Context.xml file not getting recognized by Tomcat

2003-09-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22770.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22770

Logger element within Context element in Context.xml file not getting recognized by 
Tomcat

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME



--- Additional Comments From [EMAIL PROTECTED]  2003-09-03 21:19 ---
I have tested this successfully with the TC4-HEAD. The relevant code hasn't 
changed since 4.1.24 so this should also work for you. If you want to deploy a 
web application outside the standard webapps directory with its own 
context.xml then one way is as follows.

(I have shown the filepaths etc as per my setup. You will need to change these 
to match your environment)

1. Open the manager web app.
2. Scroll down to the install section.
3. In the Install directory or WAR file located on server section complete 
the following boxes:
XML Configuration file URL: file:C:/javadev/bug22770/WEB-INF/context.xml
WAR or Directory URL:   file:C:/javadev/bug22770
4. Click install.

The content of my context.xml was:
Context cachingAllowed=true path=/bug22770 docBase=C:\javadev\bug22770 
 Logger className=org.apache.catalina.logger.FileLogger
directory=logs 
debug=0
prefix=localhost_bug22770_log. 
suffix=.txt 
timestamp=true 
verbosity=4/
/Context

I am therefore resolving this bug as WORKSFORME.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java

2003-09-03 Thread kinman
kinman  2003/09/03 14:20:29

  Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
  Log:
  - Use just the class name if package is imported.
  - In tag files, declare request as HttpServletRequest and response
HttpServletResponse, as is the case in servlets.
  
  Revision  ChangesPath
  1.203 +25 -39
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
  
  Index: Generator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
  retrieving revision 1.202
  retrieving revision 1.203
  diff -u -r1.202 -r1.203
  --- Generator.java2 Sep 2003 05:50:47 -   1.202
  +++ Generator.java3 Sep 2003 21:20:28 -   1.203
  @@ -1002,7 +1002,7 @@
   printParams(n, pageParam, page.isLiteral());
   out.println(););
   if (isTagFile || isFragment) {
  -out.printil(throw new javax.servlet.jsp.SkipPageException(););
  +out.printil(throw new SkipPageException(););
   } else {
   out.printil((methodNesting  0) ? return true; : return;);
   }
  @@ -1119,10 +1119,6 @@
   + pageContext, 
   + value.getEL().getMapName()
   + ););
  -/*
  -+ (javax.servlet.jsp.el.VariableResolver) 
pageContext, 
  -+ (javax.servlet.jsp.el.FunctionMapper) this 
););
  -*/
   } else if (value.isNamedAttribute()) {
   // If the value for setProperty was specified via
   // jsp:attribute, first generate code to evaluate
  @@ -2186,7 +2182,7 @@
   .doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE));
   out.pushIndent();
   if (isTagFile || isFragment) {
  -out.printil(throw new javax.servlet.jsp.SkipPageException(););
  +out.printil(throw new SkipPageException(););
   } else {
   out.printil((methodNesting  0) ? return true; : return;);
   }
  @@ -3046,7 +3042,7 @@
   out.printil(} catch (Throwable t) {);
   out.pushIndent();
   out.printil(
  -if (!(t instanceof javax.servlet.jsp.SkipPageException)){);
  +if (!(t instanceof SkipPageException)){);
   out.pushIndent();
   out.printil(out = _jspx_out;);
   out.printil(if (out != null  out.getBufferSize() != 0));
  @@ -3227,7 +3223,7 @@
   
   // Now the doTag() method
   out.printil(
  -public void doTag() throws javax.servlet.jsp.JspException, 
java.io.IOException {);
  +public void doTag() throws JspException, java.io.IOException {);
   
   if (ctxt.isPrototypeMode()) {
   out.printil(});
  @@ -3240,27 +3236,17 @@
   out.printil(PageContext pageContext = (PageContext)jspContext;);
   
   // Declare implicit objects.  
  -// XXX - Note that the current JSP 2.0 PFD 
  -// spec is unclear about whether these are required
  -// XXX - Optimization: Check scriptlets and expressions for the
  -// use of any of these.  They're not likely to be used.  If they're
  -// not used, get rid of them.
  -out.printil(
  -javax.servlet.ServletRequest request = 
  -+ pageContext.getRequest(););
  -out.printil(
  -javax.servlet.ServletResponse response = 
  -+ pageContext.getResponse(););
   out.printil(
  -javax.servlet.http.HttpSession session = 
  -+ pageContext.getSession(););
  +HttpServletRequest request = 
  ++ (HttpServletRequest) pageContext.getRequest(););
   out.printil(
  -javax.servlet.ServletContext application = 
  -+ pageContext.getServletContext(););
  +HttpServletResponse response = 
  ++ (HttpServletResponse) pageContext.getResponse(););
  +out.printil(HttpSession session = pageContext.getSession(););
   out.printil(
  -javax.servlet.ServletConfig config = 
  -+ pageContext.getServletConfig(););
  -out.printil(javax.servlet.jsp.JspWriter out = jspContext.getOut(););
  +ServletContext application = pageContext.getServletContext(););
  +out.printil(ServletConfig config = pageContext.getServletConfig(););
  +out.printil(JspWriter out = jspContext.getOut(););
   if (isPoolingEnabled  !tagHandlerPoolNames.isEmpty()) {
   out.printil(_jspInit(config););
   }
  @@ -3284,15 +3270,15 @@
   // helper method is declared to throw Throwable.
   out.printil(} 

DO NOT REPLY [Bug 22426] - cannot resolve getContextPath on ServletRequest

2003-09-03 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22426.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22426

cannot resolve getContextPath on ServletRequest





--- Additional Comments From [EMAIL PROTECTED]  2003-09-03 21:39 ---
After thinking about this issue more, I have decided that there's no harm in
making request a HttpServletRequest and response a HttpServletRequest in a tag
file.  Though this is not strictly necessary according to the spec, it will make
page authors' life easier, and is consistent with those objects in a servlet. 
The latest source includes such changes.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteResponse.java

2003-09-03 Thread luehe
luehe   2003/09/03 15:10:33

  Modified:catalina/src/share/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  Fixed Bugtraq 4916164 (Tomcat's default charset for Preferred locale
  overrides page directive)
  
  The HTTP spec mandates that in:
  
media-type = type / subtype *( ; parameter )
parameter  = attribute = value
  
  there be no (linear) white space between the type and subtype, nor
  between an attribute and its value, but it does not make any statement
  about the number of spaces surrounding the semicolon.
  
  The HTTP spec itself has this example:
  
Content-Type: text/html; charset=ISO-8859-4
  
  Revision  ChangesPath
  1.8   +27 -6 
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CoyoteResponse.java   2 Sep 2003 21:21:59 -   1.7
  +++ CoyoteResponse.java   3 Sep 2003 22:10:33 -   1.8
  @@ -713,9 +713,30 @@
   return;
   
   coyoteResponse.setContentType(type);
  -if ((type != null)  (type.indexOf(;charset=) != -1)) {
  -isCharacterEncodingSet = true;
  +
  +// Check to see if content type contains charset
  +if (type != null) {
  +int index = type.indexOf(;);
  +if (index != -1) {
  +int len = type.length();
  +index++;
  +while (index  len  Character.isSpace(type.charAt(index))) {
  +index++;
  +}
  +if (index+7  len
  + type.charAt(index) == 'c'
  + type.charAt(index+1) == 'h'
  + type.charAt(index+2) == 'a'
  + type.charAt(index+3) == 'r'
  + type.charAt(index+4) == 's'
  + type.charAt(index+5) == 'e'
  + type.charAt(index+6) == 't'
  + type.charAt(index+7) == '=') {
  +isCharacterEncodingSet = true;
  +}
  +}
   }
  +
   isContentTypeSet = true;
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext IterationTag.java

2003-09-03 Thread kinman
kinman  2003/09/03 16:18:33

  Modified:jsr152/src/share/javax/servlet/jsp/tagext IterationTag.java
  Log:
  - Patch by Mark Roth:
  
Clarified that doAfterBody() is not called if there is no body.
  
  Revision  ChangesPath
  1.7   +10 -8 
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
  
  Index: IterationTag.java
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- IterationTag.java 31 Mar 2003 17:52:26 -  1.6
  +++ IterationTag.java 3 Sep 2003 23:18:32 -   1.7
  @@ -91,21 +91,23 @@
*
* pBEmpty and Non-Empty Action/B
* p If the TagLibraryDescriptor file indicates that the action must
  - * always have an empty action, by an lt;body-contentgt; entry of empty,
  - * then the doStartTag() method must return SKIP_BODY.
  + * always have an empty element body, by a lt;body-contentgt; entry of 
  + * empty, then the doStartTag() method must return SKIP_BODY.
*
  - * Otherwise, the doStartTag() method may return SKIP_BODY or
  - * EVAL_BODY_INCLUDE.
  + * pNote that which methods are invoked after the doStartTag() depends on
  + * both the return value and on if the custom action element is empty
  + * or not in the JSP page, not on how it's declared in the TLD.
*
* p
* If SKIP_BODY is returned the body is not evaluated, and then doEndTag()
* is invoked.
*
* p
  - * If EVAL_BODY_INCLUDE is returned, the body is evaluated and
  - * passed through to the current out, then doAfterBody() is invoked
  - * and, after zero or more iterations, doEndTag() is invoked.
  -*/
  + * If EVAL_BODY_INCLUDE is returned, and the custom action element is not
  + * empty, the body is evaluated and passed through to the current out, 
  + * then doAfterBody() is invoked and, after zero or more iterations, 
  + * doEndTag() is invoked.
  + */
   
   public interface IterationTag extends Tag {
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [PATCH] Tomcat5 StatusManagerServlet

2003-09-03 Thread Kazuhiro Kazama
Hi, 

I requested Remy to update Japanese messages and they are done. Thank
you, Remy!

But the following patch isn't applied to StatusManagerServlet.java yet
and a part of messages aren't displayed correctly. Would you include
this change?

From: TANAKA Yoshihiro [EMAIL PROTECTED]
Subject: [PATCH] Tomcat5 StatusManagerServlet
Date: Fri, 29 Aug 2003 01:39:11 +0900
Message-ID: [EMAIL PROTECTED]
 I couldn't get correct Japanese messages on Server Status
 in the HTML manager screen because the StatusManagerServlet of TC5
 has a problem about i18n.

Kazuhiro Kazama ([EMAIL PROTECTED]) NTT Network Innovation Laboratories

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]