cvs commit: jakarta-tomcat/src/doc tomcat-ssl-howto.html
nacho 01/08/25 07:11:02 Modified:src/doc tomcat-ssl-howto.html Log: Broken image links Revision ChangesPath 1.6 +2 -2 jakarta-tomcat/src/doc/tomcat-ssl-howto.html Index: tomcat-ssl-howto.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-ssl-howto.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tomcat-ssl-howto.html 2001/08/20 16:11:09 1.5 +++ tomcat-ssl-howto.html 2001/08/25 14:11:02 1.6 @@ -37,9 +37,9 @@ !-- Banner element, all hail the Project! -- table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH=100% tr -td ALIGN=LEFT WIDTH=50%a href=http://jakarta.apache.org/index.html;img SRC=banner.gif ALT=The Jakarta Project BORDER=0 height=100 width=350/a/td +td ALIGN=LEFT WIDTH=50%a href=http://jakarta.apache.org/index.html;img SRC=images/banner.gif ALT=The Jakarta Project BORDER=0 height=100 width=350/a/td -td ALIGN=RIGHT WIDTH=50%img SRC=tomcat.gif ALT=The mighty Tomcat - Meow! BORDER=0 height=71 width=100/td +td ALIGN=RIGHT WIDTH=50%img SRC=images/tomcat.gif ALT=The mighty Tomcat - Meow! BORDER=0 height=71 width=100/td /tr /table
cvs commit: jakarta-tomcat/src/admin/contextAdmin sessionExpire.jsp
nacho 01/08/25 07:13:36
Modified:src/admin/contextAdmin sessionExpire.jsp
Log:
Avoiding NPE if the session being invalitated does not exist.
Revision ChangesPath
1.2 +11 -3 jakarta-tomcat/src/admin/contextAdmin/sessionExpire.jsp
Index: sessionExpire.jsp
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/sessionExpire.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sessionExpire.jsp 2001/03/23 02:14:17 1.1
+++ sessionExpire.jsp 2001/08/25 14:13:36 1.2
@@ -11,12 +11,20 @@
adm:moduleAdmin var=store
type=org.apache.tomcat.modules.session.SimpleSessionStore /
- h3Invalidate %= request.getParameter(id ) %/h3
+ h3Invalidating %= request.getParameter(id ) %/h3
-% org.apache.tomcat.core.ServerSession s=store.findSession( ctx,
+%
+ org.apache.tomcat.core.ServerSession s=store.findSession( ctx,
request.getParameter(id ));
- s.setState( org.apache.tomcat.core.ServerSession.STATE_EXPIRED );
+ if (s != null ) {
+s.setState( org.apache.tomcat.core.ServerSession.STATE_EXPIRED );
%
+h4 Session invalidated successfully/h4
+%
+ } else
+%
+
+h4 Session not found , already invalidated /h4
/body
/html
cvs commit: jakarta-tomcat/src/examples/WEB-INF web.xml
nacho 01/08/25 07:14:59 Modified:src/examples/WEB-INF web.xml Log: Adding a map for the Snoop servlet to be able to see getPathInfo in action Revision ChangesPath 1.13 +10 -2 jakarta-tomcat/src/examples/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/web.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- web.xml 2000/10/09 02:32:37 1.12 +++ web.xml 2001/08/25 14:14:59 1.13 @@ -40,6 +40,14 @@ snoop /servlet-name url-pattern +/snoop/* +/url-pattern +/servlet-mapping +servlet-mapping +servlet-name +snoop +/servlet-name +url-pattern *.snp /url-pattern /servlet-mapping @@ -80,16 +88,15 @@ /security-constraint !-- Default login configuration uses BASIC authentication -- -!-- login-config auth-methodBASIC/auth-method realm-nameExample Basic Authentication Area/realm-name /login-config --- !-- Form-based login is enabled by default. If you wish to try Basic authentication, comment out the login-config section below and uncomment the one above. -- +!-- login-config auth-methodFORM/auth-method realm-nameExample Form-Based Authentication Area/realm-name @@ -98,5 +105,6 @@ form-error-page/jsp/security/login/error.jsp/form-error-page /form-login-config /login-config +-- /web-app
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp12Interceptor.java Ajp12.java
nacho 01/08/25 07:19:49
Modified:src/share/org/apache/tomcat/modules/server
Ajp12Interceptor.java Ajp12.java
Log:
Bugzilla#3256
tomcatAuthentication=false does not appear to disable tomcat authentication
Reported by jjv AT windchill.com (Joe Van Demark)
Now TomcatAuthentication defaults to false ( as is was without that hack ) ,
that is Tomcat relies for basic auth in the HTTPServer used.
Need to check if TomcatAuthentiication works when the value is true,
the reporter seems to imply that this not works at all
Revision ChangesPath
1.16 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java
Index: Ajp12Interceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Ajp12Interceptor.java 2001/08/11 03:21:16 1.15
+++ Ajp12Interceptor.java 2001/08/25 14:19:49 1.16
@@ -77,7 +77,7 @@
*/
public class Ajp12Interceptor extends PoolTcpConnector
implements TcpConnectionHandler{
-private boolean tomcatAuthentication=true;
+private boolean tomcatAuthentication=false;
String secret;
File ajpidFile=null;
1.20 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java
Index: Ajp12.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Ajp12.java2001/08/22 16:53:57 1.19
+++ Ajp12.java2001/08/25 14:19:49 1.20
@@ -75,7 +75,7 @@
Socket socket;
InputStream sin;
BufferedInputStream ajpin;
-private boolean tomcatAuthentication=true;
+private boolean tomcatAuthentication=false;
boolean shutdown=false;
boolean isPing=false;
boolean doLog;
cvs commit: jakarta-tomcat/src/tests/webpages/jsp/mangler - New directory
nacho 01/08/25 07:46:01 jakarta-tomcat/src/tests/webpages/jsp/mangler - New directory
cvs commit: jakarta-tomcat/src/tests/webpages/jsp/mangler/1test - New directory
nacho 01/08/25 07:46:11 jakarta-tomcat/src/tests/webpages/jsp/mangler/1test - New directory
cvs commit: jakarta-tomcat/src/tests/webpages/jsp/mangler 1test.jsp
nacho 01/08/25 07:47:33
Modified:src/tests/webpages/WEB-INF test-tomcat.xml
Added: src/tests/webpages/jsp/mangler/1test test.jsp
src/tests/webpages/jsp/mangler 1test.jsp
Log:
Some tests for the JSP mangler..
Revision ChangesPath
1.1 jakarta-tomcat/src/tests/webpages/jsp/mangler/1test/test.jsp
Index: test.jsp
===
Test Passed
1.42 +19 -1 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
Index: test-tomcat.xml
===
RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- test-tomcat.xml 2001/08/07 12:14:20 1.41
+++ test-tomcat.xml 2001/08/25 14:47:33 1.42
@@ -16,7 +16,7 @@
early tests.
--
- property name=revision value=$Revision: 1.41 $ /
+ property name=revision value=$Revision: 1.42 $ /
property name=host value=127.0.0.1 /
property name=port value=8080 /
property name=colonPort value=:${port} /
@@ -1380,6 +1380,24 @@
responseMatch match=getRequestURI: /test/jsp/ShowPathInfo.jsp/
/httpClient
/target
+
+ !-- Mangler tests --
+
+ target name=mangler depends=init
+ httpClient
+ commentNumber as first char of JSP FileName/comment
+ httpRequest path=/test/jsp/mangler/1test.jsp /
+ httpStatusMatch match=200 /
+ responseMatch match=Test Passed/
+ /httpClient
+ httpClient
+ commentNumber as first char of Directory Name/comment
+ httpRequest path=/test/jsp/mangler/1test/test.jsp /
+ httpStatusMatch match=200 /
+ responseMatch match=Test Passed/
+ /httpClient
+ /target
+
!-- All targets --
target name=client
depends=file,params,writer,dispatch,get,requestMap,post,wrong_request,restricted,jsp,unavailable,headers,security_chk,aaa
1.1 jakarta-tomcat/src/tests/webpages/jsp/mangler/1test.jsp
Index: 1test.jsp
===
Test Passed
cvs commit: jakarta-tomcat/src/examples/WEB-INF web.xml
nacho 01/08/25 09:12:46 Modified:src/examples/WEB-INF web.xml Log: Oops, reverting examples auth to FORM . Revision ChangesPath 1.14 +2 -2 jakarta-tomcat/src/examples/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/web.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- web.xml 2001/08/25 14:14:59 1.13 +++ web.xml 2001/08/25 16:12:46 1.14 @@ -88,15 +88,16 @@ /security-constraint !-- Default login configuration uses BASIC authentication -- +!-- login-config auth-methodBASIC/auth-method realm-nameExample Basic Authentication Area/realm-name /login-config +-- !-- Form-based login is enabled by default. If you wish to try Basic authentication, comment out the login-config section below and uncomment the one above. -- -!-- login-config auth-methodFORM/auth-method realm-nameExample Form-Based Authentication Area/realm-name @@ -105,6 +106,5 @@ form-error-page/jsp/security/login/error.jsp/form-error-page /form-login-config /login-config --- /web-app
cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml
nacho 01/08/25 09:18:20
Modified:src/tests/webpages/WEB-INF test-tomcat.xml
Log:
Forget to add a dependency to the new mangler tests in client target.
Revision ChangesPath
1.43 +2 -2 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
Index: test-tomcat.xml
===
RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- test-tomcat.xml 2001/08/25 14:47:33 1.42
+++ test-tomcat.xml 2001/08/25 16:18:20 1.43
@@ -16,7 +16,7 @@
early tests.
--
- property name=revision value=$Revision: 1.42 $ /
+ property name=revision value=$Revision: 1.43 $ /
property name=host value=127.0.0.1 /
property name=port value=8080 /
property name=colonPort value=:${port} /
@@ -1400,7 +1400,7 @@
!-- All targets --
- target name=client
depends=file,params,writer,dispatch,get,requestMap,post,wrong_request,restricted,jsp,unavailable,headers,security_chk,aaa
+ target name=client
depends=file,params,writer,dispatch,get,requestMap,post,wrong_request,restricted,jsp,unavailable,headers,security_chk,aaa,mangler
/target
!-- Aux targets --
cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade RequestDispatcherImpl.java
costin 01/08/25 11:11:12
Modified:src/facade22/org/apache/tomcat/facade
RequestDispatcherImpl.java
Log:
Fix for 3162, requestDispatcher.forward must reset PathInfo and the other
path related info in the passed request.
Revision ChangesPath
1.20 +7 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- RequestDispatcherImpl.java2001/08/21 04:56:44 1.19
+++ RequestDispatcherImpl.java2001/08/25 18:11:12 1.20
@@ -222,12 +222,18 @@
// set the context - no need to fire context parsing again
realRequest.setContext( context );
-
+
realRequest.requestURI().setString( context.getPath() + path );
+ // # 3162
+ realRequest.unparsedURI().recycle();
+ //realRequest.query().recycle();
+ realRequest.servletPath().recycle();
+ realRequest.pathInfo().recycle();
// merge query string as specified in specs - before, it may affect
// the way the request is handled by special interceptors
if( queryString != null ) {
+ realRequest.queryString().setString(queryString);
// Append queryString to the request parameters -
// the original request is changed.
realRequest.parameters().processParameters( queryString );
cvs commit: jakarta-tomcat/src/native/mod_jk/common jk_jni_worker.c
costin 01/08/25 11:11:37
Modified:src/native/mod_jk/common jk_jni_worker.c
Log:
Typo in message
Revision ChangesPath
1.4 +2 -2 jakarta-tomcat/src/native/mod_jk/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/common/jk_jni_worker.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_jni_worker.c 2001/08/15 02:27:31 1.3
+++ jk_jni_worker.c 2001/08/25 18:11:37 1.4
@@ -57,7 +57,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on: *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***/
#if !defined(WIN32) !defined(NETWARE)
@@ -733,7 +733,7 @@
if(!handle) {
jk_log(l, JK_LOG_EMERG,
- Can't log native library %s : %s\n, p-jvm_dll_path,
+ Can't load native library %s : %s\n, p-jvm_dll_path,
dlerror());
} else {
jni_create_java_vm = dlsym(handle, JNI_CreateJavaVM);
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/generators ErrorHandler.java
costin 01/08/25 11:14:27
Modified:src/share/org/apache/tomcat/modules/generators
ErrorHandler.java
Log:
One more check for null
Revision ChangesPath
1.17 +5 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java
Index: ErrorHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ErrorHandler.java 2001/08/24 02:24:19 1.16
+++ ErrorHandler.java 2001/08/25 18:14:27 1.17
@@ -168,7 +168,11 @@
// XXX this log was intended to debug the status code generation.
// it can be removed for all cases.
if( code 401 ) {// tuneme
- ctx.log( Status code: + code + request: + req + msg: +
+ if( ctx==null )
+ cm.log( Status code: + code + request: + req + msg: +
+ req.getAttribute(javax.servlet.error.message));
+ else
+ ctx.log( Status code: + code + request: + req + msg: +
req.getAttribute(javax.servlet.error.message));
}
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server JNIEndpoint.java
costin 01/08/25 11:15:17
Modified:src/share/org/apache/tomcat/modules/server JNIEndpoint.java
Log:
Bug 3086 - add a mechansim to specify the timeout on the jni startup thread.
Revision ChangesPath
1.5 +19 -4
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java
Index: JNIEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JNIEndpoint.java 2001/08/24 01:15:18 1.4
+++ JNIEndpoint.java 2001/08/25 18:15:17 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
1.4 2001/08/24 01:15:18 costin Exp $
- * $Revision: 1.4 $
- * $Date: 2001/08/24 01:15:18 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
1.5 2001/08/25 18:15:17 costin Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/08/25 18:15:17 $
*
*
*
@@ -121,6 +121,21 @@
return ep;
}
+public static final int DEFAULT_TIMEOUT=60*1000;
+
+public static int getTimeout() {
+ // # 3086
+ String to=System.getProperty(JNIEndpoint.timeout);
+ if( to!=null ) {
+ try {
+ int i=new Integer( to ).intValue();
+ return i;
+ } catch( Exception ex ){
+ System.out.println(Invalid timeout + to );
+ }
+ }
+ return DEFAULT_TIMEOUT;
+}
// JNI Entry points
@@ -154,7 +169,7 @@
System.err.println(Starting up StartupThread);
startup.start();
synchronized (this) {
-wait(60*1000);
+wait(getTimeout());
}
System.err.println(End waiting);
} catch(Throwable t) {
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler ServletWriter.java
costin 01/08/25 11:31:48
Modified:src/share/org/apache/jasper/compiler ServletWriter.java
Log:
Fix escaping of \, bug 3176.
Thanks [EMAIL PROTECTED] (Bruce Filgate) for the report.
Revision ChangesPath
1.2 +6 -7
jakarta-tomcat/src/share/org/apache/jasper/compiler/ServletWriter.java
Index: ServletWriter.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ServletWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletWriter.java1999/10/09 00:20:38 1.1
+++ ServletWriter.java2001/08/25 18:31:48 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ServletWriter.java,v 1.1
1999/10/09 00:20:38 duncan Exp $
- * $Revision: 1.1 $
- * $Date: 1999/10/09 00:20:38 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ServletWriter.java,v 1.2
2001/08/25 18:31:48 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/08/25 18:31:48 $
*
*
*
@@ -137,10 +137,9 @@
sb.append('');
for (int i = 0 ; i len ; i++) {
char ch = s.charAt(i);
- if ( ch == '\\' i+1 len) {
- sb.append('\\');
- sb.append('\\');
- sb.append(s.charAt(++i));
+ if ( ch == '\\' ) {
+ // double the \, doesn't matter what follows ( #3176 )
+ sb.append();
} else if ( ch == '' ) {
sb.append('\\');
sb.append('');
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config defaultcontext.xml loader.xml logger.xml manager.xml realm.xml valve.xml context.xml project.xml
craigmcc01/08/25 13:06:31 Modified:webapps/tomcat-docs/config context.xml project.xml Added: webapps/tomcat-docs/config defaultcontext.xml loader.xml logger.xml manager.xml realm.xml valve.xml Log: Finish converting the contents of the Server Configuration Reference manual to the new documentation format. Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-4.0/webapps/tomcat-docs/config/context.xml Index: context.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/context.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- context.xml 2001/08/25 03:37:39 1.1 +++ context.xml 2001/08/25 20:06:30 1.2 @@ -59,7 +59,7 @@ subsection name=Common Attributes -pAll implementations of strongHost/strong +pAll implementations of strongContext/strong support the following attributes:/p attributes 1.4 +2 -3 jakarta-tomcat-4.0/webapps/tomcat-docs/config/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 2001/08/25 01:14:13 1.3 +++ project.xml 2001/08/25 20:06:30 1.4 @@ -36,9 +36,8 @@ item name=Default Context href=defaultcontext.html/ item name=Loaderhref=loader.html/ item name=Loggerhref=logger.html/ -item name=Manager href=manager.html/ -item name=Realm href=realm.htlm/ -item name=Resources href=resources.html/ +item name=Manager href=manager.html/ +item name=Realm href=realm.html/ item name=Valve href=valve.html/ /menu 1.1 jakarta-tomcat-4.0/webapps/tomcat-docs/config/defaultcontext.xml Index: defaultcontext.xml === ?xml version=1.0? !DOCTYPE document [ !ENTITY project SYSTEM project.xml ] document project; properties author email=[EMAIL PROTECTED]Craig R. McClanahan/author titleThe DefaultContext Component/title /properties body section name=Introduction pThe strongDefaultContext/strong element represents a subset of the configuration settings for a a href=context.htmlContext/a, and can be nested inside an a href=engine.htmlEngine/a or a href=host.htmlHost/a element to represent emdefault configuration properties/em for Contexts that are automatically created./p pSee a href=host.html#Automatic Application DeploymentAutomatic Application Deployment/a and a href=host.html#User Web ApplicationsUser Web Applications/a for more information about the circumstances in which Catalina will automatically create Contexts for you, based on the configuration properties that are stored here./p /section section name=Attributes subsection name=Common Attributes pAll implementations of strongHost/strong support the following attributes:/p attributes attribute name=cookies required=false pSet to codetrue/code if you want cookies to be used for session identifier communication if supported by the client (this is the default). Set to codefalse/code if you want to disable the use of cookies for session identifier communication, and rely only on URL rewriting by the application./p /attribute attribute name=crossContext required=false pSet to codetrue/code if you want calls within this application to codeServletContext.getContext()/code to successfully return a request dispatcher for other web applications running on this virtual host. Set to codefalse/code (the default) in security conscious environments, to make codegetContext()/code always return codenull/code./p /attribute attribute name=reloadable required=false pSet to codetrue/code if you want Catalina to monitor classes in code/WEB-INF/classes//code and code/WEB-INF/lib/code for changes, and automatically reload the web application if a change is detected. This feature is very useful during application development, but it requires significant runtime overhead and is not recommended for use on deployed production applications. You can use the a href=../manager-howto.htmlManager/a web application, however, to trigger reloads of deployed
cvs commit: jakarta-tomcat/src/admin/test test.jsp
nacho 01/08/25 18:37:11 Modified:src/admin/test test.jsp Log: Obtaining tests run elapsed time Revision ChangesPath 1.16 +6 -3 jakarta-tomcat/src/admin/test/test.jsp Index: test.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- test.jsp 2001/08/07 12:17:44 1.15 +++ test.jsp 2001/08/26 01:37:11 1.16 @@ -1,7 +1,7 @@ htmltitleTomcat Self-Test/title body bgcolor=#FF h1Tomcat Self-test/h1 - +%@ page import=java.util.* % %@ taglib uri=http://jakarta.apache.org/taglibs/tomcat_admin-1.0; prefix=adm % %@ taglib uri=http://jakarta.apache.org/taglibs/ant-1.0; @@ -9,6 +9,8 @@ This page will show the result of executing the sanity test suite. +%! Date d ; % + %@ include file=sanity-form.jsp % % // This is an ugly hack to make the logs easily accessible. @@ -31,7 +33,7 @@ % ant:gtest / - +% d = new Date(); % ant:ant ant:target param=target / @@ -48,13 +50,14 @@ ant:property name=http.protocol param=server.proto / ant:property name=host param=host / /ant:ant - % // Test completed, display the results ( outType=none means // Gtest doesn't generate any output ( but we have to wait untill // it's done ), use 'html' for interactive results % h1Test %= antProperties.getProperty(revision) %/h1 + +Executed in %= (new Date()).getTime() - d.getTime() % Milliseconds.br % // Failures % h1FAILED Tests/h1
cvs commit: jakarta-tomcat/src/tests/webpages/session - New directory
costin 01/08/25 18:44:36 jakarta-tomcat/src/tests/webpages/session - New directory
cvs commit: jakarta-tomcat/src/tests/webpages/dispatch forwParam.jsp
costin 01/08/25 18:45:39
Added: src/tests/webpages/WEB-INF build.xml
src/tests/webpages/WEB-INF/classes LoadServlet.java
RequestDump.java
src/tests/webpages/WEB-INF/classes/dispatch ForwardPI.java
src/tests/webpages/dispatch forwParam.jsp
Log:
Added few more tests ( not automated yet ) for various bugs.
Revision ChangesPath
1.1 jakarta-tomcat/src/tests/webpages/WEB-INF/build.xml
Index: build.xml
===
project name=webpages default=main basedir=.
!--
The values to customize for each application:
appname: the name of the application ( simple ). Defaults to
project name, if set.
Global properties you must set( can be set in jaxm.properties )
servlet.jar: location of servlet.jar
Other properties, with defaults:
webapps.dir: directory where the app will be built.
Default to in-place ( very usefull if you create your app under webapps/ ).
wars.dir: directory where the .war file will be constructed.
If not set, no war will be generated.
compile.debug
compile.deprecation
compile.optimize: javac customization
--
property file=${user.home}/build.properties/ !-- User local--
property file=${user.home}/.ant.properties/!-- User local--
property file=build.properties/!-- Component local --
property file=../../build.properties/ !-- For all webapps --
property file=../../../build.properties/
property name=appname value=${ant.project.name}/
property name=appdir location=../
property name=compile.debug value=true /
property name=compile.optimize value=false /
property name=compile.deprecation value=false /
!-- Classpath
fileset id=extra-classpath dir=.
/fileset
--
!-- Init targets --
target name=init depends=checks,build.dir.webapps,build.dir.local
description=Initialization and checkup
echo message= Building ${appname} to ${build.dir} /
/target
target name=prepare.build
if=webapps.dir
description=Preparing the webapp dir if not in-place
mkdir dir=${webapps.dir}/${appname}/
mkdir dir=${webapps.dir}/${appname}/WEB-INF/
mkdir dir=${webapps.dir}/${appname}/WEB-INF/lib/
mkdir dir=${webapps.dir}/${appname}/WEB-INF/src/
mkdir dir=${webapps.dir}/${appname}/WEB-INF/classes/
copy todir=${webapps.dir}/${appname}
fileset dir=${appdir} /
/copy
/target
target name=prepare depends=init,prepare.build
mkdir dir=${build.dir}/${appname}/WEB-INF/lib/
mkdir dir=${build.dir}/${appname}/WEB-INF/classes/
mkdir dir=${appdir}/WEB-INF/lib/
/target
!-- Build --
target name=main depends=prepare,compile.src,compile.classes /
target name=compile.src if=src.available
javac srcdir=${appdir}/WEB-INF/src
destdir=${build.dir}/${appname}/WEB-INF/classes
debug=${compile.debug}
deprecation=${compile.deprecation}
optimize=${compile.optimize}
classpath
pathelement location=${servlet.jar} /
fileset id=app-classpath dir=${appdir}/WEB-INF/lib
include name=*.jar /
/fileset
/classpath
/javac
copy todir=${build.dir}/${appname}/WEB-INF/classes
fileset dir=${appdir}/WEB-INF/src
include name=**/*.properties /
include name=**/*.dtd /
include name=**/*.xml /
/fileset
/copy
/target
target name=compile.classes if=classes.available
javac srcdir=${appdir}/WEB-INF/classes
destdir=${build.dir}/${appname}/WEB-INF/classes
debug=${compile.debug}
deprecation=${compile.deprecation}
optimize=${compile.optimize}
classpath
pathelement location=${servlet.jar} /
fileset id=app-classpath dir=${appdir}/WEB-INF/lib
include name=*.jar /
/fileset
/classpath
/javac
/target
!-- Cleanup Packaging --
target name=clean depends=init
delete dir={build.dir}/${appname}/WEB-INF/classes/
/target
target name=war
depends=main
description=Creating the WAR file
if=wars.dir
mkdir dir=${wars.dir} /
jar jarfile=${wars.dir}/${appname}.war
basedir=${build.dir}/${appname}
include name=**/
/jar
/target
!-- Logic and Guessing --
target name=checks depends=set.available,check.appname,check.servlet /
target name=set.available
!--
cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade RequestDispatcherImpl.java
costin 01/08/25 18:47:41
Modified:src/facade22/org/apache/tomcat/facade
RequestDispatcherImpl.java
Log:
Another fix for RD, the queryString wasn't updated in the forwarded request.
I'm not sure if the query string is a 'path' property, but for consistency I
think it must be updated ( including the additional parameters and the old
ones ).
Revision ChangesPath
1.21 +12 -4
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- RequestDispatcherImpl.java2001/08/25 18:11:12 1.20
+++ RequestDispatcherImpl.java2001/08/26 01:47:41 1.21
@@ -233,11 +233,19 @@
// merge query string as specified in specs - before, it may affect
// the way the request is handled by special interceptors
if( queryString != null ) {
- realRequest.queryString().setString(queryString);
- // Append queryString to the request parameters -
- // the original request is changed.
+ // Process existing parameters, if not already done so
+ // ( otherwise we'll process some twice )
+ realRequest.parameters().handleQueryParameters();
+ // Set the query string - the sum of the old one and new one.
+ String oldQS=realRequest.queryString().toString();
+ String newQS=(oldQS==null ) ? queryString : oldQS + +
+ queryString;
+ realRequest.queryString().setString(newQS);
+
+ // Process the additional parsm. We don't know if the old
+ // params were processed ( so we need to make sure they are,
+ // i.e. a known state ).
realRequest.parameters().processParameters( queryString );
- // addQueryString( realRequest, queryString );
}
// run the new request through the context manager
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler ForwardGenerator.java IncludeGenerator.java
costin 01/08/25 18:49:02
Modified:src/share/org/apache/jasper/compiler ForwardGenerator.java
IncludeGenerator.java
Log:
Bug 1705 - error if the param value is a non-trivial expression.
Revision ChangesPath
1.4 +7 -6
jakarta-tomcat/src/share/org/apache/jasper/compiler/ForwardGenerator.java
Index: ForwardGenerator.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ForwardGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ForwardGenerator.java 2000/06/11 21:41:06 1.3
+++ ForwardGenerator.java 2001/08/26 01:49:02 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ForwardGenerator.java,v
1.3 2000/06/11 21:41:06 mandar Exp $
- * $Revision: 1.3 $
- * $Date: 2000/06/11 21:41:06 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ForwardGenerator.java,v
1.4 2001/08/26 01:49:02 costin Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/08/26 01:49:02 $
*
*
*
@@ -111,10 +111,11 @@
sep = ?;
initial = false;
} else sep = ;
-
+
+ // Bug 1705 - need (
if (value.length == 1 JspUtil.isExpression(value[0]))
writer.println(_jspx_qfStr = _jspx_qfStr + \ + sep +
-key + =\ + + JspUtil.getExpr(value[0]) + ;);
+key + =\ + ( + JspUtil.getExpr(value[0]) + ););
else {
if (value.length == 1)
writer.println(_jspx_qfStr = _jspx_qfStr + \ + sep +
@@ -126,7 +127,7 @@
key + =\ + \ + value[i] + \;);
else
writer.println(_jspx_qfStr = _jspx_qfStr + \ + sep +
-key + =\ + +
JspUtil.getExpr(value[i])+ ;);
+key + =\ + ( +
JspUtil.getExpr(value[i])+ ););
if (sep.equals(?)) sep = ;
}
}
1.8 +2 -2
jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java
Index: IncludeGenerator.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IncludeGenerator.java 2001/03/10 05:13:40 1.7
+++ IncludeGenerator.java 2001/08/26 01:49:02 1.8
@@ -128,7 +128,7 @@
if (value.length == 1 JspUtil.isExpression(value[0])) {
writer.println(_jspx_qStr = _jspx_qStr + \ + sep +
-key + =\ + + JspUtil.getExpr(value[0]) + ;);
+key + =\ + ( + JspUtil.getExpr(value[0]) + ););
} else {
if (value.length == 1) {
writer.println(_jspx_qStr = _jspx_qStr + \ + sep +
@@ -140,7 +140,7 @@
key + =\ + \ + value[i] + \;);
else
writer.println(_jspx_qStr = _jspx_qStr + \ + sep +
-key + =\ + +
JspUtil.getExpr(value[i])+ ;);
+key + =\ + ( +
JspUtil.getExpr(value[i])+ ););
if (sep.equals(?)) sep = ;
}
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config WorkDirSetup.java
costin 01/08/25 18:52:57
Modified:src/share/org/apache/tomcat/modules/config WorkDirSetup.java
Log:
Fix for 457 - problems if the host has a : ( like vhost containing port
number ) and we are on Windows.
Revision ChangesPath
1.8 +3 -0
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/WorkDirSetup.java
Index: WorkDirSetup.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/WorkDirSetup.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WorkDirSetup.java 2001/08/24 22:07:05 1.7
+++ WorkDirSetup.java 2001/08/26 01:52:57 1.8
@@ -204,6 +204,9 @@
sb.append(cm.getWorkDir());
sb.append(File.separator);
String host=ctx.getHost();
+ // # 457
+ if( host!=null )
+ host=host.replace(':', '_');
if( host==null )
sb.append( DEFAULT );
else
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers AccessLogInterceptor.java
costin 01/08/25 18:53:26 Modified:src/share/org/apache/tomcat/modules/loggers AccessLogInterceptor.java Log: Use the Content-Length header, no need to String-int-String conversions. Revision ChangesPath 1.3 +3 -2 jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/AccessLogInterceptor.java Index: AccessLogInterceptor.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/AccessLogInterceptor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AccessLogInterceptor.java 2001/06/08 03:04:33 1.2 +++ AccessLogInterceptor.java 2001/08/26 01:53:26 1.3 @@ -235,8 +235,9 @@ fw.write(request.protocol().toString().trim()); break; case 'b': - int len = response.getContentLength(); - fw.write(Integer.toString(len)); + String cl=response.getMimeHeaders(). + getHeader(Content-Length).toString(); + fw.write(cl); break; case 's': fw.write(Integer.
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers SimpleMapper1.java
costin 01/08/25 18:54:26
Modified:src/share/org/apache/tomcat/modules/mappers
SimpleMapper1.java
Log:
Extra check.
Revision ChangesPath
1.10 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/SimpleMapper1.java
Index: SimpleMapper1.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/SimpleMapper1.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SimpleMapper1.java2001/08/07 12:08:26 1.9
+++ SimpleMapper1.java2001/08/26 01:54:26 1.10
@@ -534,7 +534,7 @@
while( en.hasMoreElements() ) {
String s=(String)en.nextElement();
Container ct=(Container)vmap.prefixMappedServlets.get( s );
- if( ct.getContext() == ctx ) {
+ if( ct!=null ct.getContext() == ctx ) {
if(debug 0 )
ctx.log( Remove mapping + s );
vmap.prefixMappedServlets.remove( s );
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server JNIConnectionHandler.java
costin 01/08/25 18:55:21
Modified:src/share/org/apache/tomcat/modules/server
JNIConnectionHandler.java
Log:
Better message - we didn't find the library in LD_LIB_PATH, but that's not
a 'failure', since we can try to look it up in the default location.
Revision ChangesPath
1.13 +2 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIConnectionHandler.java
Index: JNIConnectionHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIConnectionHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JNIConnectionHandler.java 2001/08/24 01:15:18 1.12
+++ JNIConnectionHandler.java 2001/08/26 01:55:21 1.13
@@ -219,7 +219,8 @@
was loaded from the lib path);
return;
} catch(UnsatisfiedLinkError usl) {
- System.err.println(Failed to loadLibrary() + lib);
+ System.err.println(loadLibrary( + lib +
+) didn't find the library, try with full path);
if( debug 0 )
usl.printStackTrace();
}
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/threads ThreadPool.java
costin 01/08/25 18:55:59
Modified:src/share/org/apache/tomcat/util/threads ThreadPool.java
Log:
Added an extra message for the first time we exceed maxThreads.
Revision ChangesPath
1.6 +15 -3
jakarta-tomcat/src/share/org/apache/tomcat/util/threads/ThreadPool.java
Index: ThreadPool.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/threads/ThreadPool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ThreadPool.java 2001/08/25 00:59:03 1.5
+++ ThreadPool.java 2001/08/26 01:55:59 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/threads/ThreadPool.java,v
1.5 2001/08/25 00:59:03 nacho Exp $
- * $Revision: 1.5 $
- * $Date: 2001/08/25 00:59:03 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/threads/ThreadPool.java,v
1.6 2001/08/26 01:55:59 costin Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/08/26 01:55:59 $
*
*
*
@@ -211,6 +211,7 @@
int toOpen = currentThreadCount + minSpareThreads;
openThreads(toOpen);
} else {
+ logFull(loghelper, currentThreadCount, maxThreads);
// Wait for a thread to become idel.
while(currentThreadsBusy == currentThreadCount) {
try {
@@ -239,6 +240,17 @@
currentThreadsBusy++;
}
c.runIt(r);
+}
+
+static boolean logfull=true;
+public static void logFull(Log loghelper, int currentThreadCount, int
maxThreads) {
+ if( logfull ) {
+ loghelper.log(All threads are busy, waiting. Please +
+ increase maxThreads or check the servlet +
+status + currentThreadCount + +
+ maxThreads );
+ logfull=false;
+ }
}
/**
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Response.java
costin 01/08/25 18:52:18
Modified:src/share/org/apache/tomcat/core Response.java
Log:
Fix for bug 1920.
Thanks to [EMAIL PROTECTED] (Eddie Ruvinsky) for reporting the bug.
There is no need to keep the duplicated 'int contentLength' ( it's just an
useless overhead ), and it brakes 'long' lengths.
Revision ChangesPath
1.55 +23 -16jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java
Index: Response.java
===
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Response.java 2001/08/17 04:02:54 1.54
+++ Response.java 2001/08/26 01:52:18 1.55
@@ -117,7 +117,6 @@
protected String contentType = DEFAULT_CONTENT_TYPE;
protected String contentLanguage = null;
protected String characterEncoding = DEFAULT_CHAR_ENCODING;
-protected int contentLength = -1;
protected Locale locale = DEFAULT_LOCALE;
// Constructor
@@ -252,7 +251,6 @@
contentType = DEFAULT_CONTENT_TYPE;
locale = DEFAULT_LOCALE;
characterEncoding = DEFAULT_CHAR_ENCODING;
- contentLength = -1;
status = 200;
headers.clear();
}
@@ -317,17 +315,17 @@
setContentType( value );
return true;
}
- if( name.equalsIgnoreCase( Content-Length ) ) {
- try {
- int cL=Integer.parseInt( value );
- setContentLength( cL );
- return true;
- } catch( NumberFormatException ex ) {
- // Do nothing - the spec doesn't have any throws
- // and the user might know what he's doing
- return false;
- }
- }
+// if( name.equalsIgnoreCase( Content-Length ) ) {
+// try {
+// int cL=Integer.parseInt( value );
+// setContentLength( cL );
+// return true;
+// } catch( NumberFormatException ex ) {
+// // Do nothing - the spec doesn't have any throws
+// // and the user might know what he's doing
+// return false;
+// }
+// }
if( name.equalsIgnoreCase( Content-Language ) ) {
// XXX XXX Need to construct Locale or something else
}
@@ -460,12 +458,22 @@
public void setContentLength(int contentLength) {
if( included ) return;
- this.contentLength = contentLength;
headers.setValue(Content-Length).setInt(contentLength);
}
+/** @deprecated. Not used in any piece of code, will fail for long values,
+ it's not an acurate value of the length ( just the header ).
+*/
public int getContentLength() {
- return contentLength;
+ String value=headers.getHeader( Content-Length );
+ if( value == null )
+ return -1;
+ try {
+ int cL=Integer.parseInt( value );
+ return cL;
+ } catch( Exception ex ) {
+ return -1;
+ }
}
// Extend
@@ -490,7 +498,6 @@
contentLanguage = null;
locale = DEFAULT_LOCALE;
characterEncoding = DEFAULT_CHAR_ENCODING;
- contentLength = -1;
status = 200;
usingWriter = false;
usingStream = false;
Re: [VOTE] New Tomcat Committer
Craig R. McClanahan wrote: As Jon informally did last week or so, I'd like to formally propose Christopher Cain [EMAIL PROTECTED] as a committer on Tomcat. A very big warm +1 :) Welcome Chris... Pier (who spent 4 days with his email down)
