DO NOT REPLY [Bug 18264] New: - jsp:getProperty truncates bean data at first blank

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=18264

jsp:getProperty truncates bean data at first blank

   Summary: jsp:getProperty truncates bean data at first blank
   Product: Tomcat 3
   Version: 3.3.1 Final
  Platform: All
OS/Version: All
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Servlet
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Using jsp:getProperty to retrieve the value of a property stored in a bean and display 
it in an 
input text field of a form (i.e. setting existing value in a form field for editing).  
If the bean's 
property value is a string with blanks, the form field displays only the characters up 
to the first 
blank.

If the get method is altered to convert blanks to (say) '+' characters before 
returning the value, then the entire string is displayed in the form.

Result is identical for 
both Opera and IE browsers.

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

DO NOT REPLY [Bug 18261] New: - JavaDoc for HttpServletResponse.setStatus not fully displayed in browser

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=18261

JavaDoc for HttpServletResponse.setStatus not fully displayed in browser

   Summary: JavaDoc for HttpServletResponse.setStatus not fully
displayed in browser
   Product: Tomcat 4
   Version: 4.1.18
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Servlet & JSP API
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The doco reads when viewed in browser "If there is an error, and the caller 
wishes to invoke an defined in the web applicaion".  Note the word missing 
between "an" and "defined".

This is probably due to the browser interpreting  in the source 
JavaDoc as markup.

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

Re: [5.0] Monitor servlet

[Tim Funk]

Looks good. Can I propose an (close) alternative?

Can the status servlet produce an XML document? Then the XML document 
can either parsed by some third party app or it can be transformed in 
place to anyone's liking via XSLT.

Attached are examples of a (very) quick example of what I mean. There 
should be 2 attachments, StatusManagerServlet2 and xform.xsl. The 
servlet can take an additional parameter xsltFileName which will 
transform the output. If not specified, then the raw xml will be 
produced. So to change the look and feel - all you need to do is change 
the init parameter.

If anyone wishes to suggest what the xml dtd should look like, I have no 
attachments to the code above. It was a quick proof of concept.

For those writing monitoring applications and wish not to use JMX to 
pull their measurements, an XML doc could be a convenient alternative.

-Tim

Remy Maucherat wrote:
Remy Maucherat wrote:

Hi,

I proposed that to Costin a few days ago, but got not so enthusiastic 
comments.
The idea would be to add a new monitor servlet to the manager webapp. 
It would generate data similar to http://www.apache.org/server-status. 
It would mostly (exclusively ?) use JMX to retrieve the components 
statistics.

That's not a high priority task for me, but something I'd like to get 
done eventually, and I'm looking for some feedback. I understand that 
there are existing agents for JMX that can be used to provide more 
powerful remote access to the statistics (HTTP, RMI, etc), but these 
tools do not have the ability to give a user a quick and comprehensive 
look at the Tomcat status (although they allow much more complex 
operations, and it's not my objective to replace them).


I've committed a rough version of the monitoring servlet. It will 
display status information for all Coyote connectors, using JMX 
exclusively. I don't think there's any statistic missing (the amount of 
meaningful status information available to a Java program is definitely 
much lower than for a native Unix program, hence the "simpler" look when 
compared to the Apache status).

The thing is very rough, and could use contributions (hint, hint) :)

As for using it, the monitor servlet is linked from the default Tomcat 
welcome page. It currently requires the same credentials as the rest of 
the manager webapp to access.

Remy

 


http://www.w3.org/1999/XSL/Transform";
  version="1.0">

  
  

  


	Tomcat Status
		
			body, table, tr, td, a, div, span {
vertical-align : top;
			}
		


  Tomcat Status

  
  
 

  

  
   
  

  

		 JVM:
		 free: 
		 total: 
		 max: 
	   

  

  
	 Connector --  

  	
  	
  	
  

  

		 threadInfo 
		 maxThreads: 
		 minSpareThreads: 
		 maxSpareThreads: 
		 currentThreadCount: 
		 currentThreadsBusy: 
	   

  

  

		 requestInfo 
		 maxTime: 
		 processingTime: 
		 requestCount: 
		 errorCount: 
		 bytesReceived: 
		 bytesSent: 
	   

  

  
   
StageTimeB SentB RecvClientVHostRequest
  	

   
  

  
   










   
  


/*
 * $Header: Exp $
 * $Revision:   $
 * $Date:   $
 *
 * 
 *
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 1999 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *notice, this list of conditions and the following disclaimer in
 *the documentation and/or other materials provided with the
 *distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *any, must include the following acknowlegement:
 *   "This product includes software developed by the
 *Apache Software Foundation (http://www.apache.org/)."
 *Alternately, this acknowlegement may appear in the software itself,
 *if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
 *Foundation" must not be used to endorse or promote products derived
 *from this software without prior written permission. For written
 *permission, please contact [EMAIL PROTECTED]
 *
 * 5. Products derived from this software may not be called "Apache"
 *nor may "Apache" appear in their names without prior written
 *permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR P

Re: [5.0] Monitor servlet

[Jean-Francois Arcand]

Hi Remy,

the servlet doesn't compile with JDK 1.3.x :

StatusManagerServlet.java:274: cannot resolve symbol
   [javac] symbol  : method maxMemory  ()
   [javac] location: class java.lang.Runtime
   [javac] writer.print(Runtime.getRuntime().maxMemory());
   [javac]^
   [javac] Note: Some input files use or override a deprecated API.
   [javac] Note: Recompile with -deprecation for details.
   [javac] 1 error
This method is only available with JDK 1.4 +.

-- Jeanfrancois

Remy Maucherat wrote:

Remy Maucherat wrote:

Hi,

I proposed that to Costin a few days ago, but got not so enthusiastic 
comments.
The idea would be to add a new monitor servlet to the manager webapp. 
It would generate data similar to 
http://www.apache.org/server-status. It would mostly (exclusively ?) 
use JMX to retrieve the components statistics.

That's not a high priority task for me, but something I'd like to get 
done eventually, and I'm looking for some feedback. I understand that 
there are existing agents for JMX that can be used to provide more 
powerful remote access to the statistics (HTTP, RMI, etc), but these 
tools do not have the ability to give a user a quick and 
comprehensive look at the Tomcat status (although they allow much 
more complex operations, and it's not my objective to replace them).


I've committed a rough version of the monitoring servlet. It will 
display status information for all Coyote connectors, using JMX 
exclusively. I don't think there's any statistic missing (the amount 
of meaningful status information available to a Java program is 
definitely much lower than for a native Unix program, hence the 
"simpler" look when compared to the Apache status).

The thing is very rough, and could use contributions (hint, hint) :)

As for using it, the monitor servlet is linked from the default Tomcat 
welcome page. It currently requires the same credentials as the rest 
of the manager webapp to access.

Remy

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



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

DO NOT REPLY [Bug 15084] - preloaded jsp's have their init method called again on first hit

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=15084

preloaded jsp's have their init method called again on first hit





--- Additional Comments From [EMAIL PROTECTED]  2003-03-23 19:08 ---
*** Bug 18258 has been marked as a duplicate of this bug. ***

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

DO NOT REPLY [Bug 18258] - preloaded jsp's have their init method called again on first hit

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=18258

preloaded jsp's have their init method called again on first hit

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE



--- Additional Comments From [EMAIL PROTECTED]  2003-03-23 19:08 ---
I had already commented on the original bug (and had examined carefully your
test case), and determined it was not a bug. Please don't file duplicates, it
does not help (you can update the original bug instead).

*** This bug has been marked as a duplicate of 15084 ***

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

DO NOT REPLY [Bug 18258] - preloaded jsp's have their init method called again on first hit

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=18258

preloaded jsp's have their init method called again on first hit





--- Additional Comments From [EMAIL PROTECTED]  2003-03-23 19:01 ---
Created an attachment (id=5471)
test war file

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

DO NOT REPLY [Bug 18258] New: - preloaded jsp's have their init method called again on first hit

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=18258

preloaded jsp's have their init method called again on first hit

   Summary: preloaded jsp's have their init method called again on
first hit
   Product: Tomcat 4
   Version: 4.1.24
  Platform: All
OS/Version: All
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


If you have a jsp with a jspInit method, and you preload this jsp, the jspInit 
method gets called, as it should, upon server startup. But now if you hit that 
jsp with your web browser, Tomcat calls the jspInit method again. (If you hit 
the jsp a second time, it's ok, doesn't call jspInit a third time.)
I will attach a war file that demonstrates this problem. Simply load this 
application (test_app.war) and two pages (preload1.jsp, preload2.jsp) each 
print out that their jspInit methods are called. Then hit the pages 
(http://host:port/test_app/preload1.jsp, etc.) and see that they print out (to 
System.out) that their jspInit methods are called once more.

Note I did previously file this same bug against Tomcat 4.1.16 (bug#15084) but 
I thought it was probably good to file again against the current release
so it is clear the problem still exists.

Why this is issue is important to me: I often do something fairly intenstive 
in my init methods, like load some data from a database (to cache it) - I don't
want this happening twice for no good reason.

Please note that other servlet containers, including Tomcat 3.x, Tomcat 4.0.6, 
Weblogic 7, and Resin, don't exhibit this "double-init" behavior.

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

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java

[remm]

remm2003/03/23 10:58:29

  Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
  Log:
  - Set the state as ended when going out of the loop (otherwise, threads
get reported as keepalive).
  
  Revision  ChangesPath
  1.63  +4 -5  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
  
  Index: Http11Processor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- Http11Processor.java  23 Mar 2003 16:08:48 -  1.62
  +++ Http11Processor.java  23 Mar 2003 18:58:29 -  1.63
  @@ -663,11 +663,8 @@
   }
   
   thrA.setCurrentStage(threadPool, "ended");
  -if (keepAlive) {
  -rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
  -} else {
  -rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
  -}
  +rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
  +
   // Don't reset the param - we'll see it as ended. Next request
   // will reset it
   // thrA.setParam(null);
  @@ -676,6 +673,8 @@
   outputBuffer.nextRequest();
   
   }
  +
  +rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
   
   // Recycle
   inputBuffer.recycle();
  
  
  

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets StatusManagerServlet.java

[remm]

remm2003/03/23 10:10:07

  Modified:catalina/src/share/org/apache/catalina/servlets
StatusManagerServlet.java
  Log:
  - Can't depend on the Coyote API from here.
  - Add case for unknown stage and prepare stage.
  
  Revision  ChangesPath
  1.3   +18 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/StatusManagerServlet.java
  
  Index: StatusManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/StatusManagerServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StatusManagerServlet.java 23 Mar 2003 16:31:19 -  1.2
  +++ StatusManagerServlet.java 23 Mar 2003 18:10:07 -  1.3
  @@ -365,31 +365,38 @@
   
   switch (stage) {
   
  -case (org.apache.coyote.Constants.STAGE_PARSE):
  +case (1/*org.apache.coyote.Constants.STAGE_PARSE*/):
   writer.write("P");
   fullStatus = false;
   break;
  -case (org.apache.coyote.Constants.STAGE_SERVICE):
  +case (2/*org.apache.coyote.Constants.STAGE_PREPARE*/):
  +writer.write("P");
  +fullStatus = false;
  +break;
  +case (3/*org.apache.coyote.Constants.STAGE_SERVICE*/):
   writer.write("S");
   break;
  -case (org.apache.coyote.Constants.STAGE_ENDINPUT):
  +case (4/*org.apache.coyote.Constants.STAGE_ENDINPUT*/):
   writer.write("F");
   break;
  -case (org.apache.coyote.Constants.STAGE_ENDOUTPUT):
  +case (5/*org.apache.coyote.Constants.STAGE_ENDOUTPUT*/):
   writer.write("F");
   break;
  -case (org.apache.coyote.Constants.STAGE_ENDED):
  +case (7/*org.apache.coyote.Constants.STAGE_ENDED*/):
   writer.write("R");
   fullStatus = false;
   break;
  -case (org.apache.coyote.Constants.STAGE_KEEPALIVE):
  +case (6/*org.apache.coyote.Constants.STAGE_KEEPALIVE*/):
   writer.write("K");
   fullStatus = false;
   break;
  -case (org.apache.coyote.Constants.STAGE_NEW):
  +case (0/*org.apache.coyote.Constants.STAGE_NEW*/):
   writer.write("R");
   fullStatus = false;
   break;
  +default:
  +writer.write("?");
  +fullStatus = false;
   
   }
   
  
  
  

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

Re: [5.0] Monitor servlet

[Remy Maucherat]

Remy Maucherat wrote:
Hi,

I proposed that to Costin a few days ago, but got not so enthusiastic 
comments.
The idea would be to add a new monitor servlet to the manager webapp. It 
would generate data similar to http://www.apache.org/server-status. It 
would mostly (exclusively ?) use JMX to retrieve the components statistics.

That's not a high priority task for me, but something I'd like to get 
done eventually, and I'm looking for some feedback. I understand that 
there are existing agents for JMX that can be used to provide more 
powerful remote access to the statistics (HTTP, RMI, etc), but these 
tools do not have the ability to give a user a quick and comprehensive 
look at the Tomcat status (although they allow much more complex 
operations, and it's not my objective to replace them).
I've committed a rough version of the monitoring servlet. It will 
display status information for all Coyote connectors, using JMX 
exclusively. I don't think there's any statistic missing (the amount of 
meaningful status information available to a Java program is definitely 
much lower than for a native Unix program, hence the "simpler" look when 
compared to the Apache status).

The thing is very rough, and could use contributions (hint, hint) :)

As for using it, the monitor servlet is linked from the default Tomcat 
welcome page. It currently requires the same credentials as the rest of 
the manager webapp to access.

Remy

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets StatusManagerServlet.java

[remm]

remm2003/03/23 08:31:19

  Modified:catalina/src/share/org/apache/catalina/servlets
StatusManagerServlet.java
  Log:
  - Add basic JVM memroy patches.
  
  Revision  ChangesPath
  1.2   +36 -16
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/StatusManagerServlet.java
  
  Index: StatusManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/StatusManagerServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StatusManagerServlet.java 23 Mar 2003 16:10:10 -  1.1
  +++ StatusManagerServlet.java 23 Mar 2003 16:31:19 -  1.2
  @@ -238,13 +238,12 @@
   
   PrintWriter writer = response.getWriter();
   
  -// Display virtual machine statistics
  -// FIXME
  -
  -Enumeration enum = threadPools.elements();
  -
   try {
   
  +// Display virtual machine statistics
  +writeVMState(writer);
  +
  +Enumeration enum = threadPools.elements();
   while (enum.hasMoreElements()) {
   ObjectName objectName = (ObjectName) enum.nextElement();
   String name = objectName.getKeyProperty("name");
  @@ -259,6 +258,27 @@
   
   
   /**
  + * Write virtual machine state.
  + */
  +protected void writeVMState(PrintWriter writer)
  +throws Exception {
  +
  +writer.print("JVM");
  +writer.print("");
  +
  +writer.print(" Free memory: ");
  +writer.print(Runtime.getRuntime().freeMemory());
  +writer.print(" Total memory: ");
  +writer.print(Runtime.getRuntime().totalMemory());
  +writer.print(" Max memory: ");
  +writer.print(Runtime.getRuntime().maxMemory());
  +
  +writer.print("");
  +
  +}
  +
  +
  +/**
* Write connector state.
*/
   protected void writeConnectorState(PrintWriter writer, 
  @@ -389,17 +409,17 @@
(pName, "requestBytesReceived"));
   writer.write("");
   writer.write("");
  -writer.print(mBeanServer.getAttribute(pName, "remoteAddr"));
  +writer.print("" + mBeanServer.getAttribute(pName, "remoteAddr"));
   writer.write("");
   writer.write("");
  -writer.write(filter(mBeanServer.getAttribute
  -(pName, "virtualHost").toString()));
  +writer.write("" + filter(mBeanServer.getAttribute
  + (pName, "virtualHost").toString()));
   writer.write("");
   writer.write("");
  -writer.write(filter(mBeanServer.getAttribute
  -(pName, "method").toString()));
  -writer.write(filter(mBeanServer.getAttribute
  -(pName, "currentUri").toString()));
  +writer.write("" + filter(mBeanServer.getAttribute
  + (pName, "method").toString()));
  +writer.write("" + filter(mBeanServer.getAttribute
  + (pName, "currentUri").toString()));
   String queryString = (String) mBeanServer.getAttribute
   (pName, "currentQueryString");
   if ((queryString != null) && (!queryString.equals(""))) {
  
  
  

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

cvs commit: jakarta-tomcat-catalina/webapps/ROOT index.jsp

[remm]

remm2003/03/23 08:13:57

  Modified:webapps/ROOT index.jsp
  Log:
  - Add link to status.
  
  Revision  ChangesPath
  1.10  +1 -0  jakarta-tomcat-catalina/webapps/ROOT/index.jsp
  
  Index: index.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/ROOT/index.jsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- index.jsp 15 Jan 2003 12:03:07 -  1.9
  +++ index.jsp 23 Mar 2003 16:13:57 -  1.10
  @@ -66,6 +66,7 @@
   
   
   
  +Status
   Tomcat Administration
   Tomcat Manager
    
  
  
  

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

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF web.xml

[remm]

remm2003/03/23 08:10:21

  Modified:webapps/manager/WEB-INF web.xml
  Log:
  - Add embyo of a new status servlet.
  
  Revision  ChangesPath
  1.5   +13 -0 jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml
  
  Index: web.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- web.xml   24 Jan 2003 18:09:28 -  1.4
  +++ web.xml   23 Mar 2003 16:10:21 -  1.5
  @@ -34,6 +34,14 @@
 2
   
 
  +  
  +Status
  +org.apache.catalina.servlets.StatusManagerServlet
  +
  +  debug
  +  0
  +
  +  
   
 
 
  @@ -85,6 +93,10 @@
 /resources
 
 
  +Status
  +/status
  +  
  +  
   HTMLManager
   /html/*
 
  @@ -118,6 +130,7 @@
 /undeploy
 /reload
 /serverinfo
  +  /status
 /roles
 /resources
   
  
  
  

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets StatusManagerServlet.java

[remm]

remm2003/03/23 08:10:10

  Added:   catalina/src/share/org/apache/catalina/servlets
StatusManagerServlet.java
  Log:
  - Add embyo of a new status servlet.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/StatusManagerServlet.java
  
  Index: StatusManagerServlet.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/StatusManagerServlet.java,v
 1.1 2003/03/23 16:10:10 remm Exp $
   * $Revision: 1.1 $
   * $Date: 2003/03/23 16:10:10 $
   *
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *any, must include the following acknowlegement:
   *   "This product includes software developed by the
   *Apache Software Foundation (http://www.apache.org/)."
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
   *Foundation" must not be used to endorse or promote products derived
   *from this software without prior written permission. For written
   *permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *nor may "Apache" appear in their names without prior written
   *permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * .
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  
  package org.apache.catalina.servlets;
  
  
  import java.io.IOException;
  import java.io.PrintWriter;
  import java.util.Enumeration;
  import java.util.Iterator;
  import java.util.Set;
  import java.util.Vector;
  
  import javax.management.MBeanServer;
  import javax.management.MBeanServerNotification;
  import javax.management.Notification;
  import javax.management.NotificationListener;
  import javax.management.ObjectInstance;
  import javax.management.ObjectName;
  
  import javax.servlet.ServletException;
  import javax.servlet.UnavailableException;
  import javax.servlet.http.HttpServlet;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  
  import org.apache.commons.modeler.Registry;
  
  /**
   * This servlet will display a complete status of the HTTP/1.1 connector.
   *
   * @author Remy Maucherat
   * @version $Revision: 1.1 $ $Date: 2003/03/23 16:10:10 $
   */
  
  public class StatusManagerServlet
  extends HttpServlet implements NotificationListener {
  
  
  // - Instance Variables
  
  
  /**
   * The debugging detail level for this servlet.
   */
  private int debug = 0;
  
  
  /**
   * MBean server.
   */
  protected MBeanServer mBeanServer = null;
  
  
  /**
   * Vector of protocol handlers object names.
   */
  protected Vector protocolHandlers = new Vector();
  
  
  /**
 

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java

[remm]

remm2003/03/23 08:08:48

  Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
  Log:
  - Make a difference between keepalive and ended.
  
  Revision  ChangesPath
  1.62  +5 -1  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
  
  Index: Http11Processor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- Http11Processor.java  23 Mar 2003 08:50:16 -  1.61
  +++ Http11Processor.java  23 Mar 2003 16:08:48 -  1.62
  @@ -663,7 +663,11 @@
   }
   
   thrA.setCurrentStage(threadPool, "ended");
  -rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
  +if (keepAlive) {
  +rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
  +} else {
  +rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
  +}
   // Don't reset the param - we'll see it as ended. Next request
   // will reset it
   // thrA.setParam(null);
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote Constants.java RequestInfo.java

[remm]

remm2003/03/23 08:07:33

  Modified:coyote/src/java/org/apache/coyote Constants.java
RequestInfo.java
  Log:
  - Add additional request time statistics.
  
  Revision  ChangesPath
  1.4   +2 -1  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Constants.java
  
  Index: Constants.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Constants.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Constants.java23 Mar 2003 08:49:48 -  1.3
  +++ Constants.java23 Mar 2003 16:07:33 -  1.4
  @@ -93,7 +93,8 @@
   public static final int STAGE_SERVICE = 3;
   public static final int STAGE_ENDINPUT = 4;
   public static final int STAGE_ENDOUTPUT = 5;
  -public static final int STAGE_ENDED = 6;
  +public static final int STAGE_KEEPALIVE = 6;
  +public static final int STAGE_ENDED = 7;
   
   
   }
  
  
  
  1.3   +16 -0 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestInfo.java
  
  Index: RequestInfo.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RequestInfo.java  23 Mar 2003 08:49:48 -  1.2
  +++ RequestInfo.java  23 Mar 2003 16:07:33 -  1.3
  @@ -101,6 +101,10 @@
   //  Information about the current request  ---
   // This is usefull for long-running requests only
   
  +public String getMethod() {
  +return req.method().toString();
  +}
  +
   public String getCurrentUri() {
   return req.requestURI().toString();
   }
  @@ -127,6 +131,18 @@
   
   public int getContentLength() {
   return req.getContentLength();
  +}
  +
  +public long getRequestBytesReceived() {
  +return req.getBytesRead();
  +}
  +
  +public long getRequestBytesSent() {
  +return req.getResponse().getBytesWritten();
  +}
  +
  +public long getRequestProcessingTime() {
  +return (System.currentTimeMillis() - req.getStartTime());
   }
   
   //  Statistical data  
  
  
  

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

Bug report for Tomcat 4 [2003/03/23]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 2820|Opn|Enh|2001-07-26|Implement GZIPOutput on HTTP 1.1 Connector|
| 2885|Opn|Maj|2001-07-30|JspCompiler does not recompile changed JSP's  |
| 2902|Opn|Maj|2001-07-30|Duplicate Context path returned by getRealPath()  |
| 3509|Ass|Blk|2001-09-07|Apache 1.3.20 & mod_webapp & Tomcat 4b7 HANGS unde|
| 3515|Opn|Enh|2001-09-10|Processes hanging after stopping Tomcat   |
| 3770|Opn|Maj|2001-09-21|HttpSessionListener.sessionCreated() called twice |
| 3774|Opn|Nor|2001-09-21|Error loading web.xml on root context when specifi|
| 3815|Opn|Min|2001-09-25|JspServlets produces NullPointerException |
| 3888|Opn|Blk|2001-09-30|WebappClassLoader: Lifecycle error : CL stopped   |
| 4023|Opn|Min|2001-10-08|exceptions that terminate engine should be saved i|
| 4042|Ass|Enh|2001-10-09|webapp component requires Port directive versus Li|
| 4138|Opn|Nor|2001-10-12|Processor threads have inconsistent ClassLoader st|
| 4212|Ass|Enh|2001-10-16|How to configure Apache to serve static contents? |
| 4217|Opn|Nor|2001-10-16|Mis-named SetCharacterEncodingFilter.clas in distr|
| 4236|Opn|Cri|2001-10-17|error in translation of tag attribute value,  stri|
| 4350|Ass|Nor|2001-10-22|SSLAuthenticator did not associate SSO session|
| 4352|Ass|Nor|2001-10-22|JDBCRealm does not work with CLIENT-CERT auth-meth|
| 4371|Unc|Nor|2001-10-23|No responses on browsing root when using WarpConne|
| 4500|New|Nor|2001-10-29|isapi_redirect.dll does not pass Client certificat|
| 4663|Opn|Maj|2001-11-05|Broken Pipe under some load   |
| 4829|Opn|Enh|2001-11-13|Automatic deployment of war files does not work pr|
| 4930|Ass|Maj|2001-11-16|java.io.StreamCorruptedException: Type code out of|
| 5143|New|Enh|2001-11-27|Please allow to specify the cipher set for HTTPS c|
| 5199|Opn|Nor|2001-11-30| in  section not correct  |
| 5229|New|Blk|2001-12-02|Session cannot unbind if using DistributedManager |
| 5329|New|Nor|2001-12-08|NT Service exits startup before Tomcat is finished|
| 5405|New|Enh|2001-12-13|Powered by Tomcat |
| 5585|Opn|Nor|2001-12-24|Error page not displayed  |
| 5704|Ass|Maj|2002-01-05|CgiServlet corrupting images? |
| 5709|Opn|Nor|2002-01-06|HttpServletRequest.getHost returns web server addr|
| 5715|Opn|Nor|2002-01-07|response.setContentType() in Filter.doFilter not c|
| 5759|Opn|Maj|2002-01-09|CGI servlet mapping by extension *.cgi does not wo|
| 5762|Opn|Maj|2002-01-09|CGI servlet misses to include port number in HTTP_|
| 5764|New|Enh|2002-01-09|Key Information Missing--Automatic Application Dep|
| 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob|
| 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi|
| 5858|New|Enh|2002-01-15|Add tomcat dir to java.library.path   |
| 5952|Opn|Nor|2002-01-22|Refence to $JAVACMD  in tomcat.conf incorrect in R|
| 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio|
| 6036|Ass|Blk|2002-01-25|Problems with URI mapping |
| 6048|Ass|Nor|2002-01-26|JDBC pool unavailable while using WARP connector  |
| 6049|New|Nor|2002-01-26|jsp-version should be 1.2 |
| 6058|New|Enh|2002-01-27|Generated java files not in a correct package |
| 6118|New|Enh|2002-01-30|Ambiguous error message for syntax errors |
| 6194|Opn|Nor|2002-02-02|Unable to unpack wars without freezing?   |
| 6218|Opn|Nor|2002-02-04|Relative links broken for servlets|
| 6228|Ass|Cri|2002-02-04|res.sendError sends blank page.   |
| 6229|New|Enh|2002-02-04|Need way to specify where to write catalina.out   |
| 6279|New|Nor|2002-02-06|Resubmit to j_security_check mistakenly fetches a |
| 6399|New|Nor|2002-02-12|unknown protocol: https   |
| 6408|New|Enh|2002-02-12|Starting tomcat from a cygwin bash shell using 'st|
| 6457|New|Cri|2002-02-14|mod_j

Bug report for Tomcat 3 [2003/03/23]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|  258|Unc|Nor|2000-11-27|response.SendRedirect() resets/destroys Cookies th|
| 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt|
| 2478|Opn|Cri|2001-07-06|Passing Session variables between JSP's and Servle|
| 4551|Opn|Nor|2001-10-31|Ctx( /tt01 ): IOException in: R( /tt01 + /com/abc/|
| 4893|Unc|Blk|2001-11-15|Tomcat dies with following error..|
| 4980|New|Min|2001-11-20|Startup message indicates incorrect log file  |
| 4994|New|Nor|2001-11-21|Tomcat needs a mechanism for clean and certain shu|
| 5064|New|Cri|2001-11-25|Socket write error when include files is more than|
| 5108|New|Maj|2001-11-26|Docs for Tomcat 3.2.x appear to be for Tomcat 3.3 |
| 5137|New|Nor|2001-11-27|Null pointer in class loader after attempting to r|
| 5160|Unc|Maj|2001-11-28|'IllegalStateException'   |
| 5331|New|Nor|2001-12-09|getPathInfo vs URL normalization  |
| 5510|New|Blk|2001-12-19|How to call ejb deployed in JBoss from Tomcat serv|
| 5756|New|Nor|2002-01-08|jspc.bat exits with wrong ERRORLEVEL  |
| 5797|New|Nor|2002-01-10|UnCatched ? StringIndexOutOfBoundsException: Strin|
| 6027|New|Maj|2002-01-25|Tomcat  Automatically shuts down as service   |
| 6168|New|Blk|2002-02-01|IllegalStateException |
| 6451|New|Cri|2002-02-14|Stackoverflow |
| 6478|New|Enh|2002-02-14|Default Tomcat Encoding   |
| 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c|
| 6648|New|Nor|2002-02-25|jakarta-servletapi build with java 1.4 javadoc err|
| 6702|New|Cri|2002-02-27|win 2k services not working   |
| 6796|New|Cri|2002-03-01|Tomcat dies periodically  |
| 6989|New|Maj|2002-03-08|Unable to read tld file during parallel JSP compil|
| 7008|Opn|Maj|2002-03-10|facade.HttpServletRequestFacade.getParameter(HttpS|
| 7013|New|Cri|2002-03-10|Entering a servlet path with non-ISO8859-1 charact|
| 7227|New|Nor|2002-03-19| directive don't work |
| 7236|New|Blk|2002-03-19|Permission denied to do thread.stop   |
| 7626|New|Nor|2002-03-29|classloader not working properly  |
| 7652|New|Cri|2002-04-01|Tomcat stalls periodically|
| 7762|New|Enh|2002-04-05|stdout logfile handling   |
| 7785|New|Blk|2002-04-06|tomcat bug in context reloading   |
| 7789|New|Maj|2002-04-06|JSP Cookie Read/Write Fails With DNS Names|
| 7863|New|Maj|2002-04-09|I have a problem when running Tomcat with IIS |
| 8154|New|Nor|2002-04-16|logrotate script in RPM rotates non-existing file |
| 8155|New|Nor|2002-04-16|Tomcat from RPM doesn't do logrotate  |
| 8187|New|Cri|2002-04-17|Errors when Tomcat used with MS Access database   |
| 8239|New|Cri|2002-04-18|Resource temporary unavailable|
| 8263|New|Cri|2002-04-18|url-pattern easy to circumvent|
| 8634|New|Nor|2002-04-30|no way to specify different modules.xml file  |
| 8992|New|Blk|2002-05-10|IE6/XP: Limitation of POST Area within HTTP reques|
| 9086|New|Enh|2002-05-14|NPE org.apache.tomcat.core.ServerSession.setAttrib|
| 9250|New|Maj|2002-05-20|outOfMemoryError  |
| 9362|New|Nor|2002-05-23|compiilation of JSP that includes a non-existant f|
| 9367|New|Maj|2002-05-23|HttpSessionBindingEvent not thrown for HttpSession|
| 9390|New|Nor|2002-05-24|jasper compilation error in tomcat|
| 9480|New|Nor|2002-05-29|Data connection pooling   |
| 9607|New|Maj|2002-06-04|precompile JSP|
| 9737|New|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p|
|1|New|Cri|2002-06-19|IOException Broken Pipe when authenticating JDBCRe|
|10039|New|Nor|2002-06-20|TimeStamp will not work correctly.|
|10047|New|Cri|2002

[GUMP] Build timed out - jk2

[Craig McClanahan]

This email is autogenerated from the output from:



Buildfile: build.xml

init.taskdef:

guess.os:
 [echo] build.properties i386.Linux
 [echo] Linux:true Win32:${win32} Netware:${netware} Solaris:${solaris} 
HPUX:${hpux}

init.win32.properties:

init.win32.mc:

init.win32:

init.netware:

init.os:

guess.server:
 [echo] Apache2 /usr/local/apache2 true
 [echo] Apache13 /usr true
 [echo] IIS ${iis.home} ${iis.detect}
 [echo] Iplanet ${iplanet.home} ${iplanet.detect}
 [echo] JNI true


init:
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk2

apache20:
[mkdir] Created dir: 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk2/apache2
   [so] Compiling 42 out of 42
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
   [so] Warnings: 
   [so] 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c:
 In function `jk2_channel_apr_open':
   [so] 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c:229:
 warning: left-hand operand of comma expression has no effect
   [so] 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c:229:
 warning: left-hand operand of comma expression has no effect
   [so] 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c:258:
 warning: left-hand operand of comma expression has no effect
   [so] 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c:258:
 warning: left-hand operand of comma expression has no effect
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
Compiling 
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_map.c
/home/rubys/bin/timeout: timed out

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

Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4CoyoteAdapter.java

[Remy Maucherat]

[EMAIL PROTECTED] wrote:
billbarker2003/03/23 01:04:06

  Modified:coyote/src/java/org/apache/coyote Tag: coyote_10
Request.java
   coyote/src/java/org/apache/coyote/tomcat4 Tag: coyote_10
CoyoteAdapter.java
  Log:
  Port Patch from main branch.
I wanted to try to resolve that bug (working well with accelerated SSL 
is very important if Tomcat standalone is to become mainstream), but 
didn't before the stable release to avoid introducing bugs.
Thanks for doing it.

Remy

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

DO NOT REPLY [Bug 17656] - scheme and secure Connector server.xml configuration attributes ignored by CoyoteConnector HTTP/1.1

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=17656

scheme and secure Connector server.xml configuration attributes ignored by 
CoyoteConnector HTTP/1.1

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2003-03-23 09:07 ---
Patch applied.  Thanks Much.

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java

[billbarker]

billbarker2003/03/23 01:04:06

  Modified:coyote/src/java/org/apache/coyote Tag: coyote_10
Request.java
   coyote/src/java/org/apache/coyote/tomcat4 Tag: coyote_10
CoyoteAdapter.java
  Log:
  Port Patch from main branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.15.2.1  +1 -1  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java
  
  Index: Request.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java,v
  retrieving revision 1.15
  retrieving revision 1.15.2.1
  diff -u -r1.15 -r1.15.2.1
  --- Request.java  19 Sep 2002 06:39:43 -  1.15
  +++ Request.java  23 Mar 2003 09:04:06 -  1.15.2.1
  @@ -481,7 +481,7 @@
//remoteHostMB.recycle();
   
// XXX Do we need such defaults ?
  -schemeMB.setString("http");
  +schemeMB.recycle();
methodMB.setString("GET");
   uriMB.setString("/");
   queryMB.setString("");
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.13.2.4  +16 -5 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
  retrieving revision 1.13.2.3
  retrieving revision 1.13.2.4
  diff -u -r1.13.2.3 -r1.13.2.4
  --- CoyoteAdapter.java16 Mar 2003 01:56:27 -  1.13.2.3
  +++ CoyoteAdapter.java23 Mar 2003 09:04:06 -  1.13.2.4
  @@ -248,7 +248,18 @@
   throws IOException {
   // XXX the processor needs to set a correct scheme and port prior to this 
point, 
   // in ajp13 protocols dont make sense to get the port from the connector..
  -request.setSecure(req.scheme().equals("https"));
  +// XXX the processor may have set a correct scheme and port prior to this 
point, 
  +// in ajp13 protocols dont make sense to get the port from the connector...
  +// otherwise, use connector configuration
  +if (! req.scheme().isNull()) {
  +// use processor specified scheme to determine secure state
  +request.setSecure(req.scheme().equals("https"));
  +} else {
  +// use connector scheme and secure configuration, (defaults to
  +// "http" and false respectively)
  +req.scheme().setString(connector.getScheme());
  +request.setSecure(connector.getSecure());
  +}
   
   request.setAuthorization
   (req.getHeader(Constants.AUTHORIZATION_HEADER));
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java

[billbarker]

billbarker2003/03/23 00:57:49

  Modified:coyote/src/java/org/apache/coyote Request.java
   coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
   coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
  Log:
  Fix problem where the scheme doesn't default to the connector.
  
  Reported By: Randy Watler <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.20  +1 -1  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java
  
  Index: Request.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Request.java  5 Mar 2003 02:31:47 -   1.19
  +++ Request.java  23 Mar 2003 08:57:48 -  1.20
  @@ -518,7 +518,7 @@
//remoteHostMB.recycle();
   
// XXX Do we need such defaults ?
  -schemeMB.setString("http");
  +schemeMB.recycle();
methodMB.setString("GET");
   uriMB.setString("/");
   queryMB.setString("");
  
  
  
  1.18  +18 -5 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- CoyoteAdapter.java16 Mar 2003 01:57:57 -  1.17
  +++ CoyoteAdapter.java23 Mar 2003 08:57:49 -  1.18
  @@ -218,7 +218,20 @@
   throws IOException {
   // XXX the processor needs to set a correct scheme and port prior to this 
point, 
   // in ajp13 protocols dont make sense to get the port from the connector..
  -request.setSecure(req.scheme().equals("https"));
  +// XXX the processor may have set a correct scheme and port prior to this 
point, 
  +// in ajp13 protocols dont make sense to get the port from the connector...
  +// otherwise, use connector configuration
  +if (! req.scheme().isNull()) {
  +// use processor specified scheme to determine secure state
  +request.setSecure(req.scheme().equals("https"));
  +} else {
  +// use connector scheme and secure configuration, (defaults to
  +// "http" and false respectively)
  +req.scheme().setString(connector.getScheme());
  +request.setSecure(connector.getSecure());
  +}
  + 
  +
   
   request.setAuthorization
   (req.getHeader(Constants.AUTHORIZATION_HEADER));
  
  
  
  1.17  +17 -5 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CoyoteAdapter.java16 Mar 2003 01:58:58 -  1.16
  +++ CoyoteAdapter.java23 Mar 2003 08:57:49 -  1.17
  @@ -221,7 +221,19 @@
   throws Exception {
   // XXX the processor needs to set a correct scheme and port prior to this 
point, 
   // in ajp13 protocols dont make sense to get the port from the connector..
  -request.setSecure(req.scheme().equals("https"));
  +// XXX the processor may have set a correct scheme and port prior to this 
point, 
  +// in ajp13 protocols dont make sense to get the port from the connector...
  +// otherwise, use connector configuration
  +if (! req.scheme().isNull()) {
  +// use processor specified scheme to determine secure state
  +request.setSecure(req.scheme().equals("https"));
  +} else {
  +// use connector scheme and secure configuration, (defaults to
  +// "http" and false respectively)
  +req.scheme().setString(connector.getScheme());
  +request.setSecure(connector.getSecure());
  +}
  + 
   
   // FIXME: the code below doesnt belongs to here, this is only  have sense 
   // in Http11, not in ajp13..
  
  
  

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

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java

[remm]

remm2003/03/23 00:50:16

  Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
  Log:
  - Also set the state in the request info.
  
  Revision  ChangesPath
  1.61  +8 -0  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
  
  Index: Http11Processor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- Http11Processor.java  5 Mar 2003 02:38:43 -   1.60
  +++ Http11Processor.java  23 Mar 2003 08:50:16 -  1.61
  @@ -81,6 +81,7 @@
   import org.apache.coyote.Adapter;
   import org.apache.coyote.Processor;
   import org.apache.coyote.Request;
  +import org.apache.coyote.RequestInfo;
   import org.apache.coyote.Response;
   
   import org.apache.coyote.http11.filters.ChunkedInputFilter;
  @@ -567,7 +568,9 @@
   throws IOException {
   ThreadWithAttributes thrA=
   (ThreadWithAttributes)Thread.currentThread();
  +RequestInfo rp = request.getRequestProcessor();
   thrA.setCurrentStage(threadPool, "parsing http request");
  +rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
   
   // Set the remote address
   remoteAddr = null;
  @@ -613,6 +616,7 @@
   
   // Setting up filters, and parse some request headers
   thrA.setCurrentStage(threadPool, "prepareRequest");
  +rp.setStage(org.apache.coyote.Constants.STAGE_PREPARE);
   prepareRequest();
   
   if (maxKeepAliveRequests > 0 && --keepAliveLeft == 0)
  @@ -622,6 +626,7 @@
   if (!error) {
   try {
   thrA.setCurrentStage(threadPool, "service");
  +rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
   adapter.service(request, response);
   } catch (InterruptedIOException e) {
   error = true;
  @@ -636,6 +641,7 @@
   // Finish the handling of the request
   try {
   thrA.setCurrentStage(threadPool, "endRequestIB");
  +rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT);
   inputBuffer.endRequest();
   } catch (IOException e) {
   error = true;
  @@ -647,6 +653,7 @@
   }
   try {
   thrA.setCurrentStage(threadPool, "endRequestOB");
  +rp.setStage(org.apache.coyote.Constants.STAGE_ENDOUTPUT);
   outputBuffer.endRequest();
   } catch (IOException e) {
   error = true;
  @@ -656,6 +663,7 @@
   }
   
   thrA.setCurrentStage(threadPool, "ended");
  +rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
   // Don't reset the param - we'll see it as ended. Next request
   // will reset it
   // thrA.setParam(null);
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote Constants.java RequestInfo.java

[remm]

remm2003/03/23 00:49:48

  Modified:coyote/src/java/org/apache/coyote Constants.java
RequestInfo.java
  Log:
  - Also expose the request processing state in the request info. The problem was that
there was no way to associate the thread with the request info.
  
  Revision  ChangesPath
  1.3   +10 -0 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Constants.java
  
  Index: Constants.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Constants.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Constants.java8 Apr 2002 22:49:52 -   1.2
  +++ Constants.java23 Mar 2003 08:49:48 -  1.3
  @@ -86,4 +86,14 @@
   public static final int MAX_NOTES = 32;
   
   
  +// Request states
  +public static final int STAGE_NEW = 0;
  +public static final int STAGE_PARSE = 1;
  +public static final int STAGE_PREPARE = 2;
  +public static final int STAGE_SERVICE = 3;
  +public static final int STAGE_ENDINPUT = 4;
  +public static final int STAGE_ENDOUTPUT = 5;
  +public static final int STAGE_ENDED = 6;
  +
  +
   }
  
  
  
  1.2   +9 -0  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestInfo.java
  
  Index: RequestInfo.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RequestInfo.java  20 Jan 2003 23:42:45 -  1.1
  +++ RequestInfo.java  23 Mar 2003 08:49:48 -  1.2
  @@ -96,6 +96,7 @@
   // - Instance Variables
   Request req;
   Response res;
  +int stage = Constants.STAGE_NEW;
   
   //  Information about the current request  ---
   // This is usefull for long-running requests only
  @@ -163,6 +164,14 @@
   maxTime=time;
   maxRequestUri=req.requestURI().toString();
   }
  +}
  +
  +public int getStage() {
  +return stage;
  +}
  +
  +public void setStage(int stage) {
  +this.stage = stage;
   }
   
   public long getBytesSent() {
  
  
  

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