svn commit: r321303 - in /tomcat/site/trunk: docs/download-connectors.html xdocs/download-connectors.xml
Author: jfclere Date: Sat Oct 15 00:17:39 2005 New Revision: 321303 URL: http://svn.apache.org/viewcvs?rev=321303&view=rev Log: Arrange the links: point to tomcat. Modified: tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/xdocs/download-connectors.xml Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-connectors.html?rev=321303&r1=321302&r2=321303&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Sat Oct 15 00:17:39 2005 @@ -192,10 +192,10 @@ The KEYS link links to the code signing keys used to sign the product. The PGP link downloads the OpenPGP compatible signature from our main site. -For more information concerning Tomcat Connectors (mod_jk, mod_jk2), see the http://jakarta.apache.org/tomcat/connectors-doc/"; class="name">Tomcat Connectors (mod_jk, mod_jk2) site. +For more information concerning Tomcat Connectors (mod_jk, mod_jk2), see the http://tomcat.apache.org/connectors-doc/"; class="name">Tomcat Connectors (mod_jk, mod_jk2) site. -http://www.apache.org/dist/jakarta/tomcat-connectors/KEYS";>KEYS +http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS @@ -210,25 +210,25 @@ -JK 1.2.14 Source Release tar.gz +JK 1.2.14 Source Release tar.gz -[http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.tar.gz.asc";>pgp] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.tar.gz.asc";>pgp] -JK 1.2.14 Source Release zip +JK 1.2.14 Source Release zip -[http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.zip.asc";>pgp] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.zip.asc";>pgp] -JK 1.2 Binary Releases +JK 1.2 Binary Releases @@ -243,33 +243,33 @@ -JK2 2.0.4 Source Release tar.gz +JK2 2.0.4 Source Release tar.gz -[http://www.apache.org/dist/jakarta/tomcat-connectors/jk2/jakarta-tomcat-connectors-jk2-src-current.tar.gz.asc";>pgp] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk2/jakarta-tomcat-connectors-jk2-src-current.tar.gz.asc";>pgp] -JK2 2.0.4 Source Release zip +JK2 2.0.4 Source Release zip -[http://www.apache.org/dist/jakarta/tomcat-connectors/jk2/jakarta-tomcat-connectors-jk2-src-current.zip.asc";>pgp] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk2/jakarta-tomcat-connectors-jk2-src-current.zip.asc";>pgp] -JK 2 Binary Releases +JK 2 Binary Releases -browse download area +browse download area -http://archive.apache.org/dist/jakarta/tomcat-connectors/";>archives... +http://archive.apache.org/dist/tomcat/tomcat-connectors/";>archives... Modified: tomcat/site/trunk/xdocs/download-connectors.xml URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs/download-connectors.xml?rev=321303&r1=321302&r2=321303&view=diff == --- tomcat/site/trunk/xdocs/download-connectors.xml (original) +++ tomcat/site/trunk/xdocs/download-connectors.xml Sat Oct 15 00:17:39 2005 @@ -19,4 +19,4 @@ [end] The KEYS link links to the code signing keys used to sign the product. The PGP link downloads the OpenPGP compatible signature from our main site. -For more information concerning Tomcat Connectors (mod_jk, mod_jk2), see the http://jakarta.apache.org/tomcat/connectors-doc/"; class="name">Tomcat Connectors (mod_jk, mod_jk2) site. http://www.apache.org/dist/jakarta/tomcat-connectors/KEYS";>KEYSJK 1.2SourceJK 1.2.14 Source Release tar.gz[http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.tar.gz.asc";>pgp]JK 1.2.14 Source Release zip[http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.zip.asc";>pgp]JK 1.2 Binary ReleasesJK 2 (deprecated)SourceJK2 2.0.4 Source Release tar.gz[http://www.apache.org/dist/jakarta/tomcat-connectors/jk2/jakarta-tomcat-connectors-jk2-src-current.tar.gz.asc";>pgp]JK2 2.0.4 Source Release zip[http://www.apache.org/dist/jakarta/tomcat-connectors/jk2/jakarta-tomcat-connectors-jk2-src-current.zip.asc";>pgp]JK 2 Binary Releasesbrowse download areahttp://archive.apache.org/dist/jakarta/tomcat-connectors/";>archives... \ No newline at end of file +For more informa
svn commit: r321312 - /tomcat/connectors/trunk/jk/HOWTO-RELEASE
Author: jfclere Date: Sat Oct 15 01:12:21 2005 New Revision: 321312 URL: http://svn.apache.org/viewcvs?rev=321312&view=rev Log: Add something about the /x1/www/tomcat.apache.org/connectors-doc Please note that this document needs to be updated (cvs and jakarta). Modified: tomcat/connectors/trunk/jk/HOWTO-RELEASE Modified: tomcat/connectors/trunk/jk/HOWTO-RELEASE URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/HOWTO-RELEASE?rev=321312&r1=321311&r2=321312&view=diff == --- tomcat/connectors/trunk/jk/HOWTO-RELEASE (original) +++ tomcat/connectors/trunk/jk/HOWTO-RELEASE Sat Oct 15 01:12:21 2005 @@ -82,6 +82,10 @@ cd jakarta-tomcat-connectors/jk/xdocs ant + +Check the documentation carefully (produced in jakarta-tomcat-connectors/jk/build/docs) +and copy it to people.apache.org:/x1/www/tomcat.apache.org/connectors-doc + Create the new source distribution -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r327594 - /tomcat/build/tc5.5.x/resources/build.xml
Author: jfclere
Date: Fri Oct 21 15:15:44 2005
New Revision: 327594
URL: http://svn.apache.org/viewcvs?rev=327594&view=rev
Log:
Change cvs to svn and arrange locations.
Modified:
tomcat/build/tc5.5.x/resources/build.xml
Modified: tomcat/build/tc5.5.x/resources/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/resources/build.xml?rev=327594&r1=327593&r2=327594&view=diff
==
--- tomcat/build/tc5.5.x/resources/build.xml (original)
+++ tomcat/build/tc5.5.x/resources/build.xml Fri Oct 21 15:15:44 2005
@@ -18,15 +18,21 @@
-
+ http://svn.apache.org/repos/asf/"; />
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -37,7 +43,7 @@
+ value="${basedir}/${jasper.project}"/>
+ description="Update or checkout required sources from SVN">
+message="If the checkout fails, - todo - " />
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r373302 - /tomcat/connectors/trunk/build.properties.default
Author: jfclere
Date: Sun Jan 29 04:03:24 2006
New Revision: 373302
URL: http://svn.apache.org/viewcvs?rev=373302&view=rev
Log:
Upgrade packages to newer ones (old aren't found anymore...)
Modified:
tomcat/connectors/trunk/build.properties.default
Modified: tomcat/connectors/trunk/build.properties.default
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/build.properties.default?rev=373302&r1=373301&r2=373302&view=diff
==
--- tomcat/connectors/trunk/build.properties.default (original)
+++ tomcat/connectors/trunk/build.properties.default Sun Jan 29 04:03:24 2006
@@ -68,11 +68,11 @@
# - Commons Logging, version 1.0.1 or later -
-commons-logging.home=${base.path}/commons-logging-1.0.3
+commons-logging.home=${base.path}/commons-logging-1.0.4
commons-logging.lib=${commons-logging.home}
commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
commons-logging.jar=${commons-logging.lib}/commons-logging.jar
-commons-logging.loc=http://www.apache.org/dist/jakarta/commons/logging/binaries/commons-logging-1.0.3.tar.gz
+commons-logging.loc=http://www.apache.org/dist/jakarta/commons/logging/binaries/commons-logging-1.0.4.tar.gz
# - Java Naming and Directory Interface (JNDI), version 1.2 or later -
@@ -85,10 +85,10 @@
# - Jakarta Regular Expressions Library, version 1.3 -
-regexp.home=${base.path}/jakarta-regexp-1.3
+regexp.home=${base.path}/jakarta-regexp-1.4
regexp.lib=${regexp.home}
-regexp.jar=${regexp.lib}/jakarta-regexp-1.3.jar
-regexp.loc=http://www.apache.org/dist/jakarta/regexp/binaries/jakarta-regexp-1.3.tar.gz
+regexp.jar=${regexp.lib}/jakarta-regexp-1.4.jar
+regexp.loc=http://www.apache.org/dist/jakarta/regexp/binaries/jakarta-regexp-1.4.tar.gz
# - Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -
@@ -169,11 +169,11 @@
jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar
# - Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.0 or
later -
-jmx.version=1.1.1
+jmx.version=3.0.1
jmx.home=${base.path}/mx4j-${jmx.version}
jmx.lib=${jmx.home}/lib
jmx.jar=${jmx.lib}/mx4j-jmx.jar
-jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-${jmx.version}.tar.gz
+jmx.loc=http://download.sourceforge.net/mx4j/mx4j-${jmx.version}.tar.gz
# - Java Secure Sockets Extension (JSSE), version 1.0.2 or later -
@@ -231,14 +231,14 @@
# - Tomcat4.1.x -
-tomcat41.version=4.1.30
+tomcat41.version=4.1.31
tomcat41.home=${base.path}/jakarta-tomcat-${tomcat41.version}
tomcat41.jar=${tomcat41.home}/server/lib/catalina.jar
servlet-api.jar=${tomcat41.home}/common/lib/servlet.jar
-tomcat41.loc=http://www.apache.org/dist/jakarta/tomcat-4/v${tomcat41.version}/bin/jakarta-tomcat-${tomcat41.version}.tar.gz
+tomcat41.loc=http://www.apache.org/dist/tomcat/tomcat-4/v${tomcat41.version}/bin/jakarta-tomcat-${tomcat41.version}.tar.gz
# - Tomcat33 -
tomcat33.version=3.3.2
tomcat33.home=${base.path}/jakarta-tomcat-${tomcat33.version}
tomcat33.jar=${tomcat33.home}/lib/common/tomcat_core.jar
-tomcat33.loc=${mirror}/jakarta/tomcat-3/v${tomcat33.version}/bin/jakarta-tomcat-${tomcat33.version}.tar.gz
+tomcat33.loc=${mirror}/tomcat/tomcat-3/v${tomcat33.version}/bin/jakarta-tomcat-${tomcat33.version}.tar.gz
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r373313 - in /tomcat/connectors/trunk: build.properties.default build.xml
Author: jfclere
Date: Sun Jan 29 06:58:08 2006
New Revision: 373313
URL: http://svn.apache.org/viewcvs?rev=373313&view=rev
Log:
Allow to build tomcat5.5.x too.
Modified:
tomcat/connectors/trunk/build.properties.default
tomcat/connectors/trunk/build.xml
Modified: tomcat/connectors/trunk/build.properties.default
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/build.properties.default?rev=373313&r1=373312&r2=373313&view=diff
==
--- tomcat/connectors/trunk/build.properties.default (original)
+++ tomcat/connectors/trunk/build.properties.default Sun Jan 29 06:58:08 2006
@@ -229,6 +229,12 @@
tyrex.jar=${tyrex.lib}/tyrex-1.0.jar
tyrex.loc=http://belnet.dl.sourceforge.net/sourceforge/tyrex/tyrex-1.0.tgz
+# - Tomcat5.x.x -
+tomcat5.version=5.5.15
+tomcat5.home=${base.path}/apache-tomcat-${tomcat5.version}
+tomcat5.jar=${tomcat5.home}/server/lib/catalina.jar
+servlet-api.jar=${tomcat5.home}/common/lib/servlet-api.jar
+tomcat5.loc=http://www.apache.org/dist/tomcat/tomcat-5/v${tomcat5.version}/bin/apache-tomcat-${tomcat5.version}.tar.gz
# - Tomcat4.1.x -
tomcat41.version=4.1.31
Modified: tomcat/connectors/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/build.xml?rev=373313&r1=373312&r2=373313&view=diff
==
--- tomcat/connectors/trunk/build.xml (original)
+++ tomcat/connectors/trunk/build.xml Sun Jan 29 06:58:08 2006
@@ -185,6 +185,11 @@
+
+
+
+
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r381081 - /tomcat/container/tc5.5.x/webapps/docs/logging.xml
Author: jfclere Date: Sun Feb 26 03:36:53 2006 New Revision: 381081 URL: http://svn.apache.org/viewcvs?rev=381081&view=rev Log: Arrange commons-logging location. Modified: tomcat/container/tc5.5.x/webapps/docs/logging.xml Modified: tomcat/container/tc5.5.x/webapps/docs/logging.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/logging.xml?rev=381081&r1=381080&r2=381081&view=diff == --- tomcat/container/tc5.5.x/webapps/docs/logging.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/logging.xml Sun Feb 26 03:36:53 2006 @@ -61,8 +61,7 @@ Create a file called log4j.properties with the following content -and save it into common/classes. - +and save it into common/classes. log4j.rootLogger=debug, R log4j.appender.R=org.apache.log4j.RollingFileAppender @@ -78,7 +77,7 @@ http://logging.apache.org/log4j";>Download Log4J (v1.2 or later) and place the log4j jar in $CATALINA_HOME/common/lib. -http://jakarta.apache.org/site/binindex.cgi#commons-logging";> +http://jakarta.apache.org/site/downloads/downloads_commons-logging.cgi";> Download Commons Logging and place the commons-logging.jar (not commons-logging-api.jar) in $CATALINA_HOME/common/lib with the log4j jar. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r386315 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
Author: jfclere
Date: Thu Mar 16 03:54:29 2006
New Revision: 386315
URL: http://svn.apache.org/viewcvs?rev=386315&view=rev
Log:
If the encoding is not specified use the detected one.
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java?rev=386315&r1=386314&r2=386315&view=diff
==
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
Thu Mar 16 03:54:29 2006
@@ -372,7 +372,8 @@
* Determine the page encoding from the page directive, unless it's
* specified via JSP config.
*/
- sourceEnc = jspConfigPageEnc;
+ if (jspConfigPageEnc != null)
+ sourceEnc = jspConfigPageEnc;
if (sourceEnc == null) {
sourceEnc = getPageEncodingForJspSyntax(jspReader, startMark);
if (sourceEnc == null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r386829 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
Author: jfclere
Date: Sat Mar 18 01:23:48 2006
New Revision: 386829
URL: http://svn.apache.org/viewcvs?rev=386829&view=rev
Log:
Rollback commit... Searching for a better solution.
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java?rev=386829&r1=386828&r2=386829&view=diff
==
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ParserController.java
Sat Mar 18 01:23:48 2006
@@ -372,8 +372,7 @@
* Determine the page encoding from the page directive, unless it's
* specified via JSP config.
*/
- if (jspConfigPageEnc != null)
- sourceEnc = jspConfigPageEnc;
+ sourceEnc = jspConfigPageEnc;
if (sourceEnc == null) {
sourceEnc = getPageEncodingForJspSyntax(jspReader, startMark);
if (sourceEnc == null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r387573 - /tomcat/connectors/trunk/jni/README.txt
Author: jfclere Date: Tue Mar 21 08:22:49 2006 New Revision: 387573 URL: http://svn.apache.org/viewcvs?rev=387573&view=rev Log: Add a note how to build the native (dynamic library) part. Modified: tomcat/connectors/trunk/jni/README.txt Modified: tomcat/connectors/trunk/jni/README.txt URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/README.txt?rev=387573&r1=387572&r2=387573&view=diff == --- tomcat/connectors/trunk/jni/README.txt (original) +++ tomcat/connectors/trunk/jni/README.txt Tue Mar 21 08:22:49 2006 @@ -4,6 +4,7 @@ Building ant +To build the native part see native/BUILDING Running the examples - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r387608 - /tomcat/container/tc5.5.x/webapps/docs/status.xml
Author: jfclere Date: Tue Mar 21 11:47:29 2006 New Revision: 387608 URL: http://svn.apache.org/viewcvs?rev=387608&view=rev Log: Arrange 33117. Modified: tomcat/container/tc5.5.x/webapps/docs/status.xml Modified: tomcat/container/tc5.5.x/webapps/docs/status.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/status.xml?rev=387608&r1=387607&r2=387608&view=diff == --- tomcat/container/tc5.5.x/webapps/docs/status.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/status.xml Tue Mar 21 11:47:29 2006 @@ -112,7 +112,7 @@ The list of the bugs which are in an unresolved state for Tomcat 5 can be seen - http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&resolution=LATER&resolution=REMIND&resolution=---&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Tomcat+5&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=%27Importance%27";>here. + http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&resolution=LATER&resolution=REMIND&resolution=---&bugidtype=include&product=Tomcat+5&cmdtype=doit&order=Importance";>here. Aspiring volunteers and others are strongly encouraged to attempt to comment and help resolve these issues. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r397469 - in /tomcat/connectors/trunk/jni/native: build/tcnative.m4 configure.in
Author: jfclere
Date: Thu Apr 27 00:46:04 2006
New Revision: 397469
URL: http://svn.apache.org/viewcvs?rev=397469&view=rev
Log:
Allow to compile on MAC OS X (Darwin).
Modified:
tomcat/connectors/trunk/jni/native/build/tcnative.m4
tomcat/connectors/trunk/jni/native/configure.in
Modified: tomcat/connectors/trunk/jni/native/build/tcnative.m4
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/build/tcnative.m4?rev=397469&r1=397468&r2=397469&view=diff
==
--- tomcat/connectors/trunk/jni/native/build/tcnative.m4 (original)
+++ tomcat/connectors/trunk/jni/native/build/tcnative.m4 Thu Apr 27 00:46:04
2006
@@ -177,17 +177,18 @@
],
[
AC_MSG_CHECKING(os_type directory)
-if test -f ${JAVA_HOME}/include/jni_md.h; then
+JAVA_OS=NONE
+if test -f ${JAVA_HOME}/${JAVA_INC}/jni_md.h; then
JAVA_OS=""
else
- for f in ${JAVA_HOME}/include/*/jni_md.h; do
+ for f in ${JAVA_HOME}/${JAVA_INC}/*/jni_md.h; do
if test -f $f; then
JAVA_OS=`dirname ${f}`
JAVA_OS=`basename ${JAVA_OS}`
echo " ${JAVA_OS}"
fi
done
- if test -z "${JAVA_OS}"; then
+ if test "${JAVA_OS}" = "NONE"; then
AC_MSG_RESULT(Cannot find jni_md.h in ${JAVA_HOME}/${OS})
AC_MSG_ERROR(You should retry --with-os-type=SUBDIR)
fi
Modified: tomcat/connectors/trunk/jni/native/configure.in
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/configure.in?rev=397469&r1=397468&r2=397469&view=diff
==
--- tomcat/connectors/trunk/jni/native/configure.in (original)
+++ tomcat/connectors/trunk/jni/native/configure.in Thu Apr 27 00:46:04 2006
@@ -91,13 +91,24 @@
dnl
TCN_FIND_JDK
TCN_SABLEVM
-APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include])
+
+dnl MAC OS X does not used include but Headers
+if test -d ${JAVA_HOME}/Headers; then
+ JAVA_INC=Headers
+else
+ JAVA_INC=include
+fi
+APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/$JAVA_INC])
dnl sableVM does not have/need $JAVA_OS/jni_md.h
if test "$SABLEVM" = "NONE"
then
TCN_FIND_JDK_OS
- APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include/$JAVA_OS])
+ if test -z "${JAVA_OS}"; then
+AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
+ else
+APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/$JAVA_INC/$JAVA_OS])
+ fi
fi
AC_SUBST(JAVA_HOME)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r536455 - /tomcat/container/tc5.5.x/webapps/docs/config/valve.xml
Author: jfclere Date: Wed May 9 01:13:16 2007 New Revision: 536455 URL: http://svn.apache.org/viewvc?view=rev&rev=536455 Log: Arrange default value. Modified: tomcat/container/tc5.5.x/webapps/docs/config/valve.xml Modified: tomcat/container/tc5.5.x/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/valve.xml?view=diff&rev=536455&r1=536454&r2=536455 == --- tomcat/container/tc5.5.x/webapps/docs/config/valve.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/valve.xml Wed May 9 01:13:16 2007 @@ -176,7 +176,7 @@ The shorthand pattern name common (which is also the -default) corresponds to %h %l %u %t "%r" %s %b". +default) corresponds to "%h %l %u %t %r %s %b". The shorthand pattern name combined appends the values of the Referer and User-Agent headers, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r536456 - /tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml
Author: jfclere Date: Wed May 9 01:14:37 2007 New Revision: 536456 URL: http://svn.apache.org/viewvc?view=rev&rev=536456 Log: Arrange the default value of pattern. Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml?view=diff&rev=536456&r1=536455&r2=536456 == --- tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Wed May 9 01:14:37 2007 @@ -179,7 +179,7 @@ The shorthand pattern name common (which is also the -default) corresponds to %h %l %u %t "%r" %s %b". +default) corresponds to "%h %l %u %t %r %s %b". The shorthand pattern name combined appends the values of the Referer and User-Agent headers, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r536843 - /tomcat/container/tc5.5.x/webapps/docs/config/valve.xml
Author: jfclere Date: Thu May 10 05:28:13 2007 New Revision: 536843 URL: http://svn.apache.org/viewvc?view=rev&rev=536843 Log: Use "%r" and single quotes. Modified: tomcat/container/tc5.5.x/webapps/docs/config/valve.xml Modified: tomcat/container/tc5.5.x/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/valve.xml?view=diff&rev=536843&r1=536842&r2=536843 == --- tomcat/container/tc5.5.x/webapps/docs/config/valve.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/valve.xml Thu May 10 05:28:13 2007 @@ -176,7 +176,7 @@ The shorthand pattern name common (which is also the -default) corresponds to "%h %l %u %t %r %s %b". +default) corresponds to '%h %l %u %t "%r" %s %b'. The shorthand pattern name combined appends the values of the Referer and User-Agent headers, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r536845 - /tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml
Author: jfclere Date: Thu May 10 05:29:41 2007 New Revision: 536845 URL: http://svn.apache.org/viewvc?view=rev&rev=536845 Log: Use "%r" and single quotes. Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml?view=diff&rev=536845&r1=536844&r2=536845 == --- tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Thu May 10 05:29:41 2007 @@ -179,7 +179,7 @@ The shorthand pattern name common (which is also the -default) corresponds to "%h %l %u %t %r %s %b". +default) corresponds to '%h %l %u %t "%r" %s %b'. The shorthand pattern name combined appends the values of the Referer and User-Agent headers, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r538609 - /tomcat/connectors/trunk/jk/jkstatus/example/show.txt
Author: jfclere Date: Wed May 16 07:18:14 2007 New Revision: 538609 URL: http://svn.apache.org/viewvc?view=rev&rev=538609 Log: Just some instructions how to use it. Added: tomcat/connectors/trunk/jk/jkstatus/example/show.txt Added: tomcat/connectors/trunk/jk/jkstatus/example/show.txt URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/example/show.txt?view=auto&rev=538609 == --- tomcat/connectors/trunk/jk/jkstatus/example/show.txt (added) +++ tomcat/connectors/trunk/jk/jkstatus/example/show.txt Wed May 16 07:18:14 2007 @@ -0,0 +1,10 @@ +How to use the show example: +ant -f show.xml +Configure mod_jk (httpd.conf and workers.properties): +JkMount /jkstatus jkstatus + +worker.list=jkstatus +worker.jkstatus.type=status + +Adjust jkstatus.properties.default: +jkstatus.port (for example). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r541325 - /tomcat/connectors/trunk/jni/native/build/tcnative.m4
Author: jfclere Date: Thu May 24 08:30:09 2007 New Revision: 541325 URL: http://svn.apache.org/viewvc?view=rev&rev=541325 Log: Arrange the check of openssl version. It was failing on Linux. Modified: tomcat/connectors/trunk/jni/native/build/tcnative.m4 Modified: tomcat/connectors/trunk/jni/native/build/tcnative.m4 URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?view=diff&rev=541325&r1=541324&r2=541325 == --- tomcat/connectors/trunk/jni/native/build/tcnative.m4 (original) +++ tomcat/connectors/trunk/jni/native/build/tcnative.m4 Thu May 24 08:30:09 2007 @@ -303,6 +303,9 @@ *-hp-hpux*) TCN_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lssl -lcrypto" ;; +*linux*) +TCN_OPENSSL_LIBS="-L$use_openssl/lib --Wl,-rpath,$use_openssl/lib -lssl -lcrypto" +;; *) TCN_OPENSSL_LIBS="-L$use_openssl/lib -lssl -lcrypto" ;; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r545793 - in /tomcat/connectors/trunk/jk/xdocs: ajp/ajpv13a.xml miscellaneous/changelog.xml
Author: jfclere Date: Sat Jun 9 13:38:06 2007 New Revision: 545793 URL: http://svn.apache.org/viewvc?view=rev&rev=545793 Log: Add missing stuff. Modified: tomcat/connectors/trunk/jk/xdocs/ajp/ajpv13a.xml tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Modified: tomcat/connectors/trunk/jk/xdocs/ajp/ajpv13a.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/ajp/ajpv13a.xml?view=diff&rev=545793&r1=545792&r2=545793 == --- tomcat/connectors/trunk/jk/xdocs/ajp/ajpv13a.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/ajp/ajpv13a.xml Sat Jun 9 13:38:06 2007 @@ -179,7 +179,9 @@ which the servlet container is sending back -- with the terminating \0 character, the C code can pass around references into a single buffer, without copying. If the \0 was missing, the C code would have to copy - things out in order to get its notion of a string. + things out in order to get its notion of a string. Note a size of -1 + (65535) indicates a null string and no data follow the length in this + case. @@ -526,6 +528,8 @@ ?ssl_session0x09 ?req_attribute0x0AName (the name of the attribut follows) ?ssl_key_size0x0B + ?secret0x0C + ?stored_method0x0D are_done0xFFrequest_terminator Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=545793&r1=545792&r2=545793 == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sat Jun 9 13:38:06 2007 @@ -41,6 +41,9 @@ is set during for configure. (rjung) + Change the default value of JkOptions to ForwardURICompatUnparsed. The old default value was ForwardURICompat. (jfclere) + + i5/OS (AS/400) V5R4 port where Apache 2.0 modules should now use UTF8. (hgomez) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r545794 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Author: jfclere Date: Sat Jun 9 13:41:07 2007 New Revision: 545794 URL: http://svn.apache.org/viewvc?view=rev&rev=545794 Log: Oops don't want to commit this. Sorry my bad. Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=545794&r1=545793&r2=545794 == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sat Jun 9 13:41:07 2007 @@ -41,9 +41,6 @@ is set during for configure. (rjung) - Change the default value of JkOptions to ForwardURICompatUnparsed. The old default value was ForwardURICompat. (jfclere) - - i5/OS (AS/400) V5R4 port where Apache 2.0 modules should now use UTF8. (hgomez) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r546531 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_global.h common/jk_url.c common/jk_url.h common/list.mk.in
Author: jfclere
Date: Tue Jun 12 08:32:10 2007
New Revision: 546531
URL: http://svn.apache.org/viewvc?view=rev&rev=546531
Log:
Add ForwardURIProxy to the URl handling option.
common/jk_url.c is just a porting of the routines
from proxy_util.c (Apache httpd).
Added:
tomcat/connectors/trunk/jk/native/common/jk_url.c
tomcat/connectors/trunk/jk/native/common/jk_url.h
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_global.h
tomcat/connectors/trunk/jk/native/common/list.mk.in
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=546531&r1=546530&r2=546531
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Tue Jun 12 08:32:10
2007
@@ -60,6 +60,7 @@
#include "jk_uri_worker_map.h"
#include "jk_ajp13.h"
#include "jk_shm.h"
+#include "jk_url.h"
#define JK_LOG_DEF_FILE ("logs/mod_jk.log")
#define JK_SHM_DEF_FILE ("logs/jk-runtime-status")
@@ -519,6 +520,7 @@
request_rec *r = private_data->r;
char *ssl_temp = NULL;
s->route = NULL;/* Used for sticky session routing */
+int size;
/* Copy in function pointers (which are really methods) */
s->start_response = ws_start_response;
@@ -627,6 +629,13 @@
s->req_uri = r->uri;
break;
+case JK_OPT_FWDURIPROXY:
+size = strlen(r->uri);
+s->req_uri = ap_palloc(r->pool, size * 3 + 1);
+jk_canonenc(s->req_uri, r->uri, size, enc_path, 0,
+JK_PROXYREQ_REVERSE);
+break;
+
case JK_OPT_FWDURIESCAPED:
s->req_uri = ap_escape_uri(r->pool, r->uri);
break;
@@ -1725,6 +1734,10 @@
}
else if (!strcasecmp(w, "ForwardURIEscaped")) {
opt = JK_OPT_FWDURIESCAPED;
+mask = JK_OPT_FWDURIMASK;
+}
+else if (!strcasecmp(w, "ForwardURIProxy")) {
+opt = JK_OPT_FWDURIPROXY;
mask = JK_OPT_FWDURIMASK;
}
else if (!strcasecmp(w, "ForwardDirectories")) {
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=546531&r1=546530&r2=546531
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Jun 12 08:32:10
2007
@@ -102,6 +102,7 @@
#include "jk_util.h"
#include "jk_worker.h"
#include "jk_shm.h"
+#include "jk_url.h"
#define JK_LOG_DEF_FILE ("logs/mod_jk.log")
#define JK_SHM_DEF_FILE ("logs/jk-runtime-status")
@@ -539,6 +540,7 @@
request_rec *r = private_data->r;
char *ssl_temp = NULL;
+int size;
s->route = NULL;/* Used for sticky session routing */
/* Copy in function pointers (which are really methods) */
@@ -655,6 +657,13 @@
s->req_uri = r->uri;
break;
+case JK_OPT_FWDURIPROXY:
+size = strlen(r->uri);
+s->req_uri = apr_palloc(r->pool, size * 3 + 1);
+jk_canonenc(s->req_uri, r->uri, size, enc_path, 0,
+JK_PROXYREQ_REVERSE);
+break;
+
case JK_OPT_FWDURIESCAPED:
s->req_uri = ap_escape_uri(r->pool, r->uri);
break;
@@ -1758,6 +1767,10 @@
}
else if (!strcasecmp(w, "ForwardURIEscaped")) {
opt = JK_OPT_FWDURIESCAPED;
+mask = JK_OPT_FWDURIMASK;
+}
+else if (!strcasecmp(w, "ForwardURIProxy")) {
+opt = JK_OPT_FWDURIPROXY;
mask = JK_OPT_FWDURIMASK;
}
else if (!strcasecmp(w, "ForwardDirectories")) {
Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?view=diff&rev=546531&r1=546530&r2=546531
==
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Tue Jun 12 08:32:10
2007
@@ -228,15 +228,16 @@
* JK options
*/
-#define JK_OPT_FWDURIMASK 0x0003
+#define JK_OPT_FWDURIMASK 0x0007
#define JK_OPT_FWDURICOMPAT 0x0001
#define JK_OPT_FWDURICOMPATUNPARSED 0x0002
#define
svn commit: r551521 - /tomcat/connectors/trunk/jk3/ROADMAP
Author: jfclere Date: Thu Jun 28 02:59:37 2007 New Revision: 551521 URL: http://svn.apache.org/viewvc?view=rev&rev=551521 Log: Try to define the first steps for the jk3 proposal. Modified: tomcat/connectors/trunk/jk3/ROADMAP Modified: tomcat/connectors/trunk/jk3/ROADMAP URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk3/ROADMAP?view=diff&rev=551521&r1=551520&r2=551521 == --- tomcat/connectors/trunk/jk3/ROADMAP (original) +++ tomcat/connectors/trunk/jk3/ROADMAP Thu Jun 28 02:59:37 2007 @@ -50,3 +50,31 @@ server and backend - Maybe transporting the backend connector events back to the web server + +HOW TO REACH THE GOALS: ROADMAP. +Here are the steps to reach the goals. +1 - Branch at a tagged version of mod_jk. +2 - Put APR in the code (specially in place where there are #ifdef). +As first step support only httpd-2.0 and IIS. +3 - Test and port back the patches from the mod_jk branch. +Here we should have support for: + - Apache Httpd 2+ + - Microsoft IIS 5+ (Windows 2000 and up) + - Generic API for standalone based programs +No changes in the JAVA part. + +Decide if we want to support netscape too. +4 - Wait for a release cycle to see if the mod_jk branch could go to maintenance mode only. + +5 - Branch again to separate configuration from the rest of the code. +6 - Test and port back the patches from the other branche. +Here we should have support for: +Persistence of the dynamic configuration. +A way to merge the static configuration with a dynamic one. +A dynamic configuration via an extented jkstatus +7 - Test and port back the patches from the old mod_jk branch. +8 - Write the JAVA part so that contexts and nodes could be added/remoted automaticly. +9 - Wait for a release cycle to see if the previous mod_jk branch could go to maintenance mode only. + +n - Branch and process the protocol part of the proposal. +... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r553218 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
Author: jfclere
Date: Wed Jul 4 07:29:19 2007
New Revision: 553218
URL: http://svn.apache.org/viewvc?view=rev&rev=553218
Log:
Arrange the handling of cookies values.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java?view=diff&rev=553218&r1=553217&r2=553218
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java Wed Jul
4 07:29:19 2007
@@ -250,8 +250,10 @@
cc=bytes[pos];
if( cc== '\'' || cc=='"' ) {
-startValue++;
-endValue=indexOf( bytes, startValue, end, cc );
+endValue=findDelim3( bytes, startValue+1, end, cc );
+if (endValue == -1) {
+endValue=findDelim2( bytes, startValue+1, end );
+} else startValue++;
pos=endValue+1; // to skip to next cookie
} else {
endValue=findDelim2( bytes, startValue, end );
@@ -335,28 +337,27 @@
return off;
}
-public static int indexOf( byte bytes[], int off, int end, byte qq )
+/*
+ * search for cc but skip \cc as required by rfc2616
+ * (according to rfc2616 cc should be ")
+*/
+public static int findDelim3( byte bytes[], int off, int end, byte cc )
{
+byte prev = bytes[off];
while( off < end ) {
byte b=bytes[off];
-if( b==qq )
+if ( b== '\\' ) {
+ off++;
+ off++;
+ continue;
+}
+if( b==cc )
return off;
off++;
}
-return off;
+return -1;
}
-public static int indexOf( byte bytes[], int off, int end, char qq )
-{
-while( off < end ) {
-byte b=bytes[off];
-if( b==qq )
-return off;
-off++;
-}
-return off;
-}
-
// XXX will be refactored soon!
public static boolean equals( String s, byte b[], int start, int end) {
int blen = end-start;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r553410 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
Author: jfclere
Date: Thu Jul 5 01:13:06 2007
New Revision: 553410
URL: http://svn.apache.org/viewvc?view=rev&rev=553410
Log:
Escape the " in the cookie value.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java?view=diff&rev=553410&r1=553409&r2=553410
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java Thu
Jul 5 01:13:06 2007
@@ -130,6 +130,7 @@
//
// private static final String tspecials = "()<>@,;:\\\"/[]?={} \t";
private static final String tspecials = ",; ";
+private static final String tspecials2 = ",; \"";
/*
* Tests a string and returns true if the string counts as a
@@ -154,6 +155,19 @@
return true;
}
+public static boolean isToken2(String value) {
+ if( value==null) return true;
+ int len = value.length();
+
+ for (int i = 0; i < len; i++) {
+ char c = value.charAt(i);
+
+ if (c < 0x20 || c >= 0x7f || tspecials2.indexOf(c) != -1)
+ return false;
+ }
+ return true;
+}
+
public static boolean checkName( String name ) {
if (!isToken(name)
|| name.equalsIgnoreCase("Comment") // rfc2019
@@ -213,7 +227,7 @@
// this part is the same for all cookies
buf.append( name );
buf.append("=");
-maybeQuote(version, buf, value);
+maybeQuote2(version, buf, value);
// XXX Netscape cookie: "; "
// add version 1 specific information
@@ -283,6 +297,17 @@
buf.append('"');
}
}
+public static void maybeQuote2 (int version, StringBuffer buf,
+String value) {
+// special case - a \n or \r shouldn't happen in any case
+if (isToken2(value)) {
+buf.append(value);
+} else {
+buf.append('"');
+buf.append(escapeDoubleQuotes(value));
+buf.append('"');
+}
+}
// log
static final int dbg=1;
@@ -306,12 +331,14 @@
}
StringBuffer b = new StringBuffer();
+char p = s.charAt(0);
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
-if (c == '"')
+if (c == '"' && p != '\\')
b.append('\\').append('"');
else
b.append(c);
+p = c;
}
return b.toString();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r555199 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c
Author: jfclere Date: Wed Jul 11 01:06:09 2007 New Revision: 555199 URL: http://svn.apache.org/viewvc?view=rev&rev=555199 Log: man select() in linux advise this. Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?view=diff&rev=555199&r1=555198&r2=555199 == --- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Wed Jul 11 01:06:09 2007 @@ -673,6 +673,7 @@ errno = WSAGetLastError() - WSABASEERR; #endif /* Wait one microsecond on next select, if EINTR */ +tv.tv_sec = 0; tv.tv_usec = 1; } while (rc == -1 && errno == EINTR); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r555304 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: connector/CoyoteAdapter.java connector/Response.java realm/RealmBase.java
Author: jfclere
Date: Wed Jul 11 08:28:52 2007
New Revision: 555304
URL: http://svn.apache.org/viewvc?view=rev&rev=555304
Log:
Use Globals.SESSION_PARAMETER_NAME instead "jsessionid".
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?view=diff&rev=555304&r1=555303&r2=555304
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Wed Jul 11 08:28:52 2007
@@ -457,7 +457,7 @@
if (request.isRequestedSessionIdFromURL()) {
// This is not optimal, but as this is not very common, it
// shouldn't matter
-redirectPath = redirectPath + ";jsessionid="
+redirectPath = redirectPath + ";" +
Globals.SESSION_PARAMETER_NAME + "="
+ request.getRequestedSessionId();
}
if (query != null) {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java?view=diff&rev=555304&r1=555303&r2=555304
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java Wed
Jul 11 08:28:52 2007
@@ -1435,7 +1435,8 @@
String file = url.getFile();
if ((file == null) || !file.startsWith(contextPath))
return (false);
-if( file.indexOf(";jsessionid=" + session.getIdInternal()) >= 0 )
+String tok = ";" + Globals.SESSION_PARAMETER_NAME + "=" +
session.getIdInternal();
+if( file.indexOf(tok, contextPath.length()) >= 0 )
return (false);
}
@@ -1569,7 +1570,9 @@
}
StringBuffer sb = new StringBuffer(path);
if( sb.length() > 0 ) { // jsessionid can't be first.
-sb.append(";jsessionid=");
+sb.append(";");
+sb.append(Globals.SESSION_PARAMETER_NAME);
+sb.append("=");
sb.append(sessionId);
}
sb.append(anchor);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?view=diff&rev=555304&r1=555303&r2=555304
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Wed Jul
11 08:28:52 2007
@@ -37,6 +37,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
@@ -945,7 +946,9 @@
String requestedSessionId = request.getRequestedSessionId();
if ((requestedSessionId != null) &&
request.isRequestedSessionIdFromURL()) {
-file.append(";jsessionid=");
+file.append(";");
+file.append(Globals.SESSION_PARAMETER_NAME);
+file.append("=");
file.append(requestedSessionId);
}
String queryString = request.getQueryString();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r555310 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: Constants.java tagplugins/jstl/Util.java
Author: jfclere
Date: Wed Jul 11 08:31:03 2007
New Revision: 555310
URL: http://svn.apache.org/viewvc?view=rev&rev=555310
Log:
Use Constants.SESSION_PARAMETER_NAME instead "jsessionid".
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java?view=diff&rev=555310&r1=555309&r2=555310
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java Wed Jul 11
08:31:03 2007
@@ -193,4 +193,10 @@
public static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
+/**
+ * The name of the path parameter used to pass the session identifier
+ * back and forth with the client.
+ */
+public static final String SESSION_PARAMETER_NAME = "jsessionid";
+
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?view=diff&rev=555310&r1=555309&r2=555310
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Wed
Jul 11 08:31:03 2007
@@ -18,6 +18,8 @@
package org.apache.jasper.tagplugins.jstl;
+import org.apache.jasper.Constants;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
@@ -150,7 +152,7 @@
public static String stripSession(String url) {
StringBuffer u = new StringBuffer(url);
int sessionStart;
-while ((sessionStart = u.toString().indexOf(";jsessionid=")) != -1) {
+while ((sessionStart = u.toString().indexOf(";" +
Constants.SESSION_PARAMETER_NAME + "=")) != -1) {
int sessionEnd = u.toString().indexOf(";", sessionStart + 1);
if (sessionEnd == -1)
sessionEnd = u.toString().indexOf("?", sessionStart + 1);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r557664 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
Author: jfclere
Date: Thu Jul 19 08:51:50 2007
New Revision: 557664
URL: http://svn.apache.org/viewvc?view=rev&rev=557664
Log:
This Valve is to extra the SSL informations from additional headers
When using Apache httpd as proxy they are added by mod_headers and the
following directives:
RequestHeader set SSL_CLIENT_CERT "%{SSL_CLIENT_CERT}s"
RequestHeader set SSL_CIPHER "%{SSL_CIPHER}s"
RequestHeader set SSL_SESSION_ID "%{SSL_SESSION_ID}s"
RequestHeader set SSL_CIPHER_USEKEYSIZE "%{SSL_CIPHER_USEKEYSIZE}s"
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
Added: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java?view=auto&rev=557664
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java (added)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java Thu Jul
19 08:51:50 2007
@@ -0,0 +1,115 @@
+/*
+ * 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.catalina.valves;
+
+import java.io.IOException;
+import java.io.ByteArrayInputStream;
+
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+
+import javax.servlet.ServletException;
+
+import org.apache.catalina.valves.ValveBase;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.util.StringManager;
+
+/*
+ * Valve to fill the SSL informations in the request
+ * mod_header is used to fill the headers and the valve
+ * will fill the parameters of the request.
+ * In httpd.conf add the following:
+ *
+ * RequestHeader set SSL_CLIENT_CERT "%{SSL_CLIENT_CERT}s"
+ * RequestHeader set SSL_CIPHER "%{SSL_CIPHER}s"
+ * RequestHeader set SSL_SESSION_ID "%{SSL_SESSION_ID}s"
+ * RequestHeader set SSL_CIPHER_USEKEYSIZE "%{SSL_CIPHER_USEKEYSIZE}s"
+ *
+ *
+ * @author Jean-Frederic Clere
+ * @version $Revision: 420067 $, $Date: 2006-07-08 09:16:58 +0200 (sub, 08 srp
2006) $
+ */
+
+public class SSLValve
+extends ValveBase {
+/*
+private static final String info =
+"SSLValve/1.0";
+protected static StringManager sm =
+StringManager.getManager(Constants.Package);
+public String getInfo() {
+return (info);
+}
+public String toString() {
+StringBuffer sb = new StringBuffer("SSLValve[");
+if (container != null)
+sb.append(container.getName());
+sb.append("]");
+return (sb.toString());
+}
+ */
+public String mygetHeader(Request request, String header) {
+String strcert0 = request.getHeader(header);
+if (strcert0 == null)
+return null;
+/* mod_header writes "(null)" when the ssl variable is no filled */
+if ("(null)".equals(strcert0))
+return null;
+return strcert0;
+}
+public void invoke(Request request, Response response)
+throws IOException, ServletException {
+
+/* mod_header converts the '\n' into ' ' so we have to rebuild the
client certificate */
+String strcert0 = mygetHeader(request, "ssl_client_cert");
+if (strcert0 != null && strcert0.length()>28) {
+String strcert1 = strcert0.replace(' ', '\n');
+String strcert2 = strcert1.substring(28, strcert1.length()-26);
+String strcert3 = new String("-BEGIN CERTIFICATE-\n");
+String strcert4 = strcert3.concat(strcert2);
+String strcerts = strcert4.concat("\n-END CERTIFICATE-\n");
+// ByteArrayInputStream bais = new
ByteArrayInputStream(strcerts.getBytes("UTF-8"));
+ByteArrayInputStream bais = new
ByteArrayInputStream(strcerts.getBytes());
+X509Certificate jsseCerts[] = null;
+try {
+
svn commit: r577909 - in /tomcat/connectors/trunk/jni/native: build/tcnative.m4 configure.in
Author: jfclere
Date: Thu Sep 20 13:36:05 2007
New Revision: 577909
URL: http://svn.apache.org/viewvc?rev=577909&view=rev
Log:
Add support of J9VM based JVM.
Modified:
tomcat/connectors/trunk/jni/native/build/tcnative.m4
tomcat/connectors/trunk/jni/native/configure.in
Modified: tomcat/connectors/trunk/jni/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?rev=577909&r1=577908&r2=577909&view=diff
==
--- tomcat/connectors/trunk/jni/native/build/tcnative.m4 (original)
+++ tomcat/connectors/trunk/jni/native/build/tcnative.m4 Thu Sep 20 13:36:05
2007
@@ -239,6 +239,21 @@
then
AC_MSG_RESULT([Using sableVM: $SABLEVM])
CFLAGS="$CFLAGS -DHAVE_SABLEVM"
+ NEED_JNI_MD=no
+fi
+ fi
+ ])
+dnl check for IBM J9VM
+AC_DEFUN(
+ [TCN_J9VM],
+ [
+ if test x"$JAVA_HOME" != x
+ then
+J9VM=`$JAVA_HOME/bin/java -version 2>&1 | grep J9VM`
+if test x"$J9VM" != x
+then
+ AC_MSG_RESULT([Using J9VM: $J9VM])
+ NEED_JNI_MD=no
fi
fi
])
Modified: tomcat/connectors/trunk/jni/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/configure.in?rev=577909&r1=577908&r2=577909&view=diff
==
--- tomcat/connectors/trunk/jni/native/configure.in (original)
+++ tomcat/connectors/trunk/jni/native/configure.in Thu Sep 20 13:36:05 2007
@@ -106,8 +106,10 @@
dnl
dnl Find the JVM related information
dnl
+NEED_JNI_MD=yes
TCN_FIND_JDK
TCN_SABLEVM
+TCN_J9VM
dnl MAC OS X does not used include but Headers
if test -d ${JAVA_HOME}/Headers; then
@@ -118,7 +120,7 @@
APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/$JAVA_INC])
dnl sableVM does not have/need $JAVA_OS/jni_md.h
-if test "$SABLEVM" = "NONE"; then
+if test "$NEED_JNI_MD" = "yes"; then
TCN_FIND_JDK_OS
if test -z "${JAVA_OS}"; then
AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r579106 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Tue Sep 25 00:23:07 2007 New Revision: 579106 URL: http://svn.apache.org/viewvc?rev=579106&view=rev Log: Try to arrange the proposal. And cast a vote. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=579106&r1=579105&r2=579106&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Tue Sep 25 00:23:07 2007 @@ -26,6 +26,7 @@ [ New proposals should be added at the end of the list ] * New cookie parser (third party contribution) + http://people.apache.org/~jfclere/patches/Cookies.java.patch +1: - -1: + -1: jfclere: The tests must done another way. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r579521 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere
Date: Wed Sep 26 01:52:21 2007
New Revision: 579521
URL: http://svn.apache.org/viewvc?rev=579521&view=rev
Log:
Add the test part move remy's patch to people.apache.org and cast my vote.
Modified:
tomcat/tc6.0.x/trunk/STATUS
Modified: tomcat/tc6.0.x/trunk/STATUS
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=579521&r1=579520&r2=579521&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Wed Sep 26 01:52:21 2007
@@ -26,551 +26,7 @@
[ New proposals should be added at the end of the list ]
* New cookie parser (third party contribution)
- +1:
- -1: jfclere: The tests must done another way.
-
-Index: java/org/apache/tomcat/util/http/Cookies.java
-===
java/org/apache/tomcat/util/http/Cookies.java (revision 579106)
-+++ java/org/apache/tomcat/util/http/Cookies.java (working copy)
-@@ -45,7 +45,28 @@
- boolean unprocessed=true;
-
- MimeHeaders headers;
--
-+
-+/*
-+List of Separator Characters (see isSeparator())
-+Excluding the '/' char violates the RFC, but
-+it looks like a lot of people put '/'
-+in unquoted values: '/': ; //47
-+'\t':9 ' ':32 '\"':34 '\'':39 '(':40 ')':41 ',':44 ':':58 ';':59 '<':60
-+'=':61 '>':62 '?':63 '@':64 '[':91 '\\':92 ']':93 '{':123 '}':125
-+*/
-+public static final char SEPARATORS[] = { '\t', ' ', '\"', '\'', '(',
')', ',',
-+':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '{', '}' };
-+
-+protected static final boolean separators[] = new boolean[128];
-+static {
-+for (int i = 0; i < 128; i++) {
-+separators[i] = false;
-+}
-+for (int i = 0; i < SEPARATORS.length; i++) {
-+separators[SEPARATORS[i]] = true;
-+}
-+}
-+
- /**
- * Construct a new cookie collection, that will extract
- * the information from headers.
-@@ -182,181 +203,6 @@
- }
- }
-
--/** Process a byte[] header - allowing fast processing of the
-- * raw data
-- */
--void processCookieHeader( byte bytes[], int off, int len )
--{
--if( len<=0 || bytes==null ) return;
--int end=off+len;
--int pos=off;
--
--int version=0; //sticky
--ServerCookie sc=null;
--
--
--while( pos=end )
--return; // only spaces
--int startName=pos;
--if( dbg>0 ) log( "SN: " + pos );
--
--// Version should be the first token
--boolean isSpecial=false;
--if(bytes[pos]=='$') { pos++; isSpecial=true; }
--
--pos= findDelim1( bytes, startName, end); // " =;,"
--int endName=pos;
--// current = "=" or " " or DELIM
--pos= skipSpaces( bytes, endName, end );
--if( dbg>0 ) log( "DELIM: " + endName + " " + (char)bytes[pos]);
--
--if(pos >= end ) {
--// it's a name-only cookie ( valid in RFC2109 )
--if( ! isSpecial ) {
--sc=addCookie();
--sc.getName().setBytes( bytes, startName,
-- endName-startName );
--sc.getValue().setString("");
--sc.setVersion( version );
--if( dbg>0 ) log( "Name only, end: " + startName + " " +
-- endName);
--}
--return;
--}
--
--cc=bytes[pos];
--pos++;
--if( cc==';' || cc==',' || pos>=end ) {
--if( ! isSpecial && startName!= endName ) {
--sc=addCookie();
--sc.getName().setBytes( bytes, startName,
-- endName-startName );
--sc.getValue().setString("");
--sc.setVersion( version );
--if( dbg>0 ) log( "Name only: " + startName + " " +
endName);
--}
--continue;
--}
--
--// we should have "=" ( tested all other alternatives )
--
svn commit: r583525 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Wed Oct 10 09:01:08 2007 New Revision: 583525 URL: http://svn.apache.org/viewvc?rev=583525&view=rev Log: Remove a wrong and probably missleading part so a sentence. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=583525&r1=583524&r2=583525&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Wed Oct 10 09:01:08 2007 @@ -48,3 +48,8 @@ * Call StopAwait at StandardServer.stop as port==-1 +1: pero -1: + +* Arrange doc of connectors. + http://people.apache.org/~jfclere/patches/tc.docs.patch + +1: jfclere + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r586775 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Author: jfclere
Date: Sat Oct 20 11:57:08 2007
New Revision: 586775
URL: http://svn.apache.org/viewvc?rev=586775&view=rev
Log:
Otherwise nothing gets configured.
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=586775&r1=586774&r2=586775&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sat Oct 20 11:57:08
2007
@@ -2807,7 +2807,6 @@
conf = (jk_server_conf_t *)ap_get_module_config(s->module_config,
&jk_module);
if (conf->was_initialized == JK_FALSE) {
-conf->was_initialized = JK_TRUE;
/* step through the servers and open each jk logfile
* and do additional post config initialization.
*/
@@ -2872,6 +2871,7 @@
}
}
}
+conf->was_initialized = JK_TRUE;
if (init_jk(pconf, conf, s) == JK_FALSE)
return HTTP_INTERNAL_SERVER_ERROR;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r587018 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Mon Oct 22 00:18:49 2007 New Revision: 587018 URL: http://svn.apache.org/viewvc?rev=587018&view=rev Log: Add the Cookies tests patch. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=587018&r1=587017&r2=587018&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Mon Oct 22 00:18:49 2007 @@ -85,3 +85,6 @@ +1: billbarker -1: +* Tests for unit tests for the cookie issues. http://people.apache.org/~jfclere/patches/CookiesTest.patch + +1: + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r587043 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Mon Oct 22 02:05:37 2007 New Revision: 587043 URL: http://svn.apache.org/viewvc?rev=587043&view=rev Log: Propose a better patch for IcedTea support. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=587043&r1=587042&r2=587043&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Mon Oct 22 02:05:37 2007 @@ -52,7 +52,7 @@ if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then +1: - -1: + -1: jfclere. I have proposed a "better" patch below. 0: yoavs,rjung Comment by rjung: Maybe switching "then" and "else" cases by using "-x" instead of "! -x". This way the error exit stays the last case which seems more natural. @@ -86,5 +86,9 @@ -1: * Tests for unit tests for the cookie issues. http://people.apache.org/~jfclere/patches/CookiesTest.patch + +1: + -1: + +* Guess java location from the PATH environment. http://people.apache.org/~jfclere/patches/setclasspath.sh.patch +1: -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r587045 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Mon Oct 22 02:07:39 2007 New Revision: 587045 URL: http://svn.apache.org/viewvc?rev=587045&view=rev Log: It also improve the fix for 37284. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=587045&r1=587044&r2=587045&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Mon Oct 22 02:07:39 2007 @@ -90,5 +90,6 @@ -1: * Guess java location from the PATH environment. http://people.apache.org/~jfclere/patches/setclasspath.sh.patch + And improve fix for 37284. +1: -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r587478 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Tue Oct 23 05:37:06 2007 New Revision: 587478 URL: http://svn.apache.org/viewvc?rev=587478&view=rev Log: Add a fix for sockets in CLOSE_WAIT state. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=587478&r1=587477&r2=587478&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Tue Oct 23 05:37:06 2007 @@ -50,3 +50,7 @@ And improve fix for 37284. +1: -1: + +* Harmonize with HTTP java.io code. Otherwise the socket is not closed. http://people.apache.org/~jfclere/patches/AjpPro.patch + +1: jfclere + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r588673 - in /tomcat/tc6.0.x/trunk: ./ test/ test/org/apache/catalina/tomcat/ test/org/apache/catalina/tomcat/util/ test/org/apache/catalina/tomcat/util/http/ webapps/docs/
Author: jfclere
Date: Fri Oct 26 07:51:23 2007
New Revision: 588673
URL: http://svn.apache.org/viewvc?rev=588673&view=rev
Log:
Add the tests of the cookies.
Added:
tomcat/tc6.0.x/trunk/test/build.xml
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java
Modified:
tomcat/tc6.0.x/trunk/STATUS
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=588673&r1=588672&r2=588673&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Fri Oct 26 07:51:23 2007
@@ -26,10 +26,6 @@
[ New proposals should be added at the end of the list ]
-* Tests for unit tests for the cookie issues.
http://people.apache.org/~jfclere/patches/CookiesTest.patch
- +1: fhanik, funkman, pero, jim
- -1:
-
* Guess java location from the PATH environment.
http://people.apache.org/~jfclere/patches/setclasspath.sh.patch
And improve fix for 37284.
+1: fhanik, remm, funkman, pero, jim
Added: tomcat/tc6.0.x/trunk/test/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/build.xml?rev=588673&view=auto
==
--- tomcat/tc6.0.x/trunk/test/build.xml (added)
+++ tomcat/tc6.0.x/trunk/test/build.xml Fri Oct 26 07:51:23 2007
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Added:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java?rev=588673&view=auto
==
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java
(added)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tomcat/util/http/TestCookies.java
Fri Oct 26 07:51:23 2007
@@ -0,0 +1,258 @@
+/*
+ * 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.
+ */
+
+import org.apache.tomcat.util.http.Cookies;
+import org.apache.tomcat.util.http.ServerCookie;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import java.lang.Exception;
+
+
+public class TestCookies extends TestCase {
+public static void main( String args[] ) {
+ TestRunner.run(suite());
+}
+public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new TestSuite(TestCookies.class));
+ return suite;
+}
+/*
+ int i = 1000;
+ // These tests are not really representative
+ while (i-- > 0) {
+ test("session=1234567890;name=\"John Q. Public\";");
+}
+//runtests();
+}
+ */
+
+public void testCookies() throws Exception {
+test("foo=bar; a=b", "foo", "bar", "a", "b");
+test("foo=bar;a=b", "foo", "bar", "a", "b");
+test("foo=bar;a=b;", "foo", "bar", "a", "b");
+test("foo=bar;a=b; ", "foo", "bar", "a", "b");
+test("foo=bar;a=b; ;", "foo", "bar", "a", "b");
+test("foo=;a=b; ;", "foo", "", "a", "b");
+test("foo;a=b; ;", "foo", "", "a", "b");
+// v1
+test("$Version=1; foo=bar;a=b", "foo", "bar", &qu
svn commit: r589060 - in /tomcat/tc6.0.x/trunk: STATUS bin/setclasspath.sh webapps/docs/changelog.xml
Author: jfclere Date: Sat Oct 27 01:19:24 2007 New Revision: 589060 URL: http://svn.apache.org/viewvc?rev=589060&view=rev Log: Commit the accept proposal to improve JAVA_HOME detection. Modified: tomcat/tc6.0.x/trunk/STATUS tomcat/tc6.0.x/trunk/bin/setclasspath.sh tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=589060&r1=589059&r2=589060&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Sat Oct 27 01:19:24 2007 @@ -26,11 +26,6 @@ [ New proposals should be added at the end of the list ] -* Guess java location from the PATH environment. http://people.apache.org/~jfclere/patches/setclasspath.sh.patch - And improve fix for 37284. - +1: fhanik, remm, funkman, pero, jim - -1: - * Harmonize with HTTP java.io code. Otherwise the socket is not closed. http://people.apache.org/~jfclere/patches/AjpPro.patch +1: jfclere, fhanik, remm, pero, jim -1: Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.sh?rev=589060&r1=589059&r2=589060&view=diff == --- tomcat/tc6.0.x/trunk/bin/setclasspath.sh (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.sh Sat Oct 27 01:19:24 2007 @@ -26,10 +26,25 @@ # Make sure prerequisite environment variables are set if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then - # Bugzilla 37284 - if $darwin && [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home" ]; then -export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home" + # Bugzilla 37284 (reviewed). + if $darwin; then +if [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then + export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" +fi else +JAVA_PATH=`which java 2>/dev/null` +if [ "x$JAVA_PATH" != "x" ]; then + JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null` + JRE_HOME=`dirname $JAVA_PATH 2>/dev/null` +fi +if [ "x$JRE_HOME" = "x" ]; then + # XXX: Should we try other locations? + if [ -x /usr/bin/java ]; then +JRE_HOME=/usr + fi +fi + fi + if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" echo "At least one of these environment variable is needed to run this program" exit 1 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=589060&r1=589059&r2=589060&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Oct 27 01:19:24 2007 @@ -46,6 +46,7 @@ + Guess java location from the PATH environment and improve fix for 37284 Add NIO connector to server.xml parsing warning, remove Connector as exception case 43653Fix SSL buffer mixup when response is unable to write more than socket buffer can handle 43643If connector doesn't support external executor, display warning - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r589062 - in /tomcat/tc6.0.x/trunk: STATUS java/org/apache/coyote/ajp/AjpProcessor.java java/org/apache/coyote/ajp/AjpProtocol.java webapps/docs/changelog.xml
Author: jfclere
Date: Sat Oct 27 01:25:56 2007
New Revision: 589062
URL: http://svn.apache.org/viewvc?rev=589062&view=rev
Log:
Commit the accepted proposal to prevent CLOSE_WAIT sockets.
Modified:
tomcat/tc6.0.x/trunk/STATUS
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=589062&r1=589061&r2=589062&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Sat Oct 27 01:25:56 2007
@@ -26,10 +26,6 @@
[ New proposals should be added at the end of the list ]
-* Harmonize with HTTP java.io code. Otherwise the socket is not closed.
http://people.apache.org/~jfclere/patches/AjpPro.patch
- +1: jfclere, fhanik, remm, pero, jim
- -1:
-
* Fix BZ 43588 - hard coded 127.0.0.1 for localhost
http://issues.apache.org/bugzilla/attachment.cgi?id=21039&action=view
+1:
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?rev=589062&r1=589061&r2=589062&view=diff
==
--- 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 Sat Oct
27 01:25:56 2007
@@ -355,7 +355,7 @@
*
* @throws IOException error during an I/O operation
*/
-public boolean process(Socket socket)
+public void process(Socket socket)
throws IOException {
RequestInfo rp = request.getRequestProcessor();
rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
@@ -471,8 +471,6 @@
input = null;
output = null;
-return true;
-
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=589062&r1=589061&r2=589062&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Sat Oct 27
01:25:56 2007
@@ -363,7 +363,8 @@
((ActionHook) processor).action(ActionCode.ACTION_START,
null);
}
-return processor.process(socket);
+processor.process(socket);
+return false;
} catch(java.net.SocketException e) {
// SocketExceptions are normal
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=589062&r1=589061&r2=589062&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Oct 27 01:25:56 2007
@@ -142,6 +142,9 @@
+Harmonize with HTTP java.io code. Otherwise the socket is not closed.
+
+
In the APR connector, start accepting connections after fully starting
the connector, to prevent possible exceptions due to non initialized
fields. (remm)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r593171 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere
Date: Thu Nov 8 06:38:54 2007
New Revision: 593171
URL: http://svn.apache.org/viewvc?rev=593171&view=rev
Log:
Cast my vote.
Modified:
tomcat/tc6.0.x/trunk/STATUS
Modified: tomcat/tc6.0.x/trunk/STATUS
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=593171&r1=593170&r2=593171&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Thu Nov 8 06:38:54 2007
@@ -47,7 +47,7 @@
+1: markt
-1:
-* Fix cookie $Version parsing
+* Fix cookie $Version parsing
Index: java/org/apache/tomcat/util/http/Cookies.java
===
--- java/org/apache/tomcat/util/http/Cookies.java(revision 589807)
@@ -62,5 +62,5 @@
} else {
// unknown version (Versioning is not very strict)
- +1: fhanik
- -1:
\ No newline at end of file
+ +1: fhanik, jfclere
+ -1:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r593173 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Thu Nov 8 06:41:50 2007 New Revision: 593173 URL: http://svn.apache.org/viewvc?rev=593173&view=rev Log: Add another proposal. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=593173&r1=593172&r2=593173&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Thu Nov 8 06:41:50 2007 @@ -64,3 +64,7 @@ +1: fhanik, jfclere -1: + +* Fix double quoting of quoted-string. http://people.apache.org/~jfclere/patches/cookies.tck.patch + +1: jfclere + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r594160 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Mon Nov 12 06:37:38 2007 New Revision: 594160 URL: http://svn.apache.org/viewvc?rev=594160&view=rev Log: Cast some votes. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=594160&r1=594159&r2=594160&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Mon Nov 12 06:37:38 2007 @@ -57,9 +57,9 @@ Includes: Version fix, Escape fix Excludes: Already quoted fix, vetoed in prev proposal +1: fhanik - -1: + -1: jfclere TC doesn't pass TCK tests with your patch. +1 for the version part. * Fix licensing of JSP 2.1 schema svn diff -c r593814 - +1: markt, remm + +1: markt, remm, jfclere -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r594604 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Tue Nov 13 10:16:46 2007 New Revision: 594604 URL: http://svn.apache.org/viewvc?rev=594604&view=rev Log: Cast my vote. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=594604&r1=594603&r2=594604&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Tue Nov 13 10:16:46 2007 @@ -54,5 +54,5 @@ * Fix Tomcat's cookie parsing/writing, changelog updated with changes http://people.apache.org/~fhanik/patches/cookie_change.patch.5 - +1: fhanik - -1: \ No newline at end of file + +1: fhanik, jfclere + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r594606 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Tue Nov 13 10:41:09 2007 New Revision: 594606 URL: http://svn.apache.org/viewvc?rev=594606&view=rev Log: Add tests (for the version problem in cookies parsing for example). Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=594606&r1=594605&r2=594606&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Tue Nov 13 10:41:09 2007 @@ -56,3 +56,8 @@ http://people.apache.org/~fhanik/patches/cookie_change.patch.5 +1: fhanik, jfclere -1: + +* Add tests for the cookie parsing. + http://people.apache.org/~jfclere/patches/test_cookies.patch + +1: jfclere + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r595009 - /tomcat/tc6.0.x/trunk/STATUS
Author: jfclere Date: Wed Nov 14 10:47:32 2007 New Revision: 595009 URL: http://svn.apache.org/viewvc?rev=595009&view=rev Log: Cast a vote. Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=595009&r1=595008&r2=595009&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Wed Nov 14 10:47:32 2007 @@ -70,6 +70,6 @@ * JDT location return 404 http://people.apache.org/~fhanik/patches/jdt-loc.patch - +1: fhanik + +1: fhanik, jfclere -1: - \ No newline at end of file + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r598930 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Wed Nov 28 01:43:38 2007 New Revision: 598930 URL: http://svn.apache.org/viewvc?rev=598930&view=rev Log: Cast my vote. 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=598930&r1=598929&r2=598930&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 28 01:43:38 2007 @@ -33,7 +33,7 @@ * Remove conditional headers on Form Auth replay, since the UA (esp. FireFox) isn't expecting it. http://issues.apache.org/bugzilla/show_bug.cgi?id=43687 - +1: billbarker, remm + +1: billbarker, remm, jfclere -1: * Fix another license issue @@ -49,11 +49,11 @@ * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43706 Copy/move should return 201 http://svn.apache.org/viewvc?rev=598783&view=rev - +1: markt + +1: markt, jfclere -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43957 Service.bat doesn't configure logging correctly http://svn.apache.org/viewvc?rev=598800&view=rev - +1: markt + +1: markt, jfclere -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601795 - /tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Author: jfclere
Date: Thu Dec 6 09:53:09 2007
New Revision: 601795
URL: http://svn.apache.org/viewvc?rev=601795&view=rev
Log:
Allow to specify a random device.
SSLRandomSeed="/dev/random"
SSLRandomSeed="/dev/urandom"
SSLRandomSeed="builtin" (Default).
The native already exists.
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=601795&r1=601794&r2=601795&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu
Dec 6 09:53:09 2007
@@ -64,6 +64,7 @@
// -- Properties
protected static String SSLEngine = "on"; //default on
+protected static String SSLRandomSeed = "builtin";
protected static boolean sslInitialized = false;
protected static boolean aprInitialized = false;
@@ -212,6 +213,12 @@
Class clazz = Class.forName("org.apache.tomcat.jni.SSL");
Method method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
+
+methodName = "randLoad";
+paramValues[0] = SSLRandomSeed;
+method = clazz.getMethod(methodName, paramTypes);
+method.invoke(null, paramValues);
+
sslInitialized = true;
}
@@ -223,4 +230,11 @@
this.SSLEngine = SSLEngine;
}
+public String getSSLRandomSeed() {
+return SSLRandomSeed;
+}
+
+public void setSSLRandomSeed(String SSLRandomSeed) {
+this.SSLRandomSeed = SSLRandomSeed;
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r602114 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java tomcat/jni/SSL.java
Author: jfclere
Date: Fri Dec 7 07:00:01 2007
New Revision: 602114
URL: http://svn.apache.org/viewvc?rev=602114&view=rev
Log:
Don't load the entropy but sets the file the entropy is collected from.
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=602114&r1=602113&r2=602114&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Fri
Dec 7 07:00:01 2007
@@ -205,17 +205,18 @@
//only once per VM
return;
}
-String methodName = "initialize";
+String methodName = "randSet";
Class paramTypes[] = new Class[1];
paramTypes[0] = String.class;
Object paramValues[] = new Object[1];
-paramValues[0] = "on".equalsIgnoreCase(SSLEngine)?null:SSLEngine;
+paramValues[0] = SSLRandomSeed;
Class clazz = Class.forName("org.apache.tomcat.jni.SSL");
Method method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
+
-methodName = "randLoad";
-paramValues[0] = SSLRandomSeed;
+methodName = "initialize";
+paramValues[0] = "on".equalsIgnoreCase(SSLEngine)?null:SSLEngine;
method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=602114&r1=602113&r2=602114&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Fri Dec 7 07:00:01 2007
@@ -227,6 +227,12 @@
public static native int initialize(String engine);
/**
+ * Set source of entropy to use in SSL
+ * @param filename Filename containing random data
+ */
+public static native boolean randSet(String filename);
+
+/**
* Add content of the file to the PRNG
* @param filename Filename containing random data.
*If null the default file will be tested.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r603504 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c
Author: jfclere Date: Tue Dec 11 23:57:48 2007 New Revision: 603504 URL: http://svn.apache.org/viewvc?rev=603504&view=rev Log: Don't put comment in comments, otherwise it won't compile. Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?rev=603504&r1=603503&r2=603504&view=diff == --- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Tue Dec 11 23:57:48 2007 @@ -60,8 +60,8 @@ /** Set socket to blocking * @param sd socket to manipulate - * @returnerrno: fcntl returns -1 /* ! WIN32 */ - *pseudo errno: ioctlsocket returns SOCKET_ERROR /* WIN32 */ + * @returnerrno: fcntl returns -1 /0 ! WIN32 0/ + *pseudo errno: ioctlsocket returns SOCKET_ERROR /0 WIN32 0/ *0: success */ static int soblock(jk_sock_t sd) @@ -95,8 +95,8 @@ /** Set socket to non-blocking * @param sd socket to manipulate - * @returnerrno: fcntl returns -1 /* ! WIN32 */ - *pseudo errno: ioctlsocket returns SOCKET_ERROR /* WIN32 */ + * @returnerrno: fcntl returns -1 /0 ! WIN32 0/ + *pseudo errno: ioctlsocket returns SOCKET_ERROR /0 WIN32 0/ *0: success */ static int sononblock(jk_sock_t sd) @@ -542,8 +542,8 @@ /** Close the socket * @param s socket to close * @param l logger - * @return -1: some kind of error occured /* ! WIN32 */ - * SOCKET_ERROR: some kind of error occured /* WIN32 */ + * @return -1: some kind of error occured /0 ! WIN32 0/ + * SOCKET_ERROR: some kind of error occured /0 WIN32 0/ * 0: success */ int jk_close_socket(jk_sock_t s, jk_logger_t *l) @@ -574,8 +574,8 @@ * @param s socket to close * @param l logger * @return -1: socket to close is invalid - * -1: some kind of error occured /* ! WIN32 */ - * SOCKET_ERROR: some kind of error occured /* WIN32 */ + * -1: some kind of error occured /0 ! WIN32 0/ + * SOCKET_ERROR: some kind of error occured /0 WIN32 0/ * 0: success */ int jk_shutdown_socket(jk_sock_t s, jk_logger_t *l) @@ -638,8 +638,8 @@ * @param b buffer containing the data * @param len length to send * @param l logger - * @returnnegative errno: write returns a fatal -1 /* ! WIN32 */ - *negative pseudo errno: send returns SOCKET_ERROR /* WIN32 */ + * @returnnegative errno: write returns a fatal -1 /0 ! WIN32 0/ + *negative pseudo errno: send returns SOCKET_ERROR /0 WIN32 0/ *JK_SOCKET_EOF: no bytes could be sent *>0: success, total size send * @bug this fails on Unixes if len is too big for the underlying @@ -677,8 +677,8 @@ * @param b buffer to store the data * @param len length to receive * @param l logger - * @returnnegative errno: read returns a fatal -1 /* ! WIN32 */ - *negative pseudo errno: recv returns SOCKET_ERROR /* WIN32 */ + * @returnnegative errno: read returns a fatal -1 /0 ! WIN32 0/ + *negative pseudo errno: recv returns SOCKET_ERROR /0 WIN32 0/ *JK_SOCKET_EOF: no bytes could be read *>0: success, total size received */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r605571 - /tomcat/connectors/trunk/jni/native/src/sslnetwork.c
Author: jfclere
Date: Wed Dec 19 07:13:12 2007
New Revision: 605571
URL: http://svn.apache.org/viewvc?rev=605571&view=rev
Log:
Prevent returning APR_SUCCESS when there is something wrong in ssl layer.
Fix for PR: 44087
Modified:
tomcat/connectors/trunk/jni/native/src/sslnetwork.c
Modified: tomcat/connectors/trunk/jni/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/sslnetwork.c?rev=605571&r1=605570&r2=605571&view=diff
==
--- tomcat/connectors/trunk/jni/native/src/sslnetwork.c (original)
+++ tomcat/connectors/trunk/jni/native/src/sslnetwork.c Wed Dec 19 07:13:12 2007
@@ -333,7 +333,7 @@
if (!APR_STATUS_IS_EAGAIN(os) &&
!APR_STATUS_IS_EINTR(os)) {
con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
-return os;
+return os == APR_SUCCESS ? APR_EGENERAL : os;
}
break;
default:
@@ -407,7 +407,7 @@
if (!APR_STATUS_IS_EAGAIN(os) &&
!APR_STATUS_IS_EINTR(os)) {
con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
-return os;
+return os == APR_SUCCESS ? APR_EGENERAL : os;
}
break;
default:
@@ -458,7 +458,7 @@
if (!APR_STATUS_IS_EAGAIN(os) &&
!APR_STATUS_IS_EINTR(os)) {
con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
-return os;
+return os == APR_SUCCESS ? APR_EGENERAL : os;
}
break;
default:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r605596 - /tomcat/connectors/trunk/jni/CHANGELOG.txt
Author: jfclere Date: Wed Dec 19 07:58:23 2007 New Revision: 605596 URL: http://svn.apache.org/viewvc?rev=605596&view=rev Log: A text version of the moment. Added: tomcat/connectors/trunk/jni/CHANGELOG.txt Added: tomcat/connectors/trunk/jni/CHANGELOG.txt URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/CHANGELOG.txt?rev=605596&view=auto == --- tomcat/connectors/trunk/jni/CHANGELOG.txt (added) +++ tomcat/connectors/trunk/jni/CHANGELOG.txt Wed Dec 19 07:58:23 2007 @@ -0,0 +1,7 @@ +Improvement: Add support of J9VM based JVM. (jfclere) +Improvement: Arrange licence in source files. (markt). +Improvement: Add two new 'immediate' methods for sending the data. + It is the responsibility of the Java callee to deal with + the returned values and retry if the error was non-fatal. (mturk) +Fix: Arrange the check of openssl version. It was failing on Linux. (jfclere) +Fix: Prevent returning APR_SUCCESS when there is something wrong in ssl layer. Fix for PR: 44087 (jfclere) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r605607 - /tomcat/connectors/trunk/jni/CHANGELOG.txt
Author: jfclere Date: Wed Dec 19 08:29:54 2007 New Revision: 605607 URL: http://svn.apache.org/viewvc?rev=605607&view=rev Log: Add a line for the old existing tag. Modified: tomcat/connectors/trunk/jni/CHANGELOG.txt Modified: tomcat/connectors/trunk/jni/CHANGELOG.txt URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/CHANGELOG.txt?rev=605607&r1=605606&r2=605607&view=diff == --- tomcat/connectors/trunk/jni/CHANGELOG.txt (original) +++ tomcat/connectors/trunk/jni/CHANGELOG.txt Wed Dec 19 08:29:54 2007 @@ -5,3 +5,4 @@ the returned values and retry if the error was non-fatal. (mturk) Fix: Arrange the check of openssl version. It was failing on Linux. (jfclere) Fix: Prevent returning APR_SUCCESS when there is something wrong in ssl layer. Fix for PR: 44087 (jfclere) +Tag: 1_1.11 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r605878 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Thu Dec 20 02:36:05 2007 New Revision: 605878 URL: http://svn.apache.org/viewvc?rev=605878&view=rev Log: Cast my vote. 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=605878&r1=605877&r2=605878&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 20 02:36:05 2007 @@ -74,11 +74,11 @@ * Dont reuse byte buffers and use only the size you need http://people.apache.org/~fhanik/patches/request-byte-reuse.patch +1: fhanik - -1: + -1: jfclere (Just add a return to the original when there is an exception). * Alternate fix to the above patch, reuse the byte buffers but check the read in the correct place http://people.apache.org/~fhanik/patches/request-byte-with-reuse.patch +1: fhanik - -1: + -1: jfclere (Just add a return to the original when there is an exception). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606201 - in /tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12: ./ jk/native/common/jk_util.c jk/native/common/portable.h jni/ jni/CHANGELOG.txt jni/native/ jni/native/src/sslnetwork.c
Author: jfclere
Date: Fri Dec 21 05:59:25 2007
New Revision: 606201
URL: http://svn.apache.org/viewvc?rev=606201&view=rev
Log:
tag tcnative 1.1.12
Added:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/
- copied from r605171, tomcat/connectors/trunk/
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jni/
- copied from r605457, tomcat/connectors/trunk/jni/
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jni/CHANGELOG.txt
- copied unchanged from r605607, tomcat/connectors/trunk/jni/CHANGELOG.txt
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jni/native/
- copied from r605534, tomcat/connectors/trunk/jni/native/
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jni/native/src/sslnetwork.c
- copied unchanged from r605571,
tomcat/connectors/trunk/jni/native/src/sslnetwork.c
Modified:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
Modified:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c?rev=606201&r1=605171&r2=606201&view=diff
==
---
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
(original)
+++
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
Fri Dec 21 05:59:25 2007
@@ -31,6 +31,13 @@
#include "jk_lb_worker.h"
#include "jk_mt.h"
+#include "ap_config.h"
+#include "httpd.h"
+#include "http_config.h"
+#include "http_core.h"
+#include "http_log.h"
+
+
#define SYSPROPS_OF_WORKER ("sysprops")
#define STDERR_OF_WORKER("stderr")
#define STDOUT_OF_WORKER("stdout")
@@ -605,6 +612,8 @@
* to the output routing.
*/
static int usable_size = HUGE_BUFFER_SIZE - 3;
+ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+"jk_log %d %d %d", l, file, fmt);
if (!l || !file || !fmt) {
return -1;
}
Modified:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h?rev=606201&r1=605171&r2=606201&view=diff
==
---
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
(original)
+++
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
Fri Dec 21 05:59:25 2007
@@ -1,18 +1,98 @@
-/*
- * 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.
- */
-/* On most platform this file is overwritten when doing configure */
-/* DON'T COMMIT THE FILE IT BREAKS windoze and Netware, commit the sample file
*/
+/* common/portable.h. Generated from portable.h.in by configure. */
+/* common/portable.h.in. Generated from configure.in by autoheader. */
+
+/* Define to 1 if you have the header file. */
+#define HAVE_DLFCN_H 1
+
+/* Have flock() */
+#define HAVE_FLOCK 1
+
+/* Define to 1 if you have the header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the header file. */
+#define HAVE_MEMORY_H 1
+
+/* Have snprintf() */
+#define HAVE_SNPRINTF 1
+
+/* Define to 1 if you have the header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the header file. */
+/* #undef HAVE_SYS_FILIO_H */
+
+/* Define to 1 if you have the header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the header file. */
+#define HAVE_UNISTD_H 1
+
+/* Have vsnprintf() */
+#define HAVE_VSNPRINTF 1
+
+/* Name of package */
+#defin
svn commit: r606194 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Fri Dec 21 05:32:33 2007 New Revision: 606194 URL: http://svn.apache.org/viewvc?rev=606194&view=rev Log: Add my proposal... 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=606194&r1=606193&r2=606194&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Dec 21 05:32:33 2007 @@ -80,5 +80,8 @@ http://people.apache.org/~fhanik/patches/request-byte-with-reuse.patch +1: fhanik -1: jfclere (Just add a return to the original when there is an exception). - - + +* Smallest fix to the above patches. + http://people.apache.org/~jfclere/patches/Request.patch + +1: jfclere + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606235 - in /tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common: jk_util.c portable.h
Author: jfclere
Date: Fri Dec 21 08:23:45 2007
New Revision: 606235
URL: http://svn.apache.org/viewvc?rev=606235&view=rev
Log:
Oops committed by error. Sorry.
Modified:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
Modified:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c?rev=606235&r1=606234&r2=606235&view=diff
==
---
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
(original)
+++
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
Fri Dec 21 08:23:45 2007
@@ -31,13 +31,6 @@
#include "jk_lb_worker.h"
#include "jk_mt.h"
-#include "ap_config.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-
-
#define SYSPROPS_OF_WORKER ("sysprops")
#define STDERR_OF_WORKER("stderr")
#define STDOUT_OF_WORKER("stdout")
@@ -612,8 +605,6 @@
* to the output routing.
*/
static int usable_size = HUGE_BUFFER_SIZE - 3;
-ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-"jk_log %d %d %d", l, file, fmt);
if (!l || !file || !fmt) {
return -1;
}
Modified:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h?rev=606235&r1=606234&r2=606235&view=diff
==
---
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
(original)
+++
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
Fri Dec 21 08:23:45 2007
@@ -1,98 +1,18 @@
-/* common/portable.h. Generated from portable.h.in by configure. */
-/* common/portable.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the header file. */
-#define HAVE_DLFCN_H 1
-
-/* Have flock() */
-#define HAVE_FLOCK 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_MEMORY_H 1
-
-/* Have snprintf() */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the header file. */
-#define HAVE_UNISTD_H 1
-
-/* Have vsnprintf() */
-#define HAVE_VSNPRINTF 1
-
-/* Name of package */
-#define PACKAGE "mod_jk"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* The size of `char', as computed by sizeof. */
-#define SIZEOF_CHAR 1
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of `longlong', as computed by sizeof. */
-#define SIZEOF_LONGLONG 0
-
-/* The size of `long double', as computed by sizeof. */
-#define SIZEOF_LONG_DOUBLE 12
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* The size of pid_t */
-#define SIZEOF_PID_T 4
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to use SO_RCVTIMEO with setsockopt() */
-#define USE_SO_RCVTIMEO 1
-
-/* Define to use SO_SNDTIMEO with setsockopt() */
-#define USE_SO_SNDTIMEO 1
-
-/* Version number of package */
-#define VERSION "1.2.26"
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional inform
svn commit: r467599 - in /tomcat/tc6.0.x/trunk/java/org/apache/jk: common/ChannelSocket.java common/JkInputStream.java core/JkHandler.java core/MsgContext.java
Author: jfclere
Date: Wed Oct 25 03:18:02 2006
New Revision: 467599
URL: http://svn.apache.org/viewvc?view=rev&rev=467599
Log:
Allow variable size of AJP message via packetSize=n in .
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java?view=diff&rev=467599&r1=467598&r2=467599
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java Wed Oct
25 03:18:02 2006
@@ -654,7 +654,7 @@
log.debug("Accepting ajp connections on " + port);
while( running ) {
try{
-MsgContext ep=createMsgContext();
+MsgContext ep=createMsgContext(packetSize);
ep.setSource(this);
ep.setWorkerEnv( wEnv );
this.accept(ep);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java?view=diff&rev=467599&r1=467598&r2=467599
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java Wed Oct
25 03:18:02 2006
@@ -39,8 +39,8 @@
private static org.apache.juli.logging.Log log=
org.apache.juli.logging.LogFactory.getLog( JkInputStream.class );
-private Msg bodyMsg = new MsgAjp();
-private Msg outputMsg = new MsgAjp();
+private Msg bodyMsg;
+private Msg outputMsg;
private MsgContext mc;
@@ -62,8 +62,16 @@
}
}
-public JkInputStream(MsgContext context) {
+public JkInputStream(MsgContext context, int bsize) {
mc = context;
+bodyMsg = new MsgAjp(bsize);
+outputMsg = new MsgAjp(bsize);
+}
+/**
+ * @deprecated
+ */
+public JkInputStream(MsgContext context) {
+this(context, 8*1024);
}
// Jk specific methods
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java?view=diff&rev=467599&r1=467598&r2=467599
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java Wed Oct 25
03:18:02 2006
@@ -111,9 +111,13 @@
}
public MsgContext createMsgContext() {
-return new MsgContext();
+return new MsgContext(8*1024);
}
+public MsgContext createMsgContext(int bsize) {
+return new MsgContext(bsize);
+}
+
public int invoke(Msg msg, MsgContext mc ) throws IOException {
return OK;
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java?view=diff&rev=467599&r1=467598&r2=467599
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java Wed Oct 25
03:18:02 2006
@@ -53,7 +53,7 @@
private Object notes[]=new Object[32];
private JkHandler next;
private JkChannel source;
-private JkInputStream jkIS = new JkInputStream(this);
+private JkInputStream jkIS;
private C2BConverter c2b;
private Request req;
private WorkerEnv wEnv;
@@ -80,12 +80,19 @@
public static final int JK_STATUS_CLOSED=2;
public static final int JK_STATUS_ERROR=3;
-public MsgContext() {
+public MsgContext(int bsize) {
try {
c2b = new C2BConverter("iso-8859-1");
} catch(IOException iex) {
log.warn("Can't happen", iex);
}
+jkIS = new JkInputStream(this, bsize);
+}
+/**
+ * @deprecated
+ */
+public MsgContext() {
+this(8*1024);
}
public final Object getNote( int id ) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r477127 - /tomcat/connectors/trunk/jk/native/scripts/build/instdso.sh
Author: jfclere Date: Mon Nov 20 01:59:36 2006 New Revision: 477127 URL: http://svn.apache.org/viewvc?view=rev&rev=477127 Log: Oops. The files should not be removed. Other for example make install will fail. Modified: tomcat/connectors/trunk/jk/native/scripts/build/instdso.sh Modified: tomcat/connectors/trunk/jk/native/scripts/build/instdso.sh URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/scripts/build/instdso.sh?view=diff&rev=477127&r1=477126&r2=477127 == --- tomcat/connectors/trunk/jk/native/scripts/build/instdso.sh (original) +++ tomcat/connectors/trunk/jk/native/scripts/build/instdso.sh Mon Nov 20 01:59:36 2006 @@ -88,9 +88,4 @@ mv $TARGETDIR/$DLNAME $TARGETDIR/$TARGET_NAME fi -rm -f $TARGETDIR/$DSOARCHIVE_BASENAME -rm -f $TARGETDIR/$DSOBASE.a -rm -f $TARGETDIR/lib$DSOBASE.a -rm -f $TARGETDIR/lib$TARGET_NAME - exit 0 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r482664 - /tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml
Author: jfclere Date: Tue Dec 5 06:14:29 2006 New Revision: 482664 URL: http://svn.apache.org/viewvc?view=rev&rev=482664 Log: That would create a trustedCertEntry but we need a keyEntry. Modified: tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml?view=diff&rev=482664&r1=482663&r2=482664 == --- tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Tue Dec 5 06:14:29 2006 @@ -533,7 +533,7 @@ And finally import your new Certificate keytool -import -alias tomcat -keystore <your_keystore_filename> \ - -trustcacerts -file <your_certificate_filename> + -file <your_certificate_filename> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r502560 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Author: jfclere
Date: Fri Feb 2 02:07:49 2007
New Revision: 502560
URL: http://svn.apache.org/viewvc?view=rev&rev=502560
Log:
Get it compile on httpd-dev (20060905.0).
ap_get_server_version() has been replaced by ap_get_server_banner().
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=502560&r1=502559&r2=502560
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Feb 2 02:07:49
2007
@@ -565,7 +565,11 @@
*/
s->server_port = ap_get_server_port(r);
+#if (MODULE_MAGIC_NUMBER_MAJOR > 20060110)
+s->server_software = (char *)ap_get_server_banner();
+#else
s->server_software = (char *)ap_get_server_version();
+#endif
s->method = (char *)r->method;
s->content_length = get_content_length(r);
s->is_chunked = r->read_chunked;
@@ -2605,7 +2609,11 @@
will feed it */
worker_env.uri_to_worker = conf->uw_map;
worker_env.virtual = "*"; /* for now */
+#if (MODULE_MAGIC_NUMBER_MAJOR > 20060110)
+worker_env.server_name = (char *)ap_get_server_banner();
+#else
worker_env.server_name = (char *)ap_get_server_version();
+#endif
if (wc_open(init_map, &worker_env, conf->log)) {
ap_add_version_component(pconf, JK_EXPOSED_VERSION);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r502649 - /tomcat/connectors/trunk/jk/native/common/jk_global.h
Author: jfclere Date: Fri Feb 2 08:27:53 2007 New Revision: 502649 URL: http://svn.apache.org/viewvc?view=rev&rev=502649 Log: Otherwise it doesn't compile with gcc on HPUX. Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?view=diff&rev=502649&r1=502648&r2=502649 == --- tomcat/connectors/trunk/jk/native/common/jk_global.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_global.h Fri Feb 2 08:27:53 2007 @@ -142,7 +142,7 @@ #include #include #include -#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(CYGWIN) +#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(CYGWIN) && !defined(HPUX11) #include #endif #if !defined(HPUX11) && !defined(AS400) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r505241 - in /tomcat/tc6.0.x/trunk/bin: setclasspath.bat tool-wrapper.bat
Author: jfclere Date: Fri Feb 9 02:22:58 2007 New Revision: 505241 URL: http://svn.apache.org/viewvc?view=rev&rev=505241 Log: Don add tools.jar if it doesn exist. Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?view=diff&rev=505241&r1=505240&r2=505241 == --- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Fri Feb 9 02:22:58 2007 @@ -51,7 +51,9 @@ rem Set standard CLASSPATH rem Note that there are no quotes as we do not want to introduce random rem quotes into the CLASSPATH +if not exist "%JAVA_HOME%\bin\tools.jar" goto noJavac set CLASSPATH=%JAVA_HOME%\lib\tools.jar +:noJavac rem Set standard command for invoking Java. rem Note that NT requires a window name argument when using start. Modified: tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat?view=diff&rev=505241&r1=505240&r2=505241 == --- tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat (original) +++ tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat Fri Feb 9 02:22:58 2007 @@ -43,7 +43,12 @@ call "%CATALINA_HOME%\bin\setclasspath.bat" rem Add on extra jar files to CLASSPATH +if "%CLASSPATH%" == "" goto noclasspath set CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar;"%BASEDIR%"\lib\servlet-api.jar +goto :okclasspath +:noclasspath +set CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar;"%BASEDIR%"\lib\servlet-api.jar +:okclasspath rem Get remaining unshifted command line arguments and save them in the set CMD_LINE_ARGS= - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r505244 - /tomcat/tc6.0.x/trunk/bin/setclasspath.sh
Author: jfclere Date: Fri Feb 9 02:33:43 2007 New Revision: 505244 URL: http://svn.apache.org/viewvc?view=rev&rev=505244 Log: Don't add tools.jar if it is not existing. Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.sh Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.sh?view=diff&rev=505244&r1=505243&r2=505244 == --- tomcat/tc6.0.x/trunk/bin/setclasspath.sh (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.sh Fri Feb 9 02:33:43 2007 @@ -68,8 +68,17 @@ JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed # Set standard CLASSPATH +if [ "$1" = "javac" ] ; then + if [ ! -f "$JAVA_HOME"/lib/tools.jar ]; then +echo "Can't find tools.jar in JAVA_HOME" +echo "Need a JDK to run javac" +exit 1 + fi +fi if [ "$1" = "debug" -o "$1" = "javac" ] ; then - CLASSPATH="$JAVA_HOME"/lib/tools.jar + if [ -f "$JAVA_HOME"/lib/tools.jar ]; then +CLASSPATH="$JAVA_HOME"/lib/tools.jar + fi fi # OSX hack to CLASSPATH - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r509982 - /tomcat/connectors/trunk/jk/native/netscape/Makefile.linux
Author: jfclere Date: Wed Feb 21 04:18:15 2007 New Revision: 509982 URL: http://svn.apache.org/viewvc?view=rev&rev=509982 Log: Sun Java System Web Server 7.0 also works on Linux. That the Makefile to compile nsapi_redirector.so :-) Added: tomcat/connectors/trunk/jk/native/netscape/Makefile.linux Added: tomcat/connectors/trunk/jk/native/netscape/Makefile.linux URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/Makefile.linux?view=auto&rev=509982 == --- tomcat/connectors/trunk/jk/native/netscape/Makefile.linux (added) +++ tomcat/connectors/trunk/jk/native/netscape/Makefile.linux Wed Feb 21 04:18:15 2007 @@ -0,0 +1,38 @@ +# Defines for example NSAPI programs running under Linux + +#gcc +# If you get relocation errors, try: +# 1. compiling with Sun's cc +# 2. statically linking with libgcc +# 3. Adjusting LD_LIBRARY_PATH to grab libgcc_s +CC_CMD=gcc -fpic -DNET_SSL -DLinux -DLINUX -D_REENTRANT \ + +LD_SHAREDCMD=gcc -shared + +OS_TYPE=linux +INCLUDEDIR=$(SUITSPOT_HOME)/include +JAVA_INCLUDE=$(JAVA_HOME)/include +JK_DIR=../common +VPATH=.:$(JK_DIR) + +JK_SRCS = $(shell \ls $(JK_DIR)/*.c) +JK_OBJECTS = $(patsubst $(JK_DIR)/%.c,%.o,$(JK_SRCS)) +JK_JNI_OBJECTS = jk_jni_worker.o jk_nwmain.o +JK_OBJS = $(filter-out $(JK_JNI_OBJECTS),$(JK_OBJECTS)) + +PLUGIN_OBJ = jk_nsapi_plugin.o + +INCLUDE_FLAGS= -I$(JK_DIR) -I$(INCLUDEDIR) -I$(INCLUDEDIR)/base \ + -I$(INCLUDEDIR)/frame -I$(JAVA_INCLUDE) -I$(JAVA_INCLUDE)/$(OS_TYPE) + +all: nsapi_redirector.so + + +nsapi_redirector.so: $(PLUGIN_OBJ) $(JK_OBJS) + $(LD_SHAREDCMD) $(JK_OBJS) $(PLUGIN_OBJ) -o nsapi_redirector.so $(EXTRA_LDDEFINES) + +clean: + rm -f *.o nsapi_redirector.so $(JK_OBJS) + +%.o : %.c + $(CC_CMD) $(INCLUDE_FLAGS) -c $< - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r510000 - /tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris
Author: jfclere Date: Wed Feb 21 05:20:57 2007 New Revision: 51 URL: http://svn.apache.org/viewvc?view=rev&rev=51 Log: The clean should also remove what is in common. Modified: tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris Modified: tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris?view=diff&rev=51&r1=50&r2=51 == --- tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris (original) +++ tomcat/connectors/trunk/jk/native/netscape/Makefile.solaris Wed Feb 21 05:20:57 2007 @@ -41,7 +41,7 @@ $(LD_SHAREDCMD) $(JK_OBJS) $(PLUGIN_OBJ) -o nsapi_redirector.so $(EXTRA_LDDEFINES) clean: - rm -f *.o nsapi_redirector.so + rm -f *.o nsapi_redirector.so $(JK_OBJS) %.o : %.c $(CC_CMD) $(INCLUDE_FLAGS) -c $< - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r510055 - /tomcat/connectors/trunk/jk/native/netscape/Makefile.linux
Author: jfclere Date: Wed Feb 21 07:23:13 2007 New Revision: 510055 URL: http://svn.apache.org/viewvc?view=rev&rev=510055 Log: Add missing define (See nsapi.h to see why). Modified: tomcat/connectors/trunk/jk/native/netscape/Makefile.linux Modified: tomcat/connectors/trunk/jk/native/netscape/Makefile.linux URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/Makefile.linux?view=diff&rev=510055&r1=510054&r2=510055 == --- tomcat/connectors/trunk/jk/native/netscape/Makefile.linux (original) +++ tomcat/connectors/trunk/jk/native/netscape/Makefile.linux Wed Feb 21 07:23:13 2007 @@ -5,7 +5,7 @@ # 1. compiling with Sun's cc # 2. statically linking with libgcc # 3. Adjusting LD_LIBRARY_PATH to grab libgcc_s -CC_CMD=gcc -fpic -DNET_SSL -DLinux -DLINUX -D_REENTRANT \ +CC_CMD=gcc -fpic -DNET_SSL -DLinux -DLINUX -D_REENTRANT -DXP_UNIX LD_SHAREDCMD=gcc -shared - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r511326 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_map.c common/jk_util.c
Author: jfclere
Date: Sat Feb 24 11:02:40 2007
New Revision: 511326
URL: http://svn.apache.org/viewvc?view=rev&rev=511326
Log:
Check the worker parameters.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_map.c
tomcat/connectors/trunk/jk/native/common/jk_util.c
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=511326&r1=511325&r2=511326
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sat Feb 24 11:02:40
2007
@@ -1744,9 +1744,9 @@
jk_server_conf_t *conf =
(jk_server_conf_t *) ap_get_module_config(s->module_config,
&jk_module);
-
+
if (jk_map_read_property(conf->worker_properties, line, 1, conf->log) ==
JK_FALSE)
-return ap_pstrcat(cmd->temp_pool, "Invalid JkWorkerProperty ", line);
+return ap_pstrcat(cmd->temp_pool, "Invalid JkWorkerProperty ", line,
NULL);
return NULL;
}
@@ -2543,8 +2543,9 @@
ap_log_error(APLOG_MARK, APLOG_EMERG, s,
"No worker file and no worker options in httpd.conf "
"use JkWorkerFile to set workers");
-return;
}
+ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, 0, NULL, "Error
in reading worker properties");
+return !OK;
}
#if MODULE_MAGIC_NUMBER >= 19980527
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=511326&r1=511325&r2=511326
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sat Feb 24 11:02:40
2007
@@ -250,7 +250,7 @@
static int JK_METHOD ws_read(jk_ws_service_t *s,
void *b, unsigned len, unsigned *actually_read);
-static void init_jk(apr_pool_t * pconf, jk_server_conf_t * conf,
+static int init_jk(apr_pool_t * pconf, jk_server_conf_t * conf,
server_rec * s);
static int JK_METHOD ws_write(jk_ws_service_t *s, const void *b, unsigned l);
@@ -1788,7 +1788,7 @@
}
if (jk_map_read_property(conf->worker_properties, line, 1, conf->log) ==
JK_FALSE)
-return apr_pstrcat(cmd->temp_pool, "Invalid JkWorkerProperty ", line);
+return apr_pstrcat(cmd->temp_pool, "Invalid JkWorkerProperty ", line,
NULL);
return NULL;
}
@@ -2608,7 +2608,7 @@
SetHandler and normal apache directives ( but minimal jk-specific
stuff )
*/
-static void init_jk(apr_pool_t * pconf, jk_server_conf_t * conf,
+static int init_jk(apr_pool_t * pconf, jk_server_conf_t * conf,
server_rec * s)
{
int rc;
@@ -2664,12 +2664,14 @@
0, NULL,
"No worker file and no worker options in httpd.conf"
"use JkWorkerFile to set workers");
-return;
}
+ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, 0, NULL, "Error
in reading worker properties");
+return !OK;
}
if (jk_map_resolve_references(init_map, "worker.", 1, 1, conf->log) ==
JK_FALSE) {
-jk_error_exit(APLOG_MARK, APLOG_EMERG, s, pconf, "Error in resolving
configuration references");
+ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, 0, NULL, "Error
in resolving configuration references");
+return !OK;
}
/* we add the URI->WORKER MAP since workers using AJP14
@@ -2684,6 +2686,7 @@
if (wc_open(init_map, &worker_env, conf->log)) {
ap_add_version_component(pconf, JK_EXPOSED_VERSION);
}
+return OK;
}
static int jk_post_config(apr_pool_t * pconf,
@@ -2701,7 +2704,7 @@
pconf)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
"mod_jk: could not create jk_log_lock");
-return HTTP_INTERNAL_SERVER_ERROR;
+return !OK;
}
#if JK_NEED_SET_MUTEX_PERMS
@@ -2710,7 +2713,7 @@
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
"mod_jk: Could not set permissions on "
"jk_log_lock; check User and Group directives");
-return HTTP_INTERNAL_SERVER_ERROR;
+return !OK;
}
#endif
@@ -2728,7 +2731,7 @@
svn commit: r511749 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
Author: jfclere Date: Mon Feb 26 00:16:18 2007 New Revision: 511749 URL: http://svn.apache.org/viewvc?view=rev&rev=511749 Log: jk_init has to be a void in Apache httpd-1.3.x Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=511749&r1=511748&r2=511749 == --- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Feb 26 00:16:18 2007 @@ -2544,8 +2544,7 @@ "No worker file and no worker options in httpd.conf " "use JkWorkerFile to set workers"); } -ap_log_error(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, NULL, "Error in reading worker properties"); -return !OK; +jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p, "Error in reading worker properties"); } #if MODULE_MAGIC_NUMBER >= 19980527 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r511751 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Author: jfclere
Date: Mon Feb 26 00:37:49 2007
New Revision: 511751
URL: http://svn.apache.org/viewvc?view=rev&rev=511751
Log:
Return HTTP_INTERNAL_SERVER_ERROR instead !OK (even !OK shoudn't be DECLINED).
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=511751&r1=511750&r2=511751
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Feb 26 00:37:49
2007
@@ -2704,7 +2704,7 @@
pconf)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
"mod_jk: could not create jk_log_lock");
-return !OK;
+return HTTP_INTERNAL_SERVER_ERROR;
}
#if JK_NEED_SET_MUTEX_PERMS
@@ -2713,7 +2713,7 @@
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
"mod_jk: Could not set permissions on "
"jk_log_lock; check User and Group directives");
-return !OK;
+return HTTP_INTERNAL_SERVER_ERROR;
}
#endif
@@ -2731,7 +2731,7 @@
jk_server_conf_t *sconf = (jk_server_conf_t
*)ap_get_module_config(srv->module_config,
&jk_module);
if (open_jklog(srv, pconf))
-return !OK;
+return HTTP_INTERNAL_SERVER_ERROR;
if (sconf) {
if (!uri_worker_map_alloc(&(sconf->uw_map),
sconf->uri_to_context,
sconf->log))
@@ -2780,7 +2780,7 @@
}
}
if (init_jk(pconf, conf, s))
-return !OK;
+return HTTP_INTERNAL_SERVER_ERROR;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r511755 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Author: jfclere Date: Mon Feb 26 00:54:32 2007 New Revision: 511755 URL: http://svn.apache.org/viewvc?view=rev&rev=511755 Log: Add a entry about jk_is_valid_property(). Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=511755&r1=511754&r2=511755 == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Mon Feb 26 00:54:32 2007 @@ -27,6 +27,9 @@ + + Check the worker. parameters and don't start if the parameter is not a valid one. (jfclere) + 41439: Allow session IDs to get stripped off URLs of static content in Apache by adding JkStripSession directive (configurable per vhost). (mturk) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513234 - /tomcat/connectors/trunk/KEYS
Author: jfclere Date: Thu Mar 1 01:25:17 2007 New Revision: 513234 URL: http://svn.apache.org/viewvc?view=rev&rev=513234 Log: Remove my old keys and add the new one. Modified: tomcat/connectors/trunk/KEYS Modified: tomcat/connectors/trunk/KEYS URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/KEYS?view=diff&rev=513234&r1=513233&r2=513234 == --- tomcat/connectors/trunk/KEYS (original) +++ tomcat/connectors/trunk/KEYS Thu Mar 1 01:25:17 2007 @@ -48,36 +48,6 @@ -END PGP PUBLIC KEY BLOCK- Type Bits/KeyIDDate User ID -pub 1024D/86867BA6 2001-11-22 Jean-Frederic Clere (jfclere) <[EMAIL PROTECTED]> - --BEGIN PGP PUBLIC KEY BLOCK- -Version: GnuPG v1.0.5 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -mQGiBDv9Gx8RBADclmKwDLcibNVipQnhYW+bFIpuQjQnRrqRwn3gXM+/luzzJYJ4 -bbWpw13zjX0EkrAJ8qH2A/d0EIU1eZ0zHrLgRvMUfLGFUX7FFFw18JKFLTVGhG4/ -8sSl3ydHSA2Kd1PF6xjBP7iM7sg5dJfEkyMzvK5H4F0ZpTqy3087wsg1wwCgitRy -Zg4x3lWZSkOwBj472qaO9GkD/2q6kyWfAK6XFe3GuB5AAs3poMfN1eqW+duM4TA8 -zUiWK0Wxx4JXJbL7n0i4d+JdXJsrjSjF++KKfelcxsrSxoUIBegez25MUSvHe09D -R3nqkY8CVO+viEtzRBqkSgCMbUjAtfkQ+vp2jDnWSmmkNfY0OYAzt+KRyJKcjUSJ -gvOOA/45+DN9wuTELoFTvsXh1JgOL/QvW1fmQ2HrcQk94BkzIsfVGWClCiig5gNw -LCxTbfgA5htpI8U7vPR9/5gH7U8Wy3HR6xQUZxcbttMeYit2VbDEJzF5r5S0pJvD -vyk3n1kiKU7r49sjhxGgE8J/VvDpO6YcIsDs8LoULwuJTg0DTrRDSmVhbi1GcmVk -ZXJpYyBDbGVyZSAoamZjbGVyZSkgPEpGcmVkZXJpYy5DbGVyZUBmdWppdHN1LXNp -ZW1lbnMuY29tPohXBBMRAgAXBQI7/RsfBQsHCgMEAxUDAgMWAgECF4AACgkQ0+/m -toaGe6amGQCeJU5VZ8QCi8+PY0QJHPA63e5uPyoAmgOWIwFm8A/xmW8qjEvVAWtb -TjZxuQENBDv9GyMQBACCbFlSF+udW/Qz2oknDen8Hoql4Q1Q7CUQTbPjoQAcYgZg -LrsR6hc9aCIf3Kt4qZBgQ1Oe9M/AemOFhU04UNp3dgHk91EYRvx80Rua992p/8V7 -QOhwIBVb2XE8as5nL2j8w6Jz7eSs/bivxm9yD0AH/I5H01RAJivRbOTsUgSkDwAD -BQP5ARlW2Nqc0U17asQsmMYvT1UMiOiyBwUD/DIEG2Xy1hlEvdljg8WU26jcjpGq -MrT69T4Z+eZ2oVyiRQTW4qMUBKc0Nbz89hL0qv9K41ExxxH+JgE1csRVvmwAT8Iy -lnhof7TJLRBtvan3+p21Kxl1uQ7MbmLT875u+vc+J098fIiIRgQYEQIABgUCO/0b -IwAKCRDT7+a2hoZ7pn9UAJ9f0TK0QQOtjQBvxAissopYhDKHGACePZg0k9sj69yw -nVWrBS9fvFC9jcA= -=BTiM --END PGP PUBLIC KEY BLOCK- - -Type Bits/KeyIDDate User ID pub 1024D/E86E29AC 2002-02-13 kevin seguin <[EMAIL PROTECTED]> -BEGIN PGP PUBLIC KEY BLOCK- @@ -292,38 +262,6 @@ =FGUc -END PGP PUBLIC KEY BLOCK- -Type Bits/KeyID Date User ID -pub 1024D/36E67A94 2004-02-15 Jean-frederic Clere <[EMAIL PROTECTED]> - --BEGIN PGP PUBLIC KEY BLOCK- -Version: GnuPG v1.2.4 (GNU/Linux) - -mQGiBEAvwq4RBACwe89USUq3kvB62DjSiMf4vqMFwkqXTwpAE4OY9Bnd2/X+IdW7 -sZP+7rEFWQrmuDufwunGgqFuFII0QZNePSQvp9sC7fynkJBXhq9h+8vhbjybrgQg -1Ol5vyoCK9YJQ4rC4w+3dTSO3k8QHX7Pq5bLrFmAIA3mwH/2Umhr7PD6GwCgqXWD -ODUYmJetCqRbyeu/etM6eeUD/0rEPOOBb5xC2Z23K8p8cIXyySMxZMtnCwnzSu55 -V69cwsUAe0lgKFY1m3dd28YRLZgJXndq+XItO3D6/ewlwoNJSJ4RRIy6hCJuLqAS -jHuKtqr1bEAtD22FNQNx+l48TsuLaLq5qK09QPztNkUhie99tZ8uaLaQRYxkGgm7 -UjR5BACM1+0ViwywliydIjTkyis3L468Xi1ps/9VjnouwM/TvcwXVxiGFgN1NFD5 -8xOZsTWYt+RfkanJksUF20IYCkOt3OeHPEZVWLpk2AZgygKBBS9boWEpdqAOM1QD -AUpuswhbABRnUyKDf1TpLkCOSmmItp4YvVMianTwQ9u/nuYpyrQnSmVhbi1mcmVk -ZXJpYyBDbGVyZSA8amZjbGVyZUBzaW5peC5uZXQ+iFsEExECABsFAkAvwq4GCwkI -BwMCAxUCAwMWAgECHgECF4AACgkQ+MMM5jbmepRqxQCfdaqkM9TpTmbigRGkvYVa -vh3/8jQAoKZro8AOMFnoDFtdJxfkhIPwFptbiJwEEwECAAYFAkAxzQYACgkQN+P0 -X+5l4yGmKwP/c0+aSjy62sJRK+Y6W3P3HP1HGePLibTVHLX3I5Dt/lYBVjHVgADF -2C8cz5oIIENZfyCMaerUY/yllC7vw0X6g28XPfLaMil58kBvxZTkKreqF7qm3NvA -HsJU5UJ0EchnRo2YnUVq2oqWbdYpWuMXngYTcDXW9PAAud0Pz0BXRqa5AQ0EQC/C -sxAEAIvO8n3BsjA3WVsM1ztuLXzZp/J1pEozTlz3BgB2Pr1ixf8IbnzlmFl2yvGF -dJdkpZfmdMjC7TxOrG6+5MWESnrDcEZBQjS92nTvcG3auKQSsS4RVojLzZMwfznB -2u+pgLVEs3sXu6YGyz33dib6B7GouxZbn6jcYSltRObFwS1bAAMFA/0c1G8MhNIt -PUzuXxQNmLY2hZuRkImnEIvMkGqcYVu2ozmTMuuqqlsT6tccQOFiVjCYJ73LWTSr -9hch/D3eRoZK/rTO+HdR25SM1CcgoYdvCpuAXenxvzVt9MT4mULYyP/GukAjVACW -3G2gr883fKM9fqILDfLnOzUMKHYorkWJPIhGBBgRAgAGBQJAL8KzAAoJEPjDDOY2 -5nqUAjkAnj5RPx86y2gLNSJamLL8yM2hMWUqAJ4gs+wXl8LSYzHzca71SLZzqNKw -oA== -=Vfcm --END PGP PUBLIC KEY BLOCK- - pub 1024D/08C975E5 1999-04-14 Jim Jagielski <[EMAIL PROTECTED]> uidJim Jagielski <[EMAIL PROTECTED]> uidJim Jagielski <[EMAIL PROTECTED]> @@ -505,4 +443,285 @@ AkWZm04CGwwFCQlmAYAACgkQL/BolOVbDQ4R3ACdHuJ0qhGNF2HmkKxkEvyQ8XYB KGYAoI/VBpQ3XajbV/CPs3YP4qBMddA/ =LiRc +-END PGP PUBLIC KEY BLOCK- + + +pub 1024D/6210BFC0 2007-03-01 + Key fingerprint = 3A6F 081D DFD3 DE93 02C3 1329 0F45 0A26 6210 BFC0 +uid Jean-Frederic Clere <[EMAIL PROTECTED]> + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.6 (FreeBSD) + +mQGiBEAzyJIRBADK4dV4yXWrn/Y8QkbrRVIK8Tzct2UY/OXxYfIv/Tfqxi9h448d +lkDxjFWjnyOc1m1M6pU500o/KIeray6MOQM/zVBPo7iyv+FC7Rk5kczpcbu7EbS6 +nzOJaSVS8ExighNo5IACGcGP+Xs3p8CkHaHhxgKz4c1UX/u+hdabON4wZwCgrw6K +u7BuceEkEtNmT5FQC6SGFG8D/ixq6PVUg5vSFM592vdgFyqO9QRvffDe7dHTCA57
svn commit: r513245 - in /tomcat/connectors/trunk/jk: native/STATUS.txt xdocs/index.xml xdocs/news/20070301.xml
Author: jfclere Date: Thu Mar 1 01:48:50 2007 New Revision: 513245 URL: http://svn.apache.org/viewvc?view=rev&rev=513245 Log: Preparing the release. Added: tomcat/connectors/trunk/jk/xdocs/news/20070301.xml Modified: tomcat/connectors/trunk/jk/native/STATUS.txt tomcat/connectors/trunk/jk/xdocs/index.xml Modified: tomcat/connectors/trunk/jk/native/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/STATUS.txt?view=diff&rev=513245&r1=513244&r2=513245 == --- tomcat/connectors/trunk/jk/native/STATUS.txt (original) +++ tomcat/connectors/trunk/jk/native/STATUS.txt Thu Mar 1 01:48:50 2007 @@ -3,7 +3,7 @@ Release: -1.2.21 : in development +1.2.21 : released March 1, 2007 1.2.20 : released December 10, 2006 1.2.19 : released September 17, 2006 1.2.18 : released July, 2006 Modified: tomcat/connectors/trunk/jk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/index.xml?view=diff&rev=513245&r1=513244&r2=513245 == --- tomcat/connectors/trunk/jk/xdocs/index.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/index.xml Thu Mar 1 01:48:50 2007 @@ -29,6 +29,16 @@ +1 March 2007 - JK-1.2.21 released +The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Connectors 1.2.21 Stable. + +Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.21/tomcat-connectors-1.2.21-src.tar.gz";>JK 1.2.21 release sources + | http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.21/tomcat-connectors-1.2.21-src.tar.gz.asc";>PGP signature + +Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/";>binaries for selected platforms. + + 10 December 2006 - JK-1.2.20 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Connectors 1.2.20 Stable. Added: tomcat/connectors/trunk/jk/xdocs/news/20070301.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20070301.xml?view=auto&rev=513245 == --- tomcat/connectors/trunk/jk/xdocs/news/20070301.xml (added) +++ tomcat/connectors/trunk/jk/xdocs/news/20070301.xml Thu Mar 1 01:48:50 2007 @@ -0,0 +1,36 @@ + + +]> + + + &project; + + +Apache Tomcat Connectors Project +2007 News and Status + + + + + + + +1 March - JK-1.2.21 released +The Apache Tomcat team is proud to announce the immediate availability +of Tomcat Connectors 1.2.21. This is a stable release adding new features +and a few bug fixes to version 1.2.20. + + + Please see the ChangeLog for a full list of changes. + +If you find any bugs while using this release, please fill in the +http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla +Bug Report. When entering bug select Native:JK Component. + + + + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513247 - /tomcat/connectors/trunk/jk/native/common/jk_version.h
Author: jfclere Date: Thu Mar 1 01:51:26 2007 New Revision: 513247 URL: http://svn.apache.org/viewvc?view=rev&rev=513247 Log: Make it release. Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_version.h?view=diff&rev=513247&r1=513246&r2=513247 == --- tomcat/connectors/trunk/jk/native/common/jk_version.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_version.h Thu Mar 1 01:51:26 2007 @@ -33,7 +33,7 @@ #define JK_VERBETA 0 #define JK_BETASTRING "0" /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 0 +#define JK_VERISRELEASE 1 #define JK_VERRC0 #define JK_RCSTRING "0" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513250 - /tomcat/connectors/tags/jk1.2.x/JK_1_2_21/
Author: jfclere Date: Thu Mar 1 01:55:56 2007 New Revision: 513250 URL: http://svn.apache.org/viewvc?view=rev&rev=513250 Log: Tag the release. Added: tomcat/connectors/tags/jk1.2.x/JK_1_2_21/ - copied from r513249, tomcat/connectors/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513281 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh
Author: jfclere
Date: Thu Mar 1 03:21:08 2007
New Revision: 513281
URL: http://svn.apache.org/viewvc?view=rev&rev=513281
Log:
Add missing file.
Modified:
tomcat/connectors/trunk/jk/tools/jkrelease.sh
Modified: tomcat/connectors/trunk/jk/tools/jkrelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/tools/jkrelease.sh?view=diff&rev=513281&r1=513280&r2=513281
==
--- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original)
+++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Thu Mar 1 03:21:08 2007
@@ -175,7 +175,8 @@
fi
# Export text docs
-${TOOL} ../docs/news/printer/20060101.html >NEWS
+${TOOL} ../docs/news/printer/20070301.html >NEWS
+${TOOL} ../docs/news/printer/20060101.html >>NEWS
${TOOL} ../docs/news/printer/20050101.html >>NEWS
${TOOL} ../docs/news/printer/20041100.html >>NEWS
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513747 - /tomcat/connectors/trunk/jk/native/common/jk_version.h
Author: jfclere Date: Fri Mar 2 05:26:46 2007 New Revision: 513747 URL: http://svn.apache.org/viewvc?view=rev&rev=513747 Log: Start 1.2.2-dev Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_version.h?view=diff&rev=513747&r1=513746&r2=513747 == --- tomcat/connectors/trunk/jk/native/common/jk_version.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_version.h Fri Mar 2 05:26:46 2007 @@ -26,14 +26,14 @@ /** START OF AREA TO MODIFY BEFORE RELEASING */ #define JK_VERMAJOR 1 #define JK_VERMINOR 2 -#define JK_VERFIX 21 -#define JK_VERSTRING"1.2.21" +#define JK_VERFIX 22 +#define JK_VERSTRING"1.2.22" /* Beta number */ #define JK_VERBETA 0 #define JK_BETASTRING "0" /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 1 +#define JK_VERISRELEASE 0 #define JK_VERRC0 #define JK_RCSTRING "0" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513749 - /tomcat/connectors/trunk/jk/HOWTO-RELEASE
Author: jfclere Date: Fri Mar 2 05:29:17 2007 New Revision: 513749 URL: http://svn.apache.org/viewvc?view=rev&rev=513749 Log: Add a note about building NEWS. Modified: tomcat/connectors/trunk/jk/HOWTO-RELEASE Modified: tomcat/connectors/trunk/jk/HOWTO-RELEASE URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/HOWTO-RELEASE?view=diff&rev=513749&r1=513748&r2=513749 == --- tomcat/connectors/trunk/jk/HOWTO-RELEASE (original) +++ tomcat/connectors/trunk/jk/HOWTO-RELEASE Fri Mar 2 05:29:17 2007 @@ -19,6 +19,7 @@ xdocs/index.xml xdocs/news/.xml native/STATUS.txt +tools/jkrelease.sh (check that all ../docs/news/printer/*html are in the list). Update the JK_VERISRELEASE define in jk/native/common/jk_version.h, here is a svn diff that shows what I changed: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513773 - in /tomcat/site/trunk: docs/download-connectors.html xdocs/download-connectors.xml
Author: jfclere Date: Fri Mar 2 06:12:23 2007 New Revision: 513773 URL: http://svn.apache.org/viewvc?view=rev&rev=513773 Log: Change mod_jk to 1.2.21 Modified: tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/xdocs/download-connectors.xml Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?view=diff&rev=513773&r1=513772&r2=513773 == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Fri Mar 2 06:12:23 2007 @@ -230,18 +230,18 @@ -JK 1.2.20 Source Release tar.gz +JK 1.2.21 Source Release tar.gz -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.20/tomcat-connectors-1.2.20-src.tar.gz.asc";>pgp] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.21/tomcat-connectors-1.2.21-src.tar.gz.asc";>pgp] -JK 1.2.20 Source Release zip +JK 1.2.21 Source Release zip -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.20/tomcat-connectors-1.2.20-src.zip.asc";>pgp] +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.21/tomcat-connectors-1.2.21-src.zip.asc";>pgp] Modified: tomcat/site/trunk/xdocs/download-connectors.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?view=diff&rev=513773&r1=513772&r2=513773 == --- tomcat/site/trunk/xdocs/download-connectors.xml (original) +++ tomcat/site/trunk/xdocs/download-connectors.xml Fri Mar 2 06:12:23 2007 @@ -29,13 +29,13 @@ JK 1.2 (actively maintained) Source -JK 1.2.20 Source Release tar.gz -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.20/tomcat-connectors-1.2.20-src.tar.gz.asc";>pgp] +JK 1.2.21 Source Release tar.gz +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.21/tomcat-connectors-1.2.21-src.tar.gz.asc";>pgp] -JK 1.2.20 Source Release zip -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.20/tomcat-connectors-1.2.20-src.zip.asc";>pgp] +JK 1.2.21 Source Release zip +[http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.21/tomcat-connectors-1.2.21-src.zip.asc";>pgp] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513780 - in /tomcat/connectors/trunk/jk: native/STATUS.txt native/common/portable.h.sample native/configure.in native/iis/installer/isapi-redirector-win32-msi.ism native/iis/isapi_redirec
Author: jfclere
Date: Fri Mar 2 06:25:46 2007
New Revision: 513780
URL: http://svn.apache.org/viewvc?view=rev&rev=513780
Log:
Change version to 1.2.22
Modified:
tomcat/connectors/trunk/jk/native/STATUS.txt
tomcat/connectors/trunk/jk/native/common/portable.h.sample
tomcat/connectors/trunk/jk/native/configure.in
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/STATUS.txt?view=diff&rev=513780&r1=513779&r2=513780
==
--- tomcat/connectors/trunk/jk/native/STATUS.txt (original)
+++ tomcat/connectors/trunk/jk/native/STATUS.txt Fri Mar 2 06:25:46 2007
@@ -3,6 +3,7 @@
Release:
+1.2.22 : in development
1.2.21 : released March 1, 2007
1.2.20 : released December 10, 2006
1.2.19 : released September 17, 2006
Modified: tomcat/connectors/trunk/jk/native/common/portable.h.sample
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/portable.h.sample?view=diff&rev=513780&r1=513779&r2=513780
==
--- tomcat/connectors/trunk/jk/native/common/portable.h.sample (original)
+++ tomcat/connectors/trunk/jk/native/common/portable.h.sample Fri Mar 2
06:25:46 2007
@@ -93,4 +93,4 @@
#define USE_SO_SNDTIMEO 1
/* Version number of package */
-#define VERSION "1.2.21"
+#define VERSION "1.2.22"
Modified: tomcat/connectors/trunk/jk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?view=diff&rev=513780&r1=513779&r2=513780
==
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Fri Mar 2 06:25:46 2007
@@ -11,7 +11,7 @@
dnl package and version. (synchronization with common/jk_version.h ?)
PACKAGE=mod_jk
-VERSION=1.2.21
+VERSION=1.2.22
AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
Modified:
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism?view=diff&rev=513780&r1=513779&r2=513780
==
---
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
(original)
+++
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
Fri Mar 2 06:25:46 2007
@@ -3409,7 +3409,7 @@
ProductIDnone
ProductLanguage1033
ProductNameTomcat Isapi
Redirector
- ProductVersion1.2.21
+ ProductVersion1.2.22
ProgressType0install
ProgressType1Installing
ProgressType2installed
Modified: tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc?view=diff&rev=513780&r1=513779&r2=513780
==
--- tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc (original)
+++ tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc Fri Mar 2 06:25:46
2007
@@ -1,4 +1,4 @@
-#define JK_COPYRIGHT "Copyright 2000-2006 The Apache Software " \
+#define JK_COPYRIGHT "Copyright 2000-2007 The Apache Software " \
"Foundation or its licensors, as applicable."
#define JK_LICENSE "Licensed under the Apache License, Version 2.0 " \
@@ -14,13 +14,13 @@
"specific language governing permissions and " \
"limitations under the License."
-#define JK_VERSION_STR "1.2.21"
+#define JK_VERSION_STR "1.2.22"
#define JK_DLL_BASENAME "isapi_redirect-" JK_VERSION_STR
1 VERSIONINFO
- FILEVERSION 1,2,21,0
- PRODUCTVERSION 1,2,21,0
+ FILEVERSION 1,2,22,0
+ PRODUCTVERSION 1,2,22,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x01L
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=513780&r1=513779&r2=513780
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Mar 2
06:25:46 2007
@@ -22,6 +22,9 @@
new documentation project
svn commit: r513808 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Author: jfclere Date: Fri Mar 2 07:27:47 2007 New Revision: 513808 URL: http://svn.apache.org/viewvc?view=rev&rev=513808 Log: Add lastest idem from 1.2.21 Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=513808&r1=513807&r2=513808 == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Mar 2 07:27:47 2007 @@ -29,6 +29,17 @@ + +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0774";>CVE-2007-0774 +: Fix a buffer overflow in map_uri_to_worker(). +URL longer that 4095 were crashing mod_jk. +This could have allow different kind of attacks. Reported by ZDI. +Please note this issue only affected versions 1.2.19 and 1.2.20 of the +Apache Tomcat JK Web Server Connector and not previous versions. +Tomcat 5.5.20 and Tomcat 4.1.34 +included a vulnerable version in their source packages. +Other versions of Tomcat were not affected. + Check the worker. parameters and don't start if the parameter is not a valid one. (jfclere) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r514031 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Author: jfclere Date: Fri Mar 2 16:38:29 2007 New Revision: 514031 URL: http://svn.apache.org/viewvc?view=rev&rev=514031 Log: Arrange the explaination. Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=514031&r1=514030&r2=514031 == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Mar 2 16:38:29 2007 @@ -22,18 +22,15 @@ new documentation project for JK was started. - - - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0774";>CVE-2007-0774 -: Fix a buffer overflow in map_uri_to_worker(). -URL longer that 4095 were crashing mod_jk. -This could have allow different kind of attacks. Reported by ZDI. +: A denial of service and critical remote code execution vulnerability. +Caused by buffer overflow in map_uri_to_worker() when URL were longer that 4095 bytes. +Reported by ZDI (www.zerodayintiative.com). Please note this issue only affected versions 1.2.19 and 1.2.20 of the Apache Tomcat JK Web Server Connector and not previous versions. Tomcat 5.5.20 and Tomcat 4.1.34 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r514039 - in /tomcat/site/trunk: docs/download-connectors.html xdocs/download-connectors.xml
Author: jfclere Date: Fri Mar 2 17:07:41 2007 New Revision: 514039 URL: http://svn.apache.org/viewvc?view=rev&rev=514039 Log: Add a note to the new mod_jk vulnerabilities page. Modified: tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/xdocs/download-connectors.xml Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?view=diff&rev=514039&r1=514038&r2=514039 == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Fri Mar 2 17:07:41 2007 @@ -221,7 +221,10 @@ -JK 1.2 (actively maintained) +JK 1.2 (actively maintained) ( +WARNING: Critical vulnerabilities in previous versions +) + Modified: tomcat/site/trunk/xdocs/download-connectors.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?view=diff&rev=514039&r1=514038&r2=514039 == --- tomcat/site/trunk/xdocs/download-connectors.xml (original) +++ tomcat/site/trunk/xdocs/download-connectors.xml Fri Mar 2 17:07:41 2007 @@ -26,7 +26,8 @@ -JK 1.2 (actively maintained) +JK 1.2 (actively maintained) (WARNING: Critical vulnerabilities in previous versions) + Source JK 1.2.21 Source Release tar.gz - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r514042 - /tomcat/connectors/trunk/jk/xdocs/index.xml
Author: jfclere Date: Fri Mar 2 17:20:48 2007 New Revision: 514042 URL: http://svn.apache.org/viewvc?view=rev&rev=514042 Log: Add a long note about the vulnerability. Modified: tomcat/connectors/trunk/jk/xdocs/index.xml Modified: tomcat/connectors/trunk/jk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/index.xml?view=diff&rev=514042&r1=514041&r2=514042 == --- tomcat/connectors/trunk/jk/xdocs/index.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/index.xml Fri Mar 2 17:20:48 2007 @@ -33,6 +33,28 @@ The Apache Tomcat team is proud to announce the immediate availability of Tomcat Connectors 1.2.21 Stable. +This version addresses the security flaw: + +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0774";>CVE-2007-0774 +A Long URL Stack Overflow Vulnerability exists in the URI handler for the mod_jk library. +When parsing a long URL request, the URI worker map routine performs an +unsafe memory copy. This results in a stack overflow condition which can +be leveraged execute arbitrary code. + +Please note this issue only affected versions 1.2.19 and 1.2.20 of the +JK Apache Tomcat Connector and not previous versions. +Tomcat 5.5.20 and Tomcat 4.1.34 +included a vulnerable version in their source packages. +No other source code releases and no binary packages +of Tomcat were affected. + +The Apache Tomcat project recommends that all users who have built mod_jk from source apply the patch or upgrade to the latest level and rebuild. Providers of mod_jk-based modules in pre-compiled form will be able to determine if this vulnerability applies to their builds. That determination has no bearing on any other builds of mod_jk, and mod_jk users are urged to exercise caution and apply patches or upgrade unless they have specific instructions from the provider of their module. + +The Tomcat Project thanks an anonymous researcher working with +TippingPoint (www.tippingpoint.com) and the Zero Day Initiative +(www.zerodayintiative.com) for their responsible reporting of this +vulnerability. + Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.21/tomcat-connectors-1.2.21-src.tar.gz";>JK 1.2.21 release sources | http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.21/tomcat-connectors-1.2.21-src.tar.gz.asc";>PGP signature @@ -193,11 +215,11 @@ -2006 +2006 -2005 +2005 -2004 +2004 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r514117 - in /tomcat/connectors/trunk/jk/xdocs/news: 20041100.xml 20050101.xml 20060101.xml 20070301.xml
Author: jfclere Date: Sat Mar 3 02:18:29 2007 New Revision: 514117 URL: http://svn.apache.org/viewvc?view=rev&rev=514117 Log: Arrange anchor and add a note on the vulnerability. Modified: tomcat/connectors/trunk/jk/xdocs/news/20041100.xml tomcat/connectors/trunk/jk/xdocs/news/20050101.xml tomcat/connectors/trunk/jk/xdocs/news/20060101.xml tomcat/connectors/trunk/jk/xdocs/news/20070301.xml Modified: tomcat/connectors/trunk/jk/xdocs/news/20041100.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20041100.xml?view=diff&rev=514117&r1=514116&r2=514117 == --- tomcat/connectors/trunk/jk/xdocs/news/20041100.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/news/20041100.xml Sat Mar 3 02:18:29 2007 @@ -23,6 +23,7 @@ --> 17 December - JK-1.2.8 released + The Apache Jakarta Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.8. @@ -33,10 +34,10 @@ http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla Bug Report. When entering bug select Native:JK Component. - 17 December - JK-1.2.8-rc-1 released + The Apache Jakarta Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.8-rc-1 (Relase Canditate 1). @@ -51,10 +52,10 @@ http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla Bug Report. When entering bug select Native:JK Component. - 13 December - JK-1.2.7-beta-3 released + The Apache Jakarta Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.7-beta-3. The release contains a fix to few configuration problems detected with JK-1.2.7-beta-2 version. @@ -70,10 +71,10 @@ http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla Bug Report. When entering bug select Native:JK Component. - 7 December - JK-1.2.7-beta-2 released + The Apache Jakarta Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.7-beta-2. The release contains a fix to few compilation problems detected with JK-1.2.7-beta version. This release also introduces a new @@ -90,11 +91,11 @@ http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla Bug Report. When entering bug select Native:JK Component. - 30 November - JK-1.2.7-beta released + The Apache Jakarta Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.7-beta. The release contains a significant number of bug fixes and new features. @@ -115,12 +116,12 @@ http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla Bug Report. When entering bug select Native:JK Component. - 15 November - JK2 is officially unsupported + JK2 has been put in maintainer mode and no further development will take place. The reason for shutting down JK2 development was the lack of developers interest. Other reason was lack of users interest in adopting JK2, caused by configuration @@ -137,7 +138,6 @@ JK will be fully supported for all other web servers. The next JK release is planned for the end of November. Lots of code from JK2 has been ported to JK - Modified: tomcat/connectors/trunk/jk/xdocs/news/20050101.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20050101.xml?view=diff&rev=514117&r1=514116&r2=514117 == --- tomcat/connectors/trunk/jk/xdocs/news/20050101.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/news/20050101.xml Sat Mar 3 02:18:29 2007 @@ -23,6 +23,7 @@ --> 8 November - JK-1.2.15 released + The Apache Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.15. This is Stable release and it contains few bug fixes found in 1.2.14 version. @@ -34,11 +35,11 @@ http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla Bug Report. When entering bug select Native:JK Component. - 13 July - JK-1.2.14 released + The Apache Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.14. This is Stable release and it contains few bug fixes found in 1.2.13 version. @@ -50,10 +51,10 @@ http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla Bug Report. When entering bug select Native:JK Component. - 7 May - JK-1.2.13 released + The Apache Jakarta Tomcat team is proud to announce the immediate availability of Jakarta Tomcat Connectors 1.2.13. This is development release and contains few bug fixes found in 1.2.12 version. @@ -65,10 +66,10 @@ http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla Bug Report. When en
svn commit: r514123 - in /tomcat/site/trunk: docs/download-connectors.html xdocs/download-connectors.xml
Author: jfclere Date: Sat Mar 3 02:45:13 2007 New Revision: 514123 URL: http://svn.apache.org/viewvc?view=rev&rev=514123 Log: Remove mod_jk2 Modified: tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/xdocs/download-connectors.xml Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?view=diff&rev=514123&r1=514122&r2=514123 == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Sat Mar 3 02:45:13 2007 @@ -2,17 +2,17 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> -Apache Tomcat - Tomcat Connectors (mod_jk, mod_jk2) Downloads - +Apache Tomcat - Tomcat Connectors (mod_jk) Downloads + - - + + http://tomcat.apache.org/";> - + @@ -23,28 +23,28 @@ http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> +http://www.apache.org/images/asf-logo.gif"; /> -http://www.google.com/search"; method="get"> - - - +http://www.google.com/search";> + + + - + - + - + Apache Tomcat @@ -167,13 +167,13 @@ - - + + - - -Tomcat Connectors (mod_jk, mod_jk2) Downloads + + +Tomcat Connectors (mod_jk) Downloads @@ -190,8 +190,8 @@ encounter a problem with this mirror, please select another mirror. If all mirrors are failing, there are backup mirrors (at the end of the mirrors list) that should be -available.[if-any logo] - +available.[if-any logo] + [end] @@ -206,13 +206,13 @@ [for backup][backup] (backup)[end] [end] - + The KEYS link links to the code signing keys used to sign the product. The PGP link downloads the OpenPGP compatible signature from our main site. -For more information concerning Tomcat Connectors (mod_jk, mod_jk2), see the http://tomcat.apache.org/connectors-doc/"; class="name">Tomcat Connectors (mod_jk, mod_jk2) site. +For more information concerning Tomcat Connectors (mod_jk), see the http://tomcat.apache.org/connectors-doc/"; class="name">Tomcat Connectors (mod_jk) site. http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS @@ -221,7 +221,7 @@ -JK 1.2 (actively maintained) ( +JK 1.2 ( WARNING: Critical vulnerabilities in previous versions ) @@ -255,53 +255,22 @@ - - -JK 2 (deprecated) - - - - -Source - - - -JK2 2.0.4 Source Release tar.gz - - -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk2/jakarta-tomcat-connectors-jk2-src-current.tar.gz.asc";>pgp] - - - - -JK2 2.0.4 Source Release zip - - -[http://www.apache.org/dist/tomcat/tomcat-connectors/jk2/jakarta-tomcat-connectors-jk2-src-current.zip.asc";>pgp] - - - - - - -JK 2 Binary Releases - - - - + browse download area - + http://archive.apache.org/dist/tomcat/tomcat-connectors/";>archives... - - +The historical mod_jk2 could be found in the http://archive.apache.org/dist/tomcat/tomcat-connectors/";>archives + + + - + @@ -310,14 +279,14 @@ - + - + Copyright © 1999-2006, The Apache Software Foundation Modified: tomcat/site/trunk/xdocs/download-connectors.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?view=diff&rev=514123&r1=514122&r2=514123 == --- tomcat/site/trunk/xdocs/download-connectors.xml (original) +++ tomcat/site/trunk/xdocs/download-connectors.xml Sat Mar 3 02:45:13 2007 @@ -1,5 +1,5 @@ -Tomcat Connectors (mod_jk, mod_jk2) DownloadsWe recommend you use a mirror to download our release +Tomcat Connectors (mod_jk) DownloadsWe recommend you use a mirror to download our release builds, but you must verify the integrity of the downloaded files using signatures downloaded from our main distribution directories. Recent releases (48 hours) may not yet be available from the mirrors. You are currently using [preferred]. If you @@ -20,13 +20,13 @@ The KEYS link links to the code signing keys used to sign the product. The PGP link downloads the OpenPGP compatible signature from our main site. -For more information concerning Tomcat Connectors (mod_jk, mod_jk2), see the http://tomcat.apache.org/connectors-doc/"; class="name&
svn commit: r518606 - /tomcat/connectors/trunk/jk/native/common/jk_shm.c
Author: jfclere
Date: Thu Mar 15 05:29:54 2007
New Revision: 518606
URL: http://svn.apache.org/viewvc?view=rev&rev=518606
Log:
Use umask() to get the right permission when creating the file.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?view=diff&rev=518606&r1=518605&r2=518606
==
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Thu Mar 15 05:29:54 2007
@@ -237,6 +237,7 @@
if (!jk_shmem.lockname) {
int i;
jk_shmem.fd_lock = -1;
+mode_t mask = umask(0);
for (i = 0; i < 8; i++) {
strcpy(flkname, "/tmp/jkshmlock.XX");
if (mktemp(flkname)) {
@@ -245,6 +246,7 @@
break;
}
}
+umask(mask);
if (jk_shmem.fd_lock == -1) {
rc = errno;
JK_TRACE_EXIT(l);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r520309 - /tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
Author: jfclere Date: Tue Mar 20 01:10:39 2007 New Revision: 520309 URL: http://svn.apache.org/viewvc?view=rev&rev=520309 Log: Typo. Modified: tomcat/connectors/trunk/jk/xdocs/reference/apache.xml Modified: tomcat/connectors/trunk/jk/xdocs/reference/apache.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/apache.xml?view=diff&rev=520309&r1=520308&r2=520309 == --- tomcat/connectors/trunk/jk/xdocs/reference/apache.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/reference/apache.xml Tue Mar 20 01:10:39 2007 @@ -193,7 +193,6 @@ The default value is "SSL_CLIENT_CERT_CHAIN_". - Name of the Apache environment variable that contains SSL session. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r530003 - /tomcat/container/tc5.5.x/catalina/src/conf/web.xml
Author: jfclere Date: Wed Apr 18 05:37:50 2007 New Revision: 530003 URL: http://svn.apache.org/viewvc?view=rev&rev=530003 Log: The default is to use the JDT (See http://tomcat.apache.org/tomcat-5.5-doc/jasper-howto.html). Modified: tomcat/container/tc5.5.x/catalina/src/conf/web.xml Modified: tomcat/container/tc5.5.x/catalina/src/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/conf/web.xml?view=diff&rev=530003&r1=530002&r2=530003 == --- tomcat/container/tc5.5.x/catalina/src/conf/web.xml (original) +++ tomcat/container/tc5.5.x/catalina/src/conf/web.xml Wed Apr 18 05:37:50 2007 @@ -134,7 +134,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r530004 - /tomcat/tc6.0.x/trunk/conf/web.xml
Author: jfclere Date: Wed Apr 18 05:44:41 2007 New Revision: 530004 URL: http://svn.apache.org/viewvc?view=rev&rev=530004 Log: default is not javac but the JDT compiler (See doc). Modified: tomcat/tc6.0.x/trunk/conf/web.xml Modified: tomcat/tc6.0.x/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?view=diff&rev=530004&r1=530003&r2=530004 == --- tomcat/tc6.0.x/trunk/conf/web.xml (original) +++ tomcat/tc6.0.x/trunk/conf/web.xml Wed Apr 18 05:44:41 2007 @@ -133,8 +133,8 @@ - - + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r530761 - /tomcat/build/branches/tc5.0.x/build.properties.default
Author: jfclere
Date: Fri Apr 20 05:17:25 2007
New Revision: 530761
URL: http://svn.apache.org/viewvc?view=rev&rev=530761
Log:
Arrange the location to be able to build.
Note that mx4j and jakarta-regexp-1.3 are not solved.
Modified:
tomcat/build/branches/tc5.0.x/build.properties.default
Modified: tomcat/build/branches/tc5.0.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/build/branches/tc5.0.x/build.properties.default?view=diff&rev=530761&r1=530760&r2=530761
==
--- tomcat/build/branches/tc5.0.x/build.properties.default (original)
+++ tomcat/build/branches/tc5.0.x/build.properties.default Fri Apr 20 05:17:25
2007
@@ -43,10 +43,13 @@
base-jakarta.loc=http://archive.apache.org/dist/jakarta
# - XML files base location -
-base-xml.loc=http://archive.apache.org/dist/xml
+base-xml.loc=${base-apache.loc}/xml
+
+# - Struts files base location -
+base-struts.loc=http://archive.apache.org/dist/struts
# - Sourceforge files base location -
-base-sf.loc=http://telia.dl.sourceforge.net/sourceforge
+base-sf.loc=http://switch.dl.sourceforge.net/sourceforge
# --
#REQUIRED LIBRARIES
@@ -204,7 +207,7 @@
struts.home=${base.path}/jakarta-struts-1.2.4
struts.lib=${struts.home}/lib
struts.jar=${struts.lib}/struts.jar
-struts.loc=${base-jakarta.loc}/struts/binaries/jakarta-struts-1.2.4.tar.gz
+struts.loc=${base-struts.loc}/struts/binaries/jakarta-struts-1.2.4.tar.gz
# --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r530826 - in /tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper: runtime/PageContextImpl.java servlet/JspServletWrapper.java
Author: jfclere
Date: Fri Apr 20 07:34:27 2007
New Revision: 530826
URL: http://svn.apache.org/viewvc?view=rev&rev=530826
Log:
typos
Modified:
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Modified:
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java?view=diff&rev=530826&r1=530825&r2=530826
==
---
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
(original)
+++
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Fri Apr 20 07:34:27 2007
@@ -104,7 +104,7 @@
* Constructor.
*/
PageContextImpl(JspFactory factory) {
-log = LogFactory.getLog(getclass());
+log = LogFactory.getLog(getClass());
this.factory = factory;
this.variableResolver = new VariableResolverImpl(this);
Modified:
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java?view=diff&rev=530826&r1=530825&r2=530826
==
---
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Fri Apr 20 07:34:27 2007
@@ -353,7 +353,7 @@
response.sendError(HttpServletResponse.SC_NOT_FOUND,
ex.getMessage());
} catch (IllegalStateException ise) {
-Log log = logFactory.getLog(getClass());
+Log log = LogFactory.getLog(getClass());
log.error(Localizer.getMessage("jsp.error.file.not.found",
ex.getMessage()),
ex);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r531500 - /tomcat/container/branches/tc5.0.x/webapps/docs/appdev/sample/src/mypackage/Hello.java
Author: jfclere
Date: Mon Apr 23 08:28:50 2007
New Revision: 531500
URL: http://svn.apache.org/viewvc?view=rev&rev=531500
Log:
Simplify the test hello webapp. backport from TC 6.0.x.
Modified:
tomcat/container/branches/tc5.0.x/webapps/docs/appdev/sample/src/mypackage/Hello.java
Modified:
tomcat/container/branches/tc5.0.x/webapps/docs/appdev/sample/src/mypackage/Hello.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc5.0.x/webapps/docs/appdev/sample/src/mypackage/Hello.java?view=diff&rev=531500&r1=531499&r2=531500
==
---
tomcat/container/branches/tc5.0.x/webapps/docs/appdev/sample/src/mypackage/Hello.java
(original)
+++
tomcat/container/branches/tc5.0.x/webapps/docs/appdev/sample/src/mypackage/Hello.java
Mon Apr 23 08:28:50 2007
@@ -68,22 +68,9 @@
writer.println("");
writer.println("Sample Application Servlet");
writer.println("This is the output of a servlet that is part of");
- writer.println("the Hello, World application. It displays the");
- writer.println("request headers from the request we are currently");
- writer.println("processing.");
+ writer.println("the Hello, World application.");
writer.println("");
writer.println("");
- writer.println("");
-
- writer.println("");
- Enumeration names = request.getHeaderNames();
- while (names.hasMoreElements()) {
- String name = (String) names.nextElement();
- writer.println("");
- writer.println(" " + name + ":");
- writer.println(" " + request.getHeader(name) + "");
- writer.println("");
- }
writer.println("");
writer.println("");
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r531785 - /tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Author: jfclere
Date: Mon Apr 23 23:42:23 2007
New Revision: 531785
URL: http://svn.apache.org/viewvc?view=rev&rev=531785
Log:
Use the same default ciphers in all TC.
Modified:
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified:
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?view=diff&rev=531785&r1=531784&r2=531785
==
---
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Mon Apr 23 23:42:23 2007
@@ -187,6 +187,8 @@
enabledCiphers = new String[vec.size()];
vec.copyInto(enabledCiphers);
}
+} else {
+enabledCiphers = sslProxy.getDefaultCipherSuites();
}
return enabledCiphers;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r531790 - /tomcat/site/trunk/xdocs/security-5.xml
Author: jfclere Date: Mon Apr 23 23:53:13 2007 New Revision: 531790 URL: http://svn.apache.org/viewvc?view=rev&rev=531790 Log: I have fixed those in HEAD the TC-5.0.x branch. Modified: tomcat/site/trunk/xdocs/security-5.xml Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?view=diff&rev=531790&r1=531789&r2=531790 == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Mon Apr 23 23:53:13 2007 @@ -85,7 +85,7 @@ unfiltered header values. This enabled a XSS attack. These values are now filtered. -Affects: 5.0.0-5.0.HEAD, 5.5.0-5.5.17 +Affects: 5.0.0-5.0.30, 5.5.0-5.5.17 @@ -97,7 +97,7 @@ including the anonymous cipher suite. The default configuration no longer permits the use of insecure cipher suites. -Affects: 5.0.0-5.0.HEAD, 5.5.0-5.5.17 +Affects: 5.0.0-5.0.30, 5.5.0-5.5.17 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r531795 - in /tomcat/connectors/branches/tc5.0.x: coyote/src/java/org/apache/coyote/Request.java util/java/org/apache/tomcat/util/http/MimeHeaders.java
Author: jfclere
Date: Tue Apr 24 00:16:14 2007
New Revision: 531795
URL: http://svn.apache.org/viewvc?view=rev&rev=531795
Log:
As per RFC2616, requests with multiple content-length headers are invalid.
Ported from tc5.5.x
Modified:
tomcat/connectors/branches/tc5.0.x/coyote/src/java/org/apache/coyote/Request.java
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/MimeHeaders.java
Modified:
tomcat/connectors/branches/tc5.0.x/coyote/src/java/org/apache/coyote/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/tc5.0.x/coyote/src/java/org/apache/coyote/Request.java?view=diff&rev=531795&r1=531794&r2=531795
==
---
tomcat/connectors/branches/tc5.0.x/coyote/src/java/org/apache/coyote/Request.java
(original)
+++
tomcat/connectors/branches/tc5.0.x/coyote/src/java/org/apache/coyote/Request.java
Tue Apr 24 00:16:14 2007
@@ -308,7 +308,7 @@
public long getContentLengthLong() {
if( contentLength > -1 ) return contentLength;
-MessageBytes clB = headers.getValue("content-length");
+MessageBytes clB = headers.getUniqueValue("content-length");
contentLength = (clB == null || clB.isNull()) ? -1 : clB.getLong();
return contentLength;
Modified:
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/MimeHeaders.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/MimeHeaders.java?view=diff&rev=531795&r1=531794&r2=531795
==
---
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/MimeHeaders.java
(original)
+++
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/MimeHeaders.java
Tue Apr 24 00:16:14 2007
@@ -286,6 +286,25 @@
return null;
}
+/**
+ * Finds and returns a unique header field with the given name. If no such
+ * field exists, null is returned. If the specified header field is not
+ * unique then an [EMAIL PROTECTED] IllegalArgumentException} is thrown.
+ */
+public MessageBytes getUniqueValue(String name) {
+MessageBytes result = null;
+for (int i = 0; i < count; i++) {
+if (headers[i].getName().equalsIgnoreCase(name)) {
+if (result == null) {
+result = headers[i].getValue();
+} else {
+throw new IllegalArgumentException();
+}
+}
+}
+return result;
+}
+
// bad shortcut - it'll convert to string ( too early probably,
// encoding is guessed very late )
public String getHeader(String name) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r531850 - /tomcat/site/trunk/xdocs/security-5.xml
Author: jfclere Date: Tue Apr 24 02:36:23 2007 New Revision: 531850 URL: http://svn.apache.org/viewvc?view=rev&rev=531850 Log: Ported from tc5.5.x Modified: tomcat/site/trunk/xdocs/security-5.xml Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?view=diff&rev=531850&r1=531849&r2=531850 == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Tue Apr 24 02:36:23 2007 @@ -40,7 +40,7 @@ content-length headers. -Affects: 5.0.0-5.0.HEAD, 5.5.0-5.5.22 +Affects: 5.0.0-5.0.30, 5.5.0-5.5.22 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r531857 - /tomcat/site/trunk/xdocs/security-5.xml
Author: jfclere Date: Tue Apr 24 02:59:19 2007 New Revision: 531857 URL: http://svn.apache.org/viewvc?view=rev&rev=531857 Log: typo. Modified: tomcat/site/trunk/xdocs/security-5.xml Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?view=diff&rev=531857&r1=531856&r2=531857 == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Tue Apr 24 02:59:19 2007 @@ -81,7 +81,7 @@ http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-7195";> CVE-2006-7195 -The implict-objects.jsp in the examples webapp displayed a number of +The implicit-objects.jsp in the examples webapp displayed a number of unfiltered header values. This enabled a XSS attack. These values are now filtered. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r532227 - /tomcat/connectors/trunk/jk/HOWTO-RELEASE
Author: jfclere Date: Wed Apr 25 00:01:18 2007 New Revision: 532227 URL: http://svn.apache.org/viewvc?view=rev&rev=532227 Log: Arrange the location of changelog.xml Modified: tomcat/connectors/trunk/jk/HOWTO-RELEASE Modified: tomcat/connectors/trunk/jk/HOWTO-RELEASE URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/HOWTO-RELEASE?view=diff&rev=532227&r1=532226&r2=532227 == --- tomcat/connectors/trunk/jk/HOWTO-RELEASE (original) +++ tomcat/connectors/trunk/jk/HOWTO-RELEASE Wed Apr 25 00:01:18 2007 @@ -123,7 +123,7 @@ native/common/portable.h.sample: Update VERSION define. native/iis/isapi_redirect.rc: Update JK_VERSION_STR, FILEVERSION, and PRODUCTVERSION native/iis/installer/isapi-redirector-win32-msi.ism: Update ProductVersion. -xdocs/changelog.xml: Start a new section for the new version. +xdocs/miscellaneous/changelog.xml: Start a new section for the new version. Remove old release distributions from www.apache.org - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r410238 - in /tomcat/connectors/trunk/jk/xdocs: project.xml style.xsl
Author: jfclere Date: Tue May 30 03:59:35 2006 New Revision: 410238 URL: http://svn.apache.org/viewvc?rev=410238&view=rev Log: Arrange definitions so that connectors refers Apache Tomcat instead of Jakarta Tomcat. Modified: tomcat/connectors/trunk/jk/xdocs/project.xml tomcat/connectors/trunk/jk/xdocs/style.xsl Modified: tomcat/connectors/trunk/jk/xdocs/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/project.xml?rev=410238&r1=410237&r2=410238&view=diff == --- tomcat/connectors/trunk/jk/xdocs/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/project.xml Tue May 30 03:59:35 2006 @@ -1,11 +1,11 @@ -http://jakarta.apache.org/tomcat/";> +http://tomcat.apache.org/";> -The Apache Jakarta Tomcat Connector +The Apache Tomcat Connector - The Apache Jakarta Tomcat Connector + The Apache Tomcat Connector Modified: tomcat/connectors/trunk/jk/xdocs/style.xsl URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/style.xsl?rev=410238&r1=410237&r2=410238&view=diff == --- tomcat/connectors/trunk/jk/xdocs/style.xsl (original) +++ tomcat/connectors/trunk/jk/xdocs/style.xsl Tue May 30 03:59:35 2006 @@ -14,9 +14,9 @@ - - http://jakarta.apache.org/'"/> - + + http://tomcat.apache.org/'"/> + @@ -87,10 +87,12 @@ - PROJECT LOGO - - + APACHE LOGO + http://www.apache.org/";> +http://www.apache.org/images/asf-logo.gif"; + align="right" alt="Apache Logo" border="0"/> + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r410298 - /tomcat/connectors/trunk/jk/xdocs/faq.xml
Author: jfclere Date: Tue May 30 08:03:00 2006 New Revision: 410298 URL: http://svn.apache.org/viewvc?rev=410298&view=rev Log: Remove the jakarta references. Modified: tomcat/connectors/trunk/jk/xdocs/faq.xml Modified: tomcat/connectors/trunk/jk/xdocs/faq.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/faq.xml?rev=410298&r1=410297&r2=410298&view=diff == --- tomcat/connectors/trunk/jk/xdocs/faq.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/faq.xml Tue May 30 08:03:00 2006 @@ -34,12 +34,12 @@ The primary mechanism for support is through the JK documentation included in the doc directory. -Documentation is also available on the Apache Jakarta web site devoted to the -http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/index.html";> -Jakarta Tomcat Connectors Project +Documentation is also available on the Apache Tomcat web site devoted to the +http://tomcat.apache.org/connectors-doc/";> +Apache Tomcat Connectors Project For additional help, the best resource is the Tomcat Users Discussion list. You should start by searching -http://mail-archives.apache.org/mod_mbox/jakarta-tomcat-user/";> +http://mail-archives.apache.org/mod_mbox/tomcat-users/";> the mail list archive before you post questions to the list. If you are unable to locate the answer to your question in the archive, @@ -55,13 +55,10 @@ -Now that JK moved to the jakarta-tomcat-connectors repository, -the source for JK can be downloaded from a mirror at the -http://jakarta.apache.org/site/sourceindex.cgi";> -Jakarta Source Download page and the binaries for JK can -be downloaded from a mirror at the -http://jakarta.apache.org/site/binindex.cgi";> -Jakarta Binary Download page. +Now that JK moved to the tomcat-connectors repository, +the source and the binaries for JK can be downloaded from a mirror at the +http://tomcat.apache.org/download-connectors.cgi";> +Tomcat Connectors (mod_jk, mod_jk2) Downloads page. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
