JBossWeb SVN: r553 - trunk/java/org/apache/tomcat/util/net.
by jbossweb-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-26 15:44:56 -0400 (Wed, 26 Mar 2008)
New Revision: 553
Modified:
trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Log:
Fix core dump on server shutdown by destroying dereferenced socket
Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-03-26 15:52:47 UTC (rev 552)
+++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-03-26 19:44:56 UTC (rev 553)
@@ -1795,21 +1795,30 @@
if (setSocketOptions(socket)) {
getPoller().add(socket);
} else {
- // Close socket and pool
- Socket.destroy(socket);
+ // Close socket and pool only if it wasn't closed
+ // already by the parent pool
+ if (serverSockPool != 0) {
+ Socket.destroy(socket);
+ }
socket = 0;
}
} else {
// Process the request from this socket
if ((status != null) && (handler.event(socket, status) == Handler.SocketState.CLOSED)) {
- // Close socket and pool
- Socket.destroy(socket);
+ // Close socket and pool only if it wasn't closed
+ // already by the parent pool
+ if (serverSockPool != 0) {
+ Socket.destroy(socket);
+ }
socket = 0;
} else if ((status == null) && ((options && !setSocketOptions(socket))
|| handler.process(socket) == Handler.SocketState.CLOSED)) {
- // Close socket and pool
- Socket.destroy(socket);
+ // Close socket and pool only if it wasn't closed
+ // already by the parent pool
+ if (serverSockPool != 0) {
+ Socket.destroy(socket);
+ }
socket = 0;
}
}
16 years, 9 months
JBossWeb SVN: r552 - trunk.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-26 11:52:47 -0400 (Wed, 26 Mar 2008)
New Revision: 552
Modified:
trunk/dist.xml
Log:
- Packaging changes.
Modified: trunk/dist.xml
===================================================================
--- trunk/dist.xml 2008-03-26 14:12:48 UTC (rev 551)
+++ trunk/dist.xml 2008-03-26 15:52:47 UTC (rev 552)
@@ -288,12 +288,6 @@
<copy todir="${tomcat.dist}/bin">
<fileset dir="res/procrun/" includes="jboss*.exe"/>
</copy>
- <copy todir="${tomcat.dist}/bin/amd64">
- <fileset dir="res/procrun/amd64" includes="jboss*.exe"/>
- </copy>
- <copy todir="${tomcat.dist}/bin/ia64">
- <fileset dir="res/procrun/ia64" includes="jboss*.exe"/>
- </copy>
<zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip">
<zipfileset dir="${tomcat.dist}" prefix="${final.name}">
<include name="bin/**"/>
@@ -314,8 +308,6 @@
in build.properties or in this file
-->
<exclude name="bin/*.exe" if="exclude.service.binaries"/>
- <exclude name="bin/amd64/" if="exclude.service.binaries"/>
- <exclude name="bin/ia64/" if="exclude.service.binaries"/>
<exclude name="bin/service.bat" if="exclude.service.binaries"/>
</zipfileset>
</zip>
@@ -392,8 +384,6 @@
<exclude name="src/**" />
<exclude name="bin/*.dll"/>
<exclude name="bin/*.exe"/>
- <exclude name="bin/amd64/"/>
- <exclude name="bin/ia64/"/>
<exclude name="bin/service.bat"/>
<!-- Do we need windows .bat files as part of .tgz?
If not apply the following rule
16 years, 9 months
JBossWeb SVN: r551 - trunk/java/org/apache/tomcat/jni.
by jbossweb-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-26 10:12:48 -0400 (Wed, 26 Mar 2008)
New Revision: 551
Added:
trunk/java/org/apache/tomcat/jni/Library.properties
trunk/java/org/apache/tomcat/jni/LibraryLoader.java
Modified:
trunk/java/org/apache/tomcat/jni/Library.java
Log:
Add alternate native loader.
The libraries are loaded according to the Library.properties file.
They are chosen according to the JVM arch used and
they are supposed to be inside catalina.home/bin/platform/cpu.
The old logic is stil favored if setup correctly.
Modified: trunk/java/org/apache/tomcat/jni/Library.java
===================================================================
--- trunk/java/org/apache/tomcat/jni/Library.java 2008-03-26 14:07:07 UTC (rev 550)
+++ trunk/java/org/apache/tomcat/jni/Library.java 2008-03-26 14:12:48 UTC (rev 551)
@@ -50,6 +50,15 @@
break;
}
if (!loaded) {
+ try {
+ LibraryLoader.load(System.getProperty("catalina.home"));
+ loaded = true;
+ }
+ catch (Throwable e) {
+ err += e.getMessage();
+ }
+ }
+ if (!loaded) {
err += "(";
err += System.getProperty("java.library.path");
err += ")";
Added: trunk/java/org/apache/tomcat/jni/Library.properties
===================================================================
--- trunk/java/org/apache/tomcat/jni/Library.properties (rev 0)
+++ trunk/java/org/apache/tomcat/jni/Library.properties 2008-03-26 14:12:48 UTC (rev 551)
@@ -0,0 +1,57 @@
+# Copyright(c) 2007 Red Hat Middleware, LLC,
+# and individual contributors as indicated by the @authors tag.
+# See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library in the file COPYING.LIB;
+# if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+#
+# @author Mladen Turk
+#
+# Library.properties
+#
+windows.count=5
+windows.0=libapr-1.dll
+windows.1=libaprutil-1.dll
+windows.2=?libeay32.dll
+windows.3=?ssleay32.dll
+windows.4=libtcnative-1.dll
+
+linux2.count=7
+linux2.0=libapr-1.so
+linux2.1=libexpat.so
+linux2.2=libaprutil-1.so
+linux2.3=?libz.so
+linux2.4=?libcrypto.so
+linux2.5=?libssl.so
+linux2.6=libtcnative-1.so
+
+solaris.count=7
+solaris.0=libapr-1.so
+solaris.1=libexpat.so
+solaris.2=libaprutil-1.so
+solaris.3=?libz.so
+solaris.4=?libcrypto.so
+solaris.5=?libssl.so
+solaris.6=libtcnative-1.so
+
+hpux.count=7
+hpux.0=libapr-1.sl
+hpux.1=libexpat.sl
+hpux.2=libaprutil-1.sl
+hpux.3=?libz.sl
+hpux.4=?libcrypto.sl
+hpux.5=?libssl.sl
+hpux.6=libtcnative-1.sl
Property changes on: trunk/java/org/apache/tomcat/jni/Library.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/java/org/apache/tomcat/jni/LibraryLoader.java
===================================================================
--- trunk/java/org/apache/tomcat/jni/LibraryLoader.java (rev 0)
+++ trunk/java/org/apache/tomcat/jni/LibraryLoader.java 2008-03-26 14:12:48 UTC (rev 551)
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tomcat.jni;
+
+/** LibraryLoader
+ *
+ * @author Mladen Turk
+ * @version $Revision: $, $Date: $
+ */
+
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+public final class LibraryLoader {
+
+
+ public static String getDefaultPlatformName()
+ {
+ String name = System.getProperty("os.name");
+ String platform = "unknown";
+
+ if (name.startsWith("Windows"))
+ platform = "windows";
+ else if (name.startsWith("Mac OS"))
+ platform = "macosx";
+ else if (name.endsWith("BSD"))
+ platform = "bsd";
+ else if (name.equals("Linux"))
+ platform = "linux2";
+ else if (name.equals("Solaris"))
+ platform = "solaris";
+ else if (name.equals("SunOS"))
+ platform = "solaris";
+ else if (name.equals("HP-UX"))
+ platform = "hpux";
+ else if (name.equals("AIX"))
+ platform = "aix";
+
+ return platform;
+ }
+
+ public static String getDefaultPlatformCpu()
+ {
+ String cpu;
+ String arch = System.getProperty("os.arch");
+
+ if (arch.endsWith("86"))
+ cpu = "x86";
+ else if (arch.startsWith("PA_RISC"))
+ cpu = "parisc2";
+ else if (arch.startsWith("IA64"))
+ cpu = "i64";
+ else if (arch.startsWith("sparc"))
+ cpu = "sparcv9";
+ else if (arch.equals("x86_64"))
+ cpu = "x64";
+ else if (arch.equals("amd64"))
+ cpu = "x64";
+ else
+ cpu = arch;
+ return cpu;
+ }
+
+ public static String getDefaultLibraryPath()
+ {
+ String name = getDefaultPlatformName();
+ String arch = getDefaultPlatformCpu();
+
+ return name + File.separator + arch;
+ }
+
+ public static String getDefaultMetaPath()
+ {
+ return "META-INF" + File.separator + "lib" + File.separator;
+ }
+
+ private LibraryLoader()
+ {
+ // Disallow creation
+ }
+
+ protected static void load(String rootPath)
+ throws SecurityException, IOException, UnsatisfiedLinkError
+ {
+ int count = 0;
+ String name = getDefaultPlatformName();
+ String path = getDefaultLibraryPath();
+ Properties props = new Properties();
+
+ File root = new File(rootPath);
+ String basePath = root.getCanonicalPath().toString();
+ if (!basePath.endsWith(File.separator)) {
+ basePath += File.separator;
+ }
+ String metaPath = basePath + getDefaultMetaPath();
+ File meta = new File(metaPath);
+ if (!meta.exists()) {
+ /* Try adding bin prefix to rootPath.
+ * Used if we pass catalina.base property
+ */
+ metaPath = basePath + "bin" + File.separator +
+ getDefaultMetaPath();
+ }
+ try {
+ InputStream is = LibraryLoader.class.getResourceAsStream
+ ("/org/apache/tomcat/jni/Library.properties");
+ props.load(is);
+ is.close();
+ count = Integer.parseInt(props.getProperty(name + ".count"));
+ }
+ catch (Throwable t) {
+ throw new UnsatisfiedLinkError("Can't use Library.properties");
+ }
+ for (int i = 0; i < count; i++) {
+ boolean optional = false;
+ String dlibName = props.getProperty(name + "." + i);
+ if (dlibName.startsWith("?")) {
+ dlibName = dlibName.substring(1);
+ optional = true;
+ }
+ String fullPath = metaPath + path +
+ File.separator + dlibName;
+ try {
+ Runtime.getRuntime().load(fullPath);
+ }
+ catch (Throwable d) {
+ if (!optional) {
+ throw new UnsatisfiedLinkError(dlibName);
+ }
+ }
+ }
+ }
+
+}
Property changes on: trunk/java/org/apache/tomcat/jni/LibraryLoader.java
___________________________________________________________________
Name: svn:eol-style
+ native
16 years, 9 months
JBossWeb SVN: r550 - trunk/java/org/apache/catalina/connector.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-26 10:07:07 -0400 (Wed, 26 Mar 2008)
New Revision: 550
Modified:
trunk/java/org/apache/catalina/connector/CoyoteReader.java
Log:
- Throwing an IAE is in the javadocs. Submitted by Suzuki Yuichiro.
Modified: trunk/java/org/apache/catalina/connector/CoyoteReader.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteReader.java 2008-03-26 13:17:24 UTC (rev 549)
+++ trunk/java/org/apache/catalina/connector/CoyoteReader.java 2008-03-26 14:07:07 UTC (rev 550)
@@ -125,6 +125,10 @@
public void mark(int readAheadLimit)
throws IOException {
+ // See BufferedReader#mark(int) JavaDoc
+ if (readAheadLimit < 0) {
+ throw new IllegalArgumentException("readAheadLimit value is negative");
+ }
ib.mark(readAheadLimit);
}
16 years, 9 months
JBossWeb SVN: r549 - trunk/java/org/apache/tomcat/util/buf.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-26 09:17:24 -0400 (Wed, 26 Mar 2008)
New Revision: 549
Modified:
trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
Log:
- Fix obviously wrong setLimit.
Modified: trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
===================================================================
--- trunk/java/org/apache/tomcat/util/buf/B2CConverter.java 2008-03-26 12:20:23 UTC (rev 548)
+++ trunk/java/org/apache/tomcat/util/buf/B2CConverter.java 2008-03-26 13:17:24 UTC (rev 549)
@@ -96,8 +96,11 @@
}
if( debug > 1 )
log("Converted: " + new String( result, 0, cnt ));
-
- cb.setLimit(cb.getStart() + cnt);
+ // Make sure there's enough space to append the characters which
+ // have been converted
+ if (cb.getEnd() + cnt > cb.getLimit()) {
+ cb.setLimit(cb.getEnd() + cnt);
+ }
cb.append( result, 0, cnt );
limit = limit - (l - bb.getLength());
}
16 years, 9 months
JBossWeb SVN: r548 - trunk/res/procrun.
by jbossweb-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-26 08:20:23 -0400 (Wed, 26 Mar 2008)
New Revision: 548
Added:
trunk/res/procrun/jbossweb.i64.exe
trunk/res/procrun/jbossweb.x64.exe
trunk/res/procrun/jbosswebw.i64.exe
trunk/res/procrun/jbosswebw.x64.exe
Removed:
trunk/res/procrun/amd64/
trunk/res/procrun/ia64/
Modified:
trunk/res/procrun/jbossweb.exe
trunk/res/procrun/jbosswebw.exe
Log:
Use CPU suffixed binaries. They allow to share the same install config regardless of Host CPU and JVM platform used.
Modified: trunk/res/procrun/jbossweb.exe
===================================================================
(Binary files differ)
Added: trunk/res/procrun/jbossweb.i64.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/jbossweb.i64.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/res/procrun/jbossweb.x64.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/jbossweb.x64.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/res/procrun/jbosswebw.exe
===================================================================
(Binary files differ)
Added: trunk/res/procrun/jbosswebw.i64.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/jbosswebw.i64.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/res/procrun/jbosswebw.x64.exe
===================================================================
(Binary files differ)
Property changes on: trunk/res/procrun/jbosswebw.x64.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 9 months
JBossWeb SVN: r547 - trunk/bin.
by jbossweb-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-03-26 08:06:52 -0400 (Wed, 26 Mar 2008)
New Revision: 547
Modified:
trunk/bin/service.bat
Log:
Detect 64-bit JVM and use the 64-bit procrun if present
Modified: trunk/bin/service.bat
===================================================================
--- trunk/bin/service.bat 2008-03-26 01:38:36 UTC (rev 546)
+++ trunk/bin/service.bat 2008-03-26 12:06:52 UTC (rev 547)
@@ -53,7 +53,7 @@
set CATALINA_BASE=%CATALINA_HOME%
:gotBase
-set EXECUTABLE=%CATALINA_HOME%\bin\jbossweb.exe
+set EXECUTABLE=%CATALINA_HOME%\bin\jbossweb
rem Set default Service name
set SERVICE_NAME=JBossWeb
@@ -82,6 +82,7 @@
:doInstall
rem Install the service
echo Installing the service '%SERVICE_NAME%' ...
+echo.
echo Using CATALINA_HOME: %CATALINA_HOME%
echo Using CATALINA_BASE: %CATALINA_BASE%
echo Using JAVA_HOME: %JAVA_HOME%
@@ -90,7 +91,6 @@
rem Each command line option is prefixed with PR_
set PR_DESCRIPTION=JBoss Web Server - http://labs.jboss.com/jbossweb/
-set PR_INSTALL=%EXECUTABLE%
set PR_LOGPATH=%CATALINA_BASE%\logs
set PR_CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar
rem Set the server jvm from JAVA_HOME
@@ -100,8 +100,34 @@
set PR_JVM=%JAVA_HOME%\jre\bin\client\jvm.dll
if exist "%PR_JVM%" goto foundJvm
set PR_JVM=auto
+
:foundJvm
+rem Set Java platform if 64-Bit JVM used
+set JAVA_PLATFORM=
+"%JAVA_HOME%\jre\bin\java.exe" -version 2>&1 | findstr /I 64-Bit > nul
+if not errorlevel == 1 (
+ if /I "%PROCESSOR_ARCHITECTURE%"=="IA64" (set JAVA_PLATFORM=ia64
+ ) else if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set JAVA_PLATFORM=x64
+ ) else if /I "%PROCESSOR_ARCHITECTURE%"=="x64" (set JAVA_PLATFORM=x64
+ ) else if /I "%PROCESSOR_ARCHITEW6432%"=="IA64" (set JAVA_PLATFORM=i64
+ ) else if /I "%PROCESSOR_ARCHITEW6432%"=="AMD64" (set JAVA_PLATFORM=x64
+ ) else (
+ echo PROCESSOR_ARCHITECTURE is not set. Unexpected results may occur.
+ echo Set PROCESSOR_ARCHITECTURE according to the 64-Bit JVM used.
+ )
+)
+
+if exist "%EXECUTABLE%.%JAVA_PLATFORM%.exe" (
+ set "PR_INSTALL=%EXECUTABLE%.%JAVA_PLATFORM%.exe"
+) else (
+ set "PR_INSTALL=%EXECUTABLE%.exe"
+)
+
+echo Using PLATFORM: %JAVA_PLATFORM%
echo Using JVM: %PR_JVM%
+echo Using INSTALL: %PR_INSTALL%
+echo.
+
"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
if not errorlevel 1 goto installed
echo Failed installing '%SERVICE_NAME%' service
16 years, 9 months
JBossWeb SVN: r546 - in trunk: java/org/apache/tomcat/util/buf and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-25 21:38:36 -0400 (Tue, 25 Mar 2008)
New Revision: 546
Modified:
trunk/java/org/apache/catalina/connector/InputBuffer.java
trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
trunk/webapps/docs/changelog.xml
Log:
- 44494: Fix reads with multibyte characters.
Modified: trunk/java/org/apache/catalina/connector/InputBuffer.java
===================================================================
--- trunk/java/org/apache/catalina/connector/InputBuffer.java 2008-03-25 15:51:30 UTC (rev 545)
+++ trunk/java/org/apache/catalina/connector/InputBuffer.java 2008-03-26 01:38:36 UTC (rev 546)
@@ -399,7 +399,6 @@
state = CHAR_STATE;
conv.convert(bb, cb, bb.getLength());
- bb.setOffset(bb.getEnd());
return cb.getLength();
Modified: trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
===================================================================
--- trunk/java/org/apache/tomcat/util/buf/B2CConverter.java 2008-03-25 15:51:30 UTC (rev 545)
+++ trunk/java/org/apache/tomcat/util/buf/B2CConverter.java 2008-03-26 01:38:36 UTC (rev 546)
@@ -74,45 +74,39 @@
throws IOException
{
// Set the ByteChunk as input to the Intermediate reader
- convert(bb, cb, cb.getBuffer().length - cb.getEnd());
+ convert(bb, cb, bb.getLength());
}
- public void convert( ByteChunk bb, CharChunk cb, int limit)
- throws IOException
- {
- iis.setByteChunk( bb );
- convert(cb, limit);
- }
-
- private void convert(CharChunk cb, int limit)
- throws IOException
- {
- try {
- // read from the reader
- int count = 0;
- while( limit > 0 ) { // conv.ready() ) {
+ public void convert(ByteChunk bb, CharChunk cb, int limit)
+ throws IOException {
+ iis.setByteChunk(bb);
+ try {
+ // read from the reader
+ int l = 0;
+ while( limit > 0 ) { // conv.ready() ) {
int size = limit < BUFFER_SIZE ? limit : BUFFER_SIZE;
- int cnt=conv.read( result, 0, size );
- if( cnt <= 0 ) {
- // End of stream ! - we may be in a bad state
- if( debug>0)
- log( "EOF" );
- // reset();
- return;
- }
- if( debug > 1 )
- log("Converted: " + new String( result, 0, cnt ));
+ l = bb.getLength();
+ int cnt=conv.read( result, 0, size );
+ if( cnt <= 0 ) {
+ // End of stream ! - we may be in a bad state
+ if( debug>0)
+ log( "EOF" );
+ // reset();
+ return;
+ }
+ if( debug > 1 )
+ log("Converted: " + new String( result, 0, cnt ));
- // XXX go directly
- cb.append( result, 0, cnt );
- limit -= cnt;
- }
- } catch( IOException ex) {
- if( debug>0)
- log( "Reseting the converter " + ex.toString() );
- reset();
- throw ex;
- }
+ cb.setLimit(cb.getStart() + cnt);
+ cb.append( result, 0, cnt );
+ limit = limit - (l - bb.getLength());
+ }
+ } catch( IOException ex) {
+ if( debug>0)
+ log( "Reseting the converter " + ex.toString() );
+ reset();
+ throw ex;
+ }
}
public void reset()
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-03-25 15:51:30 UTC (rev 545)
+++ trunk/webapps/docs/changelog.xml 2008-03-26 01:38:36 UTC (rev 546)
@@ -57,6 +57,9 @@
<update>
Add support for specifying defaults for properties (format is ${property:default}). (remm)
</update>
+ <fix>
+ <bug>44494</bug>: Fix incorrect reads with multibyte charsets. (remm)
+ </fix>
</changelog>
</subsection>
</section>
16 years, 9 months
JBossWeb SVN: r545 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-25 11:51:30 -0400 (Tue, 25 Mar 2008)
New Revision: 545
Modified:
trunk/webapps/docs/changelog.xml
trunk/webapps/docs/tomcat-docs.xsl
Log:
- Improve my Jira tag a bit.
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-03-25 15:45:26 UTC (rev 544)
+++ trunk/webapps/docs/changelog.xml 2008-03-25 15:51:30 UTC (rev 545)
@@ -21,6 +21,9 @@
<fix>
Update to more polished CSS, submitted by James Cobb. (remm)
</fix>
+ <fix>
+ Remove tomcat-native.tar.gz from the distribution (JBoss Native should be used instead). (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Catalina">
@@ -37,7 +40,7 @@
<subsection name="Coyote">
<changelog>
<fix>
- Fix for JBWEB-105. (jfclere)
+ <jira>105</jira>: The code that processes parameters from chars[] is incorrect. (jfclere)
</fix>
<fix>
Better fix for cookie path quoting scenario. (markt)
Modified: trunk/webapps/docs/tomcat-docs.xsl
===================================================================
--- trunk/webapps/docs/tomcat-docs.xsl 2008-03-25 15:45:26 UTC (rev 544)
+++ trunk/webapps/docs/tomcat-docs.xsl 2008-03-25 15:51:30 UTC (rev 545)
@@ -31,6 +31,7 @@
<xsl:param name="standalone" select="''"/>
<xsl:param name="buglink" select="'http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
<xsl:param name="jiralink" select="'http://jira.jboss.com/jira/browse/JBWEB-'"/>
+ <xsl:param name="jbossjiralink" select="'http://jira.jboss.com/jira/browse/'"/>
<!-- Defined variables (non-overrideable) -->
<xsl:variable name="body-bg" select="'#ffffff'"/>
@@ -356,6 +357,12 @@
<!-- Link to a JIRA report -->
<xsl:template match="jira">
<xsl:variable name="link"><xsl:value-of select="$jiralink"/><xsl:value-of select="text()"/></xsl:variable>
+ <a href="{$link}">JBWEB-<xsl:apply-templates/></a>
+ </xsl:template>
+
+ <!-- Link to a JBoss JIRA report for another project -->
+ <xsl:template match="jboss-jira">
+ <xsl:variable name="link"><xsl:value-of select="$jbossjiralink"/><xsl:value-of select="text()"/></xsl:variable>
<a href="{$link}"><xsl:apply-templates/></a>
</xsl:template>
16 years, 9 months
JBossWeb SVN: r544 - trunk/java/org/apache/tomcat/util/http.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-25 11:45:26 -0400 (Tue, 25 Mar 2008)
New Revision: 544
Modified:
trunk/java/org/apache/tomcat/util/http/Parameters.java
Log:
Oops... Forgotten trace.
Modified: trunk/java/org/apache/tomcat/util/http/Parameters.java
===================================================================
--- trunk/java/org/apache/tomcat/util/http/Parameters.java 2008-03-25 15:43:14 UTC (rev 543)
+++ trunk/java/org/apache/tomcat/util/http/Parameters.java 2008-03-25 15:45:26 UTC (rev 544)
@@ -503,7 +503,6 @@
public void processParameters( MessageBytes data, String encoding ) {
if( data==null || data.isNull() || data.getLength() <= 0 ) return;
- System.out.println("Parameters.processParameters: " + data.getType());
if (data.getType() != MessageBytes.T_BYTES) {
data.toBytes();
}
16 years, 9 months