DO NOT REPLY [Bug 44775] New: restart

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44775

   Summary: restart
   Product: Tomcat 5
   Version: Unknown
  Platform: PC
OS/Version: Windows Vista
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]





-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 44775] restart

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44775


Olivier Jaquemet <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Comment #1 from Olivier Jaquemet <[EMAIL PROTECTED]>  2008-04-08 00:08:38 
PST ---
oops, sorry, made a mistake with the search interface...


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



svn commit: r645791 - in /tomcat/build/tc5.5.x: build.properties.default build.xml

2008-04-08 Thread rjung
Author: rjung
Date: Tue Apr  8 01:42:02 2008
New Revision: 645791

URL: http://svn.apache.org/viewvc?rev=645791&view=rev
Log:
Fix BZ 44463: War file upload in manager webapp fails due to missing
commons-io dependency. Added commons-io 1.4.
Part 1

Modified:
tomcat/build/tc5.5.x/build.properties.default
tomcat/build/tc5.5.x/build.xml

Modified: tomcat/build/tc5.5.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?rev=645791&r1=645790&r2=645791&view=diff
==
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Tue Apr  8 01:42:02 2008
@@ -175,6 +175,11 @@
 commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.2.jar
 
commons-fileupload.loc=${base-commons.loc}/fileupload/binaries/commons-fileupload-1.2-bin.tar.gz
 
+# - Commons IO, needed by Commons Fileupload -
+commons-io.home=${base.path}/commons-io-1.4
+commons-io.jar=${commons-io.home}/commons-io-1.4.jar
+commons-io.loc=${base-commons.loc}/io/binaries/commons-io-1.4-bin.tar.gz
+
 # - Java Management Extensions (JMX), JMX RI 1.2.1 or later or MX4J 2.0.1 
or later -
 jmx.home=${base.path}/mx4j-3.0.2
 jmx.lib=${jmx.home}/lib

Modified: tomcat/build/tc5.5.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=645791&r1=645790&r2=645791&view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Apr  8 01:42:02 2008
@@ -1935,6 +1935,11 @@
 
 
 
+  
+  
+
+
+
   
   
   



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



svn commit: r645793 - /tomcat/current/tc5.5.x/STATUS.txt

2008-04-08 Thread rjung
Author: rjung
Date: Tue Apr  8 01:43:24 2008
New Revision: 645793

URL: http://svn.apache.org/viewvc?rev=645793&view=rev
Log:
Fix BZ 44463: War file upload in manager webapp fails due to missing
commons-io dependency. Added commons-io 1.4.
Part 3/3

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=645793&r1=645792&r2=645793&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Apr  8 01:43:24 2008
@@ -36,13 +36,6 @@
   +1: markt, fhanik
   -1:
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44463
-  war file upload during manager webapp deploy is broken
-  http://people.apache.org/~rjung/patches/add_commons-io.patch
-  NOTE: there are also references to commons-fileupload in the
-  container build.xml, but I think we don't need to add commons-io there.
-  +1: rjung, fhanik, markt
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44562
   http://svn.apache.org/viewvc?rev=635294&view=rev (prior code clean up)
   http://svn.apache.org/viewvc?rev=635297&view=rev (the actual fix)



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



svn commit: r645792 - in /tomcat/container/tc5.5.x/webapps: docs/changelog.xml manager/build.xml

2008-04-08 Thread rjung
Author: rjung
Date: Tue Apr  8 01:42:44 2008
New Revision: 645792

URL: http://svn.apache.org/viewvc?rev=645792&view=rev
Log:
Fix BZ 44463: War file upload in manager webapp fails due to missing
commons-io dependency. Added commons-io 1.4.
Part 2

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/manager/build.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=645792&r1=645791&r2=645792&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Apr  8 01:42:44 2008
@@ -31,6 +31,16 @@
   
 
 
+
+  
+
+  
+44463: War file upload in manager webapp fails due to 
missing
+commons-io dependency. Added commons-io 1.4. (rjung)
+  
+
+  
+
 
   
 

Modified: tomcat/container/tc5.5.x/webapps/manager/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/manager/build.xml?rev=645792&r1=645791&r2=645792&view=diff
==
--- tomcat/container/tc5.5.x/webapps/manager/build.xml (original)
+++ tomcat/container/tc5.5.x/webapps/manager/build.xml Tue Apr  8 01:42:44 2008
@@ -52,6 +52,9 @@
  

  
+ 
+   
+ 
 
 
   
@@ -65,7 +68,7 @@
 
 
   
-  
+  
 
   
 



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



DO NOT REPLY [Bug 44463] GUI deploy in manager webapp fails due to missing common-io dependency

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44463


Rainer Jung <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #1 from Rainer Jung <[EMAIL PROTECTED]>  2008-04-08 01:43:50 PST ---
Fix applied. Expected to be part of a future release 5.5.27.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 41538] Unable to run Tomcat as a Windows service under JDK 1.6

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=41538





--- Comment #21 from John V Denley <[EMAIL PROTECTED]>  2008-04-08 02:16:55 PST 
---
Mark Thomas stated:

"Short term fix options:
 - add %JAVA_HOME%\bin to the PATH
 - copy %JAVA_HOME%\bin\mscvr71.dll to a folder on the path"

surely if you add %JAVA_HOME%\bin to the PATH environment variable, then the
mscvr71.dll is NOW in a folder on the path, so the second step is not
necessary, or am i being really dim and missing something obvious?!


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 44777] New: additional entries in logging. properties ignored

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44777

   Summary: additional entries in logging.properties ignored
   Product: Tomcat 6
   Version: 6.0.16
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


I am trying to remove these lines which shows up in catalina.out:

08-Apr-2008 12:10:37 org.apache.tomcat.util.http.Parameters processParameters
WARNING: Parameters: Invalid chunk ignored.

I have followed the documentation and modified
CATALINA_HOME/conf/logging.properties and added this line at the bottom of the
file:

org.apache.tomcat.util.http.Parameters.level = SEVERE

I then restart tomcat and the WARNING about the invalid chunk *still* appears.
If I do a ps I see that the tomcat process has apparently started up with a
system property pointing to the correct logging.properties:

opt/java/jdk/bin/java
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
-Djava.util.logging.config.file=/opt/java/apache-tomcat-6.0.16/conf/logging.properties

So it appears as if tomcat is ignoring what I set in logging.properties.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 44777] additional entries in logging.properties ignored

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44777


Mass Dosage <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 44777] additional entries in logging.properties ignored

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44777


Rainer Jung <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Comment #1 from Rainer Jung <[EMAIL PROTECTED]>  2008-04-08 04:55:42 PST ---
I tried with 6.0.16 exactly with the line you posted. It works. Without the
line I get the warning, with the line added to logging.properties it doesn't
show up any longer, although I retrieved the same URL.

I switched a couple of times back and force and everything worked.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 44777] additional entries in logging.properties ignored

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44777


Mass Dosage <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Resolution|WORKSFORME  |INVALID




--- Comment #2 from Mass Dosage <[EMAIL PROTECTED]>  2008-04-08 05:11:29 PST ---
Very strange, I removed all my logging changes to JDK and tomcat, re-applied
this to just logging.properties in CATALINA_HOME/conf and now it works. I'm not
sure why it didn't work for me earlier but I assume it was config issue and not
a bug in tomcat. Sorry!


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 41538] Unable to run Tomcat as a Windows service under JDK 1.6

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=41538





--- Comment #22 from Mark Thomas <[EMAIL PROTECTED]>  2008-04-08 09:20:30 PST 
---
Those were meant to be either or options.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



Web Service deployed on Tomcat stops responding after sometime

2008-04-08 Thread whitesox12

Hi,

I haven't used Tomcat before and is the first time I am using it. I have Web
Service that is deployed on Tomcat 5 installed on my local system. Web
Service I am using Spring, Hibernate. The issue I am facing is 
after deploying a service all works fine. As soon as I leave the service
idle means I don't make any calls to the Web Service for couple of hours
my Web Service stops working. If I try to invoke a Web Service I get an
error message and looking at the logs I don't see any call to the Web
Service
so I end up undeploying and redeploying the Web Service and it starts
working and if I don't invoke the Service for couple of hours it stops
working and 
I then I have to undeploy and redeploy the Service.

Any idea waht might be the problem where to look. Why the Service keeps
working as long as I keep calling but stops working if I call after couple
of hours. Is there
any settings I need to make on Tomcat as I am new to Tomcat so have no idea
where to look.

Any help is appreciated.

Thanks
-- 
View this message in context: 
http://www.nabble.com/Web-Service-deployed-on-Tomcat-stops-responding-after-sometime-tp16570276p16570276.html
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


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



Re: Web Service deployed on Tomcat stops responding after sometime

2008-04-08 Thread Jim Manico
You want tomcat-users, not tomcat developers. This list is for folks who 
are building the Tomcat product. You will not get an answer here.


- Jim


Hi,

I haven't used Tomcat before and is the first time I am using it. I have Web
Service that is deployed on Tomcat 5 installed on my local system. Web
Service I am using Spring, Hibernate. The issue I am facing is 
after deploying a service all works fine. As soon as I leave the service

idle means I don't make any calls to the Web Service for couple of hours
my Web Service stops working. If I try to invoke a Web Service I get an
error message and looking at the logs I don't see any call to the Web
Service
so I end up undeploying and redeploying the Web Service and it starts
working and if I don't invoke the Service for couple of hours it stops
working and 
I then I have to undeploy and redeploy the Service.


Any idea waht might be the problem where to look. Why the Service keeps
working as long as I keep calling but stops working if I call after couple
of hours. Is there
any settings I need to make on Tomcat as I am new to Tomcat so have no idea
where to look.

Any help is appreciated.

Thanks
  



--
Jim Manico
Senior Application Security Engineer
Aspect Security


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



DO NOT REPLY [Bug 44766] Tomcat's EL implementation doesn' t coerce custom Number subclasses

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44766





--- Comment #1 from Mark Thomas <[EMAIL PROTECTED]>  2008-04-08 14:23:38 PST ---
I've committed a fix to trunk. The original code is a mystery to me too at the
minute.

I'll propose this for 6.0.x once people on the list have had a couple of days
to mull it over.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



svn commit: r646076 - /tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

2008-04-08 Thread markt
Author: markt
Date: Tue Apr  8 14:25:04 2008
New Revision: 646076

URL: http://svn.apache.org/viewvc?rev=646076&view=rev
Log:
This fixes 44766 but I can't see why the code was written as originally coded. 
Any light much appreciated. I'll give it a couple of days and then, assuming 
there are no objections, propose it for 6.0.x.

Modified:
tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=646076&r1=646075&r2=646076&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Tue Apr  8 14:25:04 
2008
@@ -326,8 +326,8 @@
 return (obj != null && isNumberType(obj.getClass()));
 }
 
-public final static boolean isNumberType(final Class type) {
-return type == (java.lang.Long.class) || type == Long.TYPE || type == 
(java.lang.Double.class) || type == Double.TYPE || type == 
(java.lang.Byte.class) || type == Byte.TYPE || type == (java.lang.Short.class) 
|| type == Short.TYPE || type == (java.lang.Integer.class) || type == 
Integer.TYPE || type == (java.lang.Float.class) || type == Float.TYPE || type 
== (java.math.BigInteger.class) || type == (java.math.BigDecimal.class);
+public final static boolean isNumberType(final Class type) {
+return (Number.class.isAssignableFrom(type));
 }
 
 /**



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



Re: svn commit: r646076 - /tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

2008-04-08 Thread Konstantin Kolinko
Well, obviously the new code is not equivalent to the old one, because
Long.TYPE and other TYPE constants are the classes for the primitive
types (long, int etc.), and those are not an instance of
java.lang.Number.

>From the sources:
o.a.el.lang.ELArithmetic.isNumberType()
  is used in
  o.a.el.lang.ELSupport.checkType()
and that is used in
o.a.jasper.compiler.Validator.checkXmlAttributes()

Looking into Validator.checkXmlAttributes(), there is
"expectedClass = JspUtil.toClass(expectedType, loader);"

and the value returned by JspUtil.toClass() may be "long.class" or
other primitive class.

It is from reading the sources. Have not run it though.



2008/4/9  <[EMAIL PROTECTED]>:
>  Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
>  URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=646076&r1=646075&r2=646076&view=diff
>  
> ==
>  --- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
>  +++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Tue Apr  8 
> 14:25:04 2008
>  @@ -326,8 +326,8 @@
>  return (obj != null && isNumberType(obj.getClass()));
>  }
>
>  -public final static boolean isNumberType(final Class type) {
>  -return type == (java.lang.Long.class) || type == Long.TYPE || type 
> ==  ...
>  +public final static boolean isNumberType(final Class type) {
>  +return (Number.class.isAssignableFrom(type));
>  }
>

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



DO NOT REPLY [Bug 44448] Invalid Response if HTTP Status = 304

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=8


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WORKSFORME




--- Comment #4 from Mark Thomas <[EMAIL PROTECTED]>  2008-04-08 15:04:20 PST ---
I have just checked this with:
httpd 2.2.4
mod_proxy_ajp
Tomcat 5.5.HEAD

I have stepped through the code and Tomcat correctly sets a content length of
zero. Further, an examination of the headers received by the UA do not show any
invalid content length.

I don't see how this could be happening as to get the behaviour described here
you would have to have replaced Tomcat's DefaultServlet.

I am resolving this as worksforme for now but I am more than happy to look at
this further if you can provide the steps to reproduce from a clean install of
all components (mod_proxy_ajp preferred). You should be able to reproduce the
error using tomcat.gif file in the ROOT webapp.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



svn commit: r646102 - /tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

2008-04-08 Thread markt
Author: markt
Date: Tue Apr  8 15:17:34 2008
New Revision: 646102

URL: http://svn.apache.org/viewvc?rev=646102&view=rev
Log:
Revert previous fix as it needs correcting.

Modified:
tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=646102&r1=646101&r2=646102&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Tue Apr  8 15:17:34 
2008
@@ -326,8 +326,8 @@
 return (obj != null && isNumberType(obj.getClass()));
 }
 
-public final static boolean isNumberType(final Class type) {
-return (Number.class.isAssignableFrom(type));
+public final static boolean isNumberType(final Class type) {
+return type == (java.lang.Long.class) || type == Long.TYPE || type == 
(java.lang.Double.class) || type == Double.TYPE || type == 
(java.lang.Byte.class) || type == Byte.TYPE || type == (java.lang.Short.class) 
|| type == Short.TYPE || type == (java.lang.Integer.class) || type == 
Integer.TYPE || type == (java.lang.Float.class) || type == Float.TYPE || type 
== (java.math.BigInteger.class) || type == (java.math.BigDecimal.class);
 }
 
 /**



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



Re: svn commit: r646076 - /tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

2008-04-08 Thread Mark Thomas

Konstantin Kolinko wrote:

Well, obviously the new code is not equivalent to the old one, because
Long.TYPE and other TYPE constants are the classes for the primitive
types (long, int etc.), and those are not an instance of
java.lang.Number.


Yep my bad. I mis-read what my IDE was telling me. That explains some of 
the original code but not all of it. Any ideas?


Mark


PS Better patch to follow shortly.

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



svn commit: r646106 - /tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

2008-04-08 Thread markt
Author: markt
Date: Tue Apr  8 15:26:05 2008
New Revision: 646106

URL: http://svn.apache.org/viewvc?rev=646106&view=rev
Log:
Better patch for 44766. I still can't see why the original code listed the 
classes individually.

Modified:
tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=646106&r1=646105&r2=646106&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Tue Apr  8 15:26:05 
2008
@@ -326,8 +326,11 @@
 return (obj != null && isNumberType(obj.getClass()));
 }
 
-public final static boolean isNumberType(final Class type) {
-return type == (java.lang.Long.class) || type == Long.TYPE || type == 
(java.lang.Double.class) || type == Double.TYPE || type == 
(java.lang.Byte.class) || type == Byte.TYPE || type == (java.lang.Short.class) 
|| type == Short.TYPE || type == (java.lang.Integer.class) || type == 
Integer.TYPE || type == (java.lang.Float.class) || type == Float.TYPE || type 
== (java.math.BigInteger.class) || type == (java.math.BigDecimal.class);
+public final static boolean isNumberType(final Class type) {
+return type == Long.TYPE || type == Double.TYPE ||
+type == Byte.TYPE || type == Short.TYPE ||
+type == Integer.TYPE || type == Float.TYPE ||
+Number.class.isAssignableFrom(type);
 }
 
 /**



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



svn commit: r646111 - /tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

2008-04-08 Thread markt
Author: markt
Date: Tue Apr  8 15:38:19 2008
New Revision: 646111

URL: http://svn.apache.org/viewvc?rev=646111&view=rev
Log:
Fix bug 44438. Provide additional debug logging during initialisation.
Patch provided by Tim Whittington.

Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=646111&r1=646110&r2=646111&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Tue Apr  8 15:38:19 
2008
@@ -1659,6 +1659,9 @@
 logger = NULL;
 }
 StringCbCopy(shm_name, MAX_PATH, SHM_DEF_NAME);
+
+jk_log(logger, JK_LOG_INFO, "Starting %s", VERSION_STRING );
+
 if (*serverName) {
 size_t i;
 StringCbCat(shm_name, MAX_PATH, "_");
@@ -1691,6 +1694,11 @@
 jk_log(logger, JK_LOG_DEBUG, "Using rewrite rule file %s.",
rewrite_rule_file);
 jk_log(logger, JK_LOG_DEBUG, "Using uri select %d.", 
uri_select_option);
+
+jk_log(logger, JK_LOG_DEBUG, "Using uri header %s.", URI_HEADER_NAME);
+jk_log(logger, JK_LOG_DEBUG, "Using query header %s.", 
QUERY_HEADER_NAME);
+jk_log(logger, JK_LOG_DEBUG, "Using worker header %s.", 
WORKER_HEADER_NAME);
+jk_log(logger, JK_LOG_DEBUG, "Using translate header %s.", 
TOMCAT_TRANSLATE_HEADER_NAME);
 }
 
 if (rewrite_rule_file[0] && jk_map_alloc(&rewrite_map)) {
@@ -1979,12 +1987,14 @@
 
 DWORD huge_buf_sz;
 
+JK_TRACE_ENTER(logger);
+
 s->start_response = start_response;
 s->read = read;
 s->write = write;
 
 if (!(huge_buf = jk_pool_alloc(&private_data->p, MAX_PACKET_SIZE))) {
-
+JK_TRACE_EXIT(logger);
 return JK_FALSE;
 }
 huge_buf_sz = MAX_PACKET_SIZE;
@@ -1992,12 +2002,22 @@
 GET_SERVER_VARIABLE_VALUE(HTTP_URI_HEADER_NAME, s->req_uri);
 GET_SERVER_VARIABLE_VALUE(HTTP_QUERY_HEADER_NAME, s->query_string);
 
+if (JK_IS_DEBUG_LEVEL(logger)) {
+jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s", 
HTTP_WORKER_HEADER_NAME, (*worker_name) );
+jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s", 
HTTP_URI_HEADER_NAME, s->req_uri);
+jk_log(logger, JK_LOG_DEBUG, "Reading extension header %s: %s", 
HTTP_QUERY_HEADER_NAME, s->query_string);
+}
+
 if (s->req_uri == NULL) {
+if (JK_IS_DEBUG_LEVEL(logger))
+jk_log(logger, JK_LOG_DEBUG, "No URI header value provided. 
Defaulting to old behaviour" );
 s->query_string = private_data->lpEcb->lpszQueryString;
 *worker_name = DEFAULT_WORKER_NAME;
 GET_SERVER_VARIABLE_VALUE("URL", s->req_uri);
-if (unescape_url(s->req_uri) < 0)
+if (unescape_url(s->req_uri) < 0) {
+JK_TRACE_EXIT(logger);
 return JK_FALSE;
+}
 getparents(s->req_uri);
 }
 
@@ -2129,6 +2149,7 @@
 jk_pool_alloc(&private_data->p, (cnt + 1) * sizeof(char *));
 
 if (!s->headers_names || !s->headers_values || !headers_buf) {
+JK_TRACE_EXIT(logger);
 return JK_FALSE;
 }
 
@@ -2214,10 +2235,12 @@
 }
 else {
 /* We must have our two headers */
+JK_TRACE_EXIT(logger);
 return JK_FALSE;
 }
 }
 else {
+JK_TRACE_EXIT(logger);
 return JK_FALSE;
 }
 
@@ -2238,6 +2261,7 @@
STRNULL_FOR_NULL(s->req_uri));
 }
 
+JK_TRACE_EXIT(logger);
 return JK_TRUE;
 }
 



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



DO NOT REPLY [Bug 44438] Extended logging for ISAPI redirector request init

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44438


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #2 from Mark Thomas <[EMAIL PROTECTED]>  2008-04-08 15:36:03 PST ---
Patch applied. Many thanks.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 44436] Report standardised versions on ISAPI redirector init

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44436


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #2 from Mark Thomas <[EMAIL PROTECTED]>  2008-04-08 15:50:40 PST ---
Patch committed (with a minor tweak).

Again, many thanks.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



svn commit: r646121 - /tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

2008-04-08 Thread markt
Author: markt
Date: Tue Apr  8 15:52:49 2008
New Revision: 646121

URL: http://svn.apache.org/viewvc?rev=646121&view=rev
Log:
Fix bug 44436. Make sure -dev is reported in logs for dev builds. Align version 
message with mod_jk.
Patch provided by Tim Whittington (with a very minor tweak)

Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=646121&r1=646120&r2=646121&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Tue Apr  8 15:52:49 
2008
@@ -49,7 +49,7 @@
 
 #include 
 
-#define VERSION_STRING "Jakarta/ISAPI/" JK_VERSTRING
+#define VERSION_STRING "Jakarta/ISAPI/" JK_EXPOSED_VERSION
 #define SHM_DEF_NAME   "JKISAPISHMEM"
 #define DEFAULT_WORKER_NAME ("ajp13")
 
@@ -1799,9 +1799,7 @@
 }
 }
 if (rc) {
-jk_log(logger, JK_LOG_INFO,
-   "isapi_redirect/%s initialized",
-   JK_VERSTRING);
+jk_log(logger, JK_LOG_INFO, "Initialized %s", (VERSION_STRING) );
 }
 return rc;
 }



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



DO NOT REPLY [Bug 44354] cookies= false not honored when jsessionid comes from a cookie

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44354


Mark Thomas <[EMAIL PROTECTED]> changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #5 from Mark Thomas <[EMAIL PROTECTED]>  2008-04-08 16:01:29 PST ---
The fix for this was committed to 5.5.x and is in 5.5.26 onwards.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



Re: svn commit: r645722 - /tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

2008-04-08 Thread Filip Hanik - Dev Lists

just taking a quick look at the patch, this is a memory leak.
the buffer will simply grow larger and larger until an OOM happens, if 
one keeps marking the buffer

when I am more awake, I'll help out on this, it's very easy to reproduce
http://people.apache.org/~fhanik/upload-mark.jsp

Filip

[EMAIL PROTECTED] wrote:

Author: markt
Date: Mon Apr  7 15:47:54 2008
New Revision: 645722

URL: http://svn.apache.org/viewvc?rev=645722&view=rev
Log:
All of the issues I was seeing with mark/reset were due to states that resulted 
in a call to CharChunk.flushBuffer().
I tried many different ways to fix it but by far the simplest was this patch 
that just increases the size of the CharChunk internal buffer when creating the 
mark sufficiently that flushBuffer() is never called.
With this patch I can't break mark/reset with bug 44494's test case in single 
or multibyte mode.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=645722&r1=645721&r2=645722&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Mon Apr  7 
15:47:54 2008
@@ -457,11 +457,7 @@
 cb.setOffset(0);
 }
 }
-int offset = readAheadLimit;
-if (offset < size) {
-offset = size;
-}
-cb.setLimit(cb.getStart() + offset);
+cb.setLimit(cb.getStart() + readAheadLimit + size);
 markPos = cb.getStart();
 }
 




-
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]



Re: svn commit: r645722 - /tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

2008-04-08 Thread Filip Hanik - Dev Lists
ignore my prev email about the mem leak, I wasn't up to current in 
trunk, and was running into something else


Filip

[EMAIL PROTECTED] wrote:

Author: markt
Date: Mon Apr  7 15:47:54 2008
New Revision: 645722

URL: http://svn.apache.org/viewvc?rev=645722&view=rev
Log:
All of the issues I was seeing with mark/reset were due to states that resulted 
in a call to CharChunk.flushBuffer().
I tried many different ways to fix it but by far the simplest was this patch 
that just increases the size of the CharChunk internal buffer when creating the 
mark sufficiently that flushBuffer() is never called.
With this patch I can't break mark/reset with bug 44494's test case in single 
or multibyte mode.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=645722&r1=645721&r2=645722&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Mon Apr  7 
15:47:54 2008
@@ -457,11 +457,7 @@
 cb.setOffset(0);
 }
 }
-int offset = readAheadLimit;
-if (offset < size) {
-offset = size;
-}
-cb.setLimit(cb.getStart() + offset);
+cb.setLimit(cb.getStart() + readAheadLimit + size);
 markPos = cb.getStart();
 }
 




-
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]



Re: svn commit: r646106 - /tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

2008-04-08 Thread Remy Maucherat
On Tue, 2008-04-08 at 22:26 +, [EMAIL PROTECTED] wrote:
> Author: markt
> Date: Tue Apr  8 15:26:05 2008
> New Revision: 646106
> 
> URL: http://svn.apache.org/viewvc?rev=646106&view=rev
> Log:
> Better patch for 44766. I still can't see why the original code listed the 
> classes individually.

Yes, it didn't look like a very good idea.

Rémy



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



DO NOT REPLY [Bug 44766] Tomcat's EL implementation doesn' t coerce custom Number subclasses

2008-04-08 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44766





--- Comment #2 from Konstantin Kolinko <[EMAIL PROTECTED]>  2008-04-08 18:39:52 
PST ---
Created an attachment (id=21797)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=21797)
Code cleanup for org.apache.el.* - removes attempts to compare Object classes
against primitive types.

Code cleanup for several classes in org.apache.el.**

In those classes there are places where java.lang.Class instances are compared
against classes of primitive types (such as Long.TYPE, Integer.TYPE, etc.)

In the case when those java.lang.Class instances are a result of
object.getClass() call (that is, obtained from an Object), they cannot be equal
to a primitive type.  In such case these comparisons are no-op, producing the
value of false.

This patch removes these no-op comparisons from the code.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



Re: svn commit: r646076 - /tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

2008-04-08 Thread Konstantin Kolinko
Surely, there are irregularities.

There are many places where java.lang.Class instance is not a
parameter to the method, but obtained in place by calling
obj.getClass().  In such cases comparing object's class against
primitive type classes is meaningless.

I've created a patch to clean them:
https://issues.apache.org/bugzilla/attachment.cgi?id=21797

Comparing against primitive types is only meaningful in method
isNumberType(Class) of ELArithmetic and several methods in ELSupport,
where the Class argument is passed explicitly.


What is the history of this code before rev. 389146 of 2006-03-27 when
/tomcat/tc6.0.x/trunk was created?


2008/4/9 Mark Thomas <[EMAIL PROTECTED]>:
> Konstantin Kolinko wrote:
>
> > Well, obviously the new code is not equivalent to the old one, because
> > Long.TYPE and other TYPE constants are the classes for the primitive
> > types (long, int etc.), and those are not an instance of
> > java.lang.Number.
> >
>
>  Yep my bad. I mis-read what my IDE was telling me. That explains some of
> the original code but not all of it. Any ideas?
>
>  Mark
>
>
>  PS Better patch to follow shortly.
>
>
>
>  -
>  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]



svn commit: r646196 - /tomcat/tc6.0.x/trunk/STATUS.txt

2008-04-08 Thread fhanik
Author: fhanik
Date: Tue Apr  8 23:43:37 2008
New Revision: 646196

URL: http://svn.apache.org/viewvc?rev=646196&view=rev
Log:
votes

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=646196&r1=646195&r2=646196&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr  8 23:43:37 2008
@@ -100,5 +100,5 @@
   cases I could think of.
   http://svn.apache.org/viewvc?rev=645719&view=rev (Remy's resizing fix)
   http://svn.apache.org/viewvc?rev=645722&view=rev (mark/reset fix)
-  +1: markt
+  +1: markt, fhanik
   -1:



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



Re: svn commit: r646076 - /tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java

2008-04-08 Thread Mark Thomas

Konstantin Kolinko wrote:

I've created a patch to clean them:
https://issues.apache.org/bugzilla/attachment.cgi?id=21797


Many thanks.


What is the history of this code before rev. 389146 of 2006-03-27 when
/tomcat/tc6.0.x/trunk was created?


As I recall, the whole EL implementation was provided as a single 
contribution and Remy included it when he created the 6.0.x branch.


Mark


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