svn commit: r463923 - in /tomcat/connectors/trunk/jk/native/iis/pcre: dftables.c dftables.dsp

[mturk]

Author: mturk
Date: Sat Oct 14 05:51:37 2006
New Revision: 463923

URL: http://svn.apache.org/viewvc?view=rev&rev=463923
Log:
Make sure the 4996 is disabled only for VS2005+

Modified:
tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c
tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp

Modified: tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c?view=diff&rev=463923&r1=463922&r2=463923
==
--- tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/pcre/dftables.c Sat Oct 14 05:51:37 
2006
@@ -46,6 +46,11 @@
 a function visible to the outside world, we make use of its code from here in
 order to be consistent. */
 
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+#define _CRT_SECURE_NO_DEPRECATE
+#pragma warning(disable: 4996)
+#endif
+
 #include 
 #include 
 #include 

Modified: tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp?view=diff&rev=463923&r1=463922&r2=463923
==
--- tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp (original)
+++ tomcat/connectors/trunk/jk/native/iis/pcre/dftables.dsp Sat Oct 14 05:51:37 
2006
@@ -42,7 +42,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D 
"_MBCS" /Fd"Release\dftables" /FD /c
-# ADD CPP /nologo /MD /W3 /wd:4996 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" 
/D "_MBCS" /Fd"Release\dftables" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" 
/Fd"Release\dftables" /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -68,7 +68,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "_WIN32" /D "_DEBUG" /D 
"_CONSOLE" /D "_MBCS" /Fd"Debug\dftables" /FD /c
-# ADD CPP /nologo /MDd /W3 /wd:4996 /EHsc /Zi /Od /D "_WIN32" /D "_DEBUG" /D 
"_CONSOLE" /D "_MBCS" /Fd"Debug\dftables" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" 
/D "_MBCS" /Fd"Debug\dftables" /FD /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe



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

DO NOT REPLY [Bug 40751] - the jsp pages consume a 100% of CPU usage on Pentium III (but on the 5.5.17 work fine)

[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://issues.apache.org/bugzilla/show_bug.cgi?id=40751





--- Additional Comments From [EMAIL PROTECTED]  2006-10-14 07:46 ---
This works for me. Please provide a simpe test jsp that runs as expected on
5.5.17 and slowly on 5.5.20.

If this was a Tomcat issue I would expect to see many reports on the users list
- there have not been any. Without a test case, the assumption is going to be
that something in your environment is the root cause rather than Tomcat.

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

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

svn commit: r463961 - /tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java

[pero]

Author: pero
Date: Sat Oct 14 08:39:38 2006
New Revision: 463961

URL: http://svn.apache.org/viewvc?view=rev&rev=463961
Log:
Set correct defaults at new mod_jk >1.2.15 properties 

Modified:

tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java

Modified: 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java?view=diff&rev=463961&r1=463960&r2=463961
==
--- 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
 (original)
+++ 
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
 Sat Oct 14 08:39:38 2006
@@ -29,7 +29,7 @@
  * by the mod_jk status (1.2.13) application.
  * 
  * @author Peter Rossbach
- * @version $Revision:$
+ * @version $Revision$
  * @since 5.5.10
  */
 public class JkStatusTask extends BaseRedirectorHelperTask {
@@ -403,21 +403,21 @@
 }
 createProperty(member, balancerIndex, workerIndex, "lbfactor");
 createProperty(member, balancerIndex, workerIndex, "lbvalue");
-if(member.getLbmult() > 0) {
+if(member.getLbmult() >= 0) {
 createProperty(member, balancerIndex, workerIndex, "lbmult");
 }
 createProperty(member, balancerIndex, workerIndex, "elected");
 createProperty(member, balancerIndex, workerIndex, "readed");
 createProperty(member, balancerIndex, workerIndex, "busy");
-if(member.getMaxbusy() > 0) {
+if(member.getMaxbusy() >= 0) {
 createProperty(member, balancerIndex, workerIndex, "maxbusy");
 }
 createProperty(member, balancerIndex, workerIndex, "transferred");
 createProperty(member, balancerIndex, workerIndex, "errors");
-if(member.getClienterrors() > 0) {
+if(member.getClienterrors() >= 0) {
 createProperty(member, balancerIndex, workerIndex, "clienterrors");
 }
-if(member.getDistance() > 0) {
+if(member.getDistance() >= 0) {
 createProperty(member, balancerIndex, workerIndex, "distance");
 }
 if (member.getDomain() != null) {
@@ -469,7 +469,7 @@
 Integer.toString(member.getLbfactor()));
 currentProject.setNewProperty(prefix + ".lbvalue",
 Long.toString(member.getLbvalue()));
-if(member.getLbmult() > 0) {
+if(member.getLbmult() >= 0) {
 currentProject.setNewProperty(prefix + ".lbmult",
 Long.toString(member.getLbmult()));
 }
@@ -481,17 +481,17 @@
 Long.toString(member.getTransferred()));
 currentProject.setNewProperty(prefix + ".busy",
 Integer.toString(member.getBusy()));
-if(member.getMaxbusy() > 0) {
+if(member.getMaxbusy() >= 0) {
 currentProject.setNewProperty(prefix + ".maxbusy",
 Long.toString(member.getMaxbusy()));
 }
 currentProject.setNewProperty(prefix + ".errors",
 Long.toString(member.getErrors()));
-if(member.getClienterrors() > 0) {
+if(member.getClienterrors() >= 0) {
 currentProject.setNewProperty(prefix + ".clienterrors",
 Long.toString(member.getClienterrors()));
 }
-if(member.getDistance() > 0) {
+if(member.getDistance() >= 0) {
 currentProject.setNewProperty(prefix + ".distance",
 Integer.toString(member.getDistance()));
 }



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

svn commit: r463969 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java

[pero]

Author: pero
Date: Sat Oct 14 09:14:48 2006
New Revision: 463969

URL: http://svn.apache.org/viewvc?view=rev&rev=463969
Log:
Make deployer class configureable. 

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java?view=diff&rev=463969&r1=463968&r2=463969
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java
 Sat Oct 14 09:14:48 2006
@@ -92,7 +92,13 @@
 private String configClass =
 "org.apache.catalina.startup.ContextConfig";
 
+/**
+ * The Java class name of the default host config configuration class 
(deployer)
+ */
+private String hostConfigClass =
+"org.apache.catalina.startup.HostConfig";
 
+
 /**
  * The Java class name of the default Context implementation class for
  * deployed web applications.
@@ -243,8 +249,32 @@
 
 }
 
+
+/**
+ * Return the Java class name of the host configuration class (deployer)
+ */
+public String getHostConfigClass() {
+
+return (this.hostConfigClass);
+
+}
+
 
 /**
+ * Set the Java class name of the host config configuration class 
(deployer)
+ *
+ * @param hostConfigClass The new host config configuration class 
(deployer)
+ */
+public void setHostConfigClass(String hostConfigClass) {
+
+String oldHostConfigClass = this.hostConfigClass;
+this.hostConfigClass = hostConfigClass;
+support.firePropertyChange("hostConfigClass",
+   oldHostConfigClass, this.hostConfigClass);
+}
+
+
+/**
  * Return the Java class name of the Context implementation class
  * for new web applications.
  */
@@ -758,7 +788,19 @@
 ObjectName serviceName=new ObjectName(domain + 
 ":type=Engine");
 
-HostConfig deployer = new HostConfig();
+HostConfig deployer = null;
+try {
+String hostConfigClassname = getHostConfigClass();
+if (hostConfigClassname != null) {
+Class clazz = Class.forName(hostConfigClassname);
+deployer = (HostConfig) clazz.newInstance();
+} else {
+deployer = new HostConfig();
+}
+} catch (Exception e) {
+log.warn("Error creating HostConfig for host " + name, e);
+throw e;
+}
 addLifecycleListener(deployer);
 if( mserver.isRegistered( serviceName )) {
 if(log.isDebugEnabled())



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

Re: svn commit: r463732 - /tomcat/build/tc5.5.x/build.properties.default

[Peter Rossbach]

Hi Remy,

can we also use Eclispe Compile 3.2.x at tomcat 5.5 like 6.0?

Peter



Am 13.10.2006 um 18:37 schrieb [EMAIL PROTECTED]:


Author: remm
Date: Fri Oct 13 09:37:14 2006
New Revision: 463732

URL: http://svn.apache.org/viewvc?view=rev&rev=463732
Log:
- Update download location.

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

Modified: tomcat/build/tc5.5.x/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/ 
build.properties.default?view=diff&rev=463732&r1=463731&r2=463732
== 


--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Fri Oct 13  
09:37:14 2006

@@ -138,7 +138,7 @@
 jdt.home=${base.path}/eclipse/plugins
 jdt.lib=${jdt.home}
 jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.1.2.jar
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/ 
drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip
+jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/ 
R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip



 # - Tomcat native library -



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

Re: svn commit: r463652 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp: AjpMessage.java AjpProcessor.java

[Peter Rossbach]

Hi Remy,

can we backport this to tomcat 5.5?

regards
Peter



Am 13.10.2006 um 13:39 schrieb [EMAIL PROTECTED]:


Author: remm
Date: Fri Oct 13 04:39:30 2006
New Revision: 463652

URL: http://svn.apache.org/viewvc?view=rev&rev=463652
Log:
- Packet must be ended before sending.
- Fix off by one check bug in AjpMessage.
- Fix recycling bug (setting streams to null when doing keepalive  
is not a good idea).


Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/ 
AjpMessage.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/ 
apache/coyote/ajp/AjpMessage.java? 
view=diff&rev=463652&r1=463651&r2=463652
== 

--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java  
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java  
Fri Oct 13 04:39:30 2006

@@ -275,7 +275,7 @@
  * @param numBytes The number of bytes to copy.
  */
 public void appendBytes(byte[] b, int off, int numBytes) {
-if (pos + numBytes + 3 >= buf.length) {
+if (pos + numBytes + 3 > buf.length) {
 log.error(sm.getString("ajpmessage.overflow", "" +  
numBytes, "" + pos),

 new ArrayIndexOutOfBoundsException());
 if (log.isDebugEnabled()) {
@@ -381,6 +381,11 @@
 return 4;
 }

+
+public int getPacketSize() {
+return buf.length;
+}
+

 public int processHeader() {
 pos = 0;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/ 
AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/ 
apache/coyote/ajp/AjpProcessor.java? 
view=diff&rev=463652&r1=463651&r2=463652
== 

--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/ 
AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/ 
AjpProcessor.java Fri Oct 13 04:39:30 2006

@@ -428,7 +428,9 @@

 rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
 recycle();
-
+input = null;
+output = null;
+
 return true;

 }
@@ -1062,9 +1064,6 @@
 response.recycle();
 certificates.recycle();

-input = null;
-output = null;
-
 }


@@ -1157,7 +1156,9 @@
 responseHeaderMessage.reset();
 responseHeaderMessage.appendByte 
(Constants.JK_AJP13_SEND_BODY_CHUNK);
 responseHeaderMessage.appendBytes(chunk.getBytes 
(), chunk.getOffset() + off, thisTime);

+responseHeaderMessage.end();
 output.write(responseHeaderMessage.getBuffer(), 0,  
responseHeaderMessage.getLen());

+
 off += thisTime;
 }




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

Re: svn commit: r463652 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp: AjpMessage.java AjpProcessor.java

[Remy Maucherat]

Peter Rossbach wrote:

Hi Remy,

can we backport this to tomcat 5.5?


Yes, but it's not actually used since the APR connector doesn't use 
appendBytes (it's not very useful either in Tomcat 6 since the connector 
is not used, but I'm it in JBoss).


Rémy

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

Re: svn commit: r463732 - /tomcat/build/tc5.5.x/build.properties.default

[Remy Maucherat]

Peter Rossbach wrote:

Hi Remy,

can we also use Eclispe Compile 3.2.x at tomcat 5.5 like 6.0?


I remember there are some API changes, but it's possible to upgrade.

Rémy

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