You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/02/19 14:48:18 UTC
[tomcat-connectors] branch master updated (637edee -> 57abcfd)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git.
from 637edee Git tags retained svn format (for now)
new aa62656 Remove svn keywords
new 29812e5 Remove STATUS.txt - it is just a list of versions and release dates
new 57abcfd Remove httpd 1.3 reference
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
HOWTO-RELEASE.txt | 7 --
.../org/apache/jk/status/AbstractJkStatusTask.java | 1 -
.../src/share/org/apache/jk/status/JkBalancer.java | 1 -
.../org/apache/jk/status/JkBalancerMapping.java | 1 -
.../org/apache/jk/status/JkBalancerMember.java | 5 --
.../src/share/org/apache/jk/status/JkResult.java | 1 -
.../src/share/org/apache/jk/status/JkServer.java | 1 -
.../src/share/org/apache/jk/status/JkSoftware.java | 1 -
.../src/share/org/apache/jk/status/JkStatus.java | 1 -
.../org/apache/jk/status/JkStatusAccessor.java | 1 -
.../share/org/apache/jk/status/JkStatusParser.java | 1 -
.../org/apache/jk/status/JkStatusResetTask.java | 1 -
.../share/org/apache/jk/status/JkStatusTask.java | 1 -
.../jk/status/JkStatusUpdateLoadbalancerTask.java | 1 -
.../org/apache/jk/status/JkStatusUpdateTask.java | 1 -
.../apache/jk/status/JkStatusUpdateWorkerTask.java | 2 -
native/README.txt | 2 +-
native/STATUS.txt | 82 ----------------------
native/apache-2.0/mod_jk.c | 1 -
native/common/jk_ajp12_worker.c | 1 -
native/common/jk_ajp12_worker.h | 1 -
native/common/jk_ajp13.c | 1 -
native/common/jk_ajp13.h | 1 -
native/common/jk_ajp13_worker.c | 1 -
native/common/jk_ajp13_worker.h | 1 -
native/common/jk_ajp14.c | 10 ++-
native/common/jk_ajp14.h | 21 +++---
native/common/jk_ajp14_worker.c | 1 -
native/common/jk_ajp14_worker.h | 1 -
native/common/jk_ajp_common.c | 3 +-
native/common/jk_ajp_common.h | 1 -
native/common/jk_connect.c | 11 ++-
native/common/jk_connect.h | 1 -
native/common/jk_context.c | 3 +-
native/common/jk_context.h | 7 +-
native/common/jk_global.h | 1 -
native/common/jk_lb_worker.c | 2 -
native/common/jk_lb_worker.h | 3 +-
native/common/jk_logger.h | 1 -
native/common/jk_map.c | 1 -
native/common/jk_map.h | 1 -
native/common/jk_md5.c | 7 +-
native/common/jk_msg_buff.c | 1 -
native/common/jk_msg_buff.h | 1 -
native/common/jk_mt.h | 3 +-
native/common/jk_pool.c | 1 -
native/common/jk_pool.h | 13 ++--
native/common/jk_service.h | 3 +-
native/common/jk_shm.c | 1 -
native/common/jk_shm.h | 1 -
native/common/jk_sockbuf.c | 5 +-
native/common/jk_sockbuf.h | 1 -
native/common/jk_status.c | 1 -
native/common/jk_status.h | 3 +-
native/common/jk_types.h.in | 1 -
native/common/jk_uri_worker_map.c | 1 -
native/common/jk_uri_worker_map.h | 1 -
native/common/jk_util.c | 1 -
native/common/jk_util.h | 1 -
native/common/jk_version.h | 1 -
native/common/jk_worker.c | 1 -
native/common/jk_worker.h | 1 -
native/common/jk_worker_list.h | 7 +-
native/configure.ac | 1 -
native/iis/isapi_install.vbs | 1 -
native/iis/jk_isapi_plugin.c | 1 -
native/netscape/jk_nsapi_plugin.c | 1 -
xdocs/ajp/ajpv13a.xml | 1 -
xdocs/ajp/ajpv13ext.xml | 1 -
xdocs/common_howto/loadbalancers.xml | 1 -
xdocs/common_howto/proxy.xml | 1 -
xdocs/common_howto/quick.xml | 1 -
xdocs/common_howto/timeouts.xml | 1 -
xdocs/common_howto/workers.xml | 1 -
xdocs/empty.xml | 2 -
xdocs/jk2/confighowto.xml | 1 -
xdocs/jk2/configtc.xml | 1 -
xdocs/jk2/configtccom.xml | 1 -
xdocs/jk2/configtcex.xml | 1 -
xdocs/jk2/configweb.xml | 1 -
xdocs/jk2/configwebcom.xml | 2 -
xdocs/jk2/configwebex.xml | 1 -
xdocs/jk2/installhowto.xml | 2 -
xdocs/miscellaneous/doccontrib.xml | 1 -
xdocs/miscellaneous/faq.xml | 1 -
xdocs/miscellaneous/jkstatustasks.xml | 1 -
xdocs/miscellaneous/reporttools.xml | 1 -
xdocs/webserver_howto/apache.xml | 1 -
xdocs/webserver_howto/iis.xml | 1 -
xdocs/webserver_howto/nes.xml | 1 -
90 files changed, 43 insertions(+), 229 deletions(-)
delete mode 100644 native/STATUS.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-connectors] 03/03: Remove httpd 1.3 reference
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
commit 57abcfdeba327a815b5a866c5a077ba33b9994fe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 19 14:47:27 2020 +0000
Remove httpd 1.3 reference
---
native/README.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/native/README.txt b/native/README.txt
index 5f39bdb..e4f5531 100644
--- a/native/README.txt
+++ b/native/README.txt
@@ -21,7 +21,7 @@ What is tomcat-connector?
tomcat-connectors is a project that provides web server connectors
for the Tomcat servlet engine. The supported web servers are the
-Apache HTTP Server 1.3 and 2.x, Microsoft IIS and the Netscape/IPlanet
+Apache HTTP Server 2.x, Microsoft IIS and the Netscape/IPlanet
web server. The AJP protocol used by the connector is supported in
all Tomcat versions starting with Tomcat 3.2. Some other back end servers
also support the AJP protocol.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-connectors] 02/03: Remove STATUS.txt - it is just a list of
versions and release dates
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
commit 29812e5550f43600dd951f5246636a2fb879d0b1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 19 14:37:53 2020 +0000
Remove STATUS.txt - it is just a list of versions and release dates
---
HOWTO-RELEASE.txt | 7 -----
native/STATUS.txt | 81 -------------------------------------------------------
2 files changed, 88 deletions(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 57fdd2a..c1523de 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -52,15 +52,10 @@ tools/dist/binaries/windows/README.html
Check version numbers in the files that are listed in the section
"Update source for next version" below:
-native/STATUS.txt
native/configure.ac
native/common/jk_version.h
xdocs/miscellaneous/changelog.xml
-In native/STATUS.txt the current version stays labelled as "in development"
-during release. It is updated with release date after release process is
-completed.
-
Update the JK_VERISRELEASE define in native/common/jk_version.h, here is
a git diff that shows what I changed:
@@ -160,8 +155,6 @@ Make sure the group write bit is on for all files you upload.
Update source for next version
------------------------------
-native/STATUS.txt: Add release date for released version and
- status "in development" for new version.
native/configure.ac: Update version in AC_INIT macro.
native/common/jk_version.h: Update variables JK_VERMAJOR, JK_VERMINOR, JK_VERFIX,
JK_VERSTRING, and JK_VERISRELEASE.
diff --git a/native/STATUS.txt b/native/STATUS.txt
deleted file mode 100644
index 821c2ed..0000000
--- a/native/STATUS.txt
+++ /dev/null
@@ -1,81 +0,0 @@
- 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.
-
-TOMCAT CONNECTORS (JK) STATUS: -*-text-*-
-
-Release:
-
- 1.2.47 : development in progress
- 1.2.46 : released October 13, 2018
- 1.2.45 : not released
- 1.2.44 : released September 1, 2018
- 1.2.43 : released March 6, 2018
- 1.2.42 : released October 5, 2016
- 1.2.41 : released August 11, 2015
- 1.2.40 : released April 15, 2014
- 1.2.39 : released March 11, 2014
- 1.2.38 : not released
- 1.2.37 : released May 31, 2012
- 1.2.36 : released May 14, 2012
- 1.2.35 : released March 24, 2012
- 1.2.34 : not released
- 1.2.33 : released March 13, 2012
- 1.2.32 : released July 8, 2011
- 1.2.31 : released November 1, 2010
- 1.2.30 : released March 1, 2010
- 1.2.29 : released February 26, 2010, withdrawn February 27, 2010
- 1.2.28 : released March 22, 2009
- 1.2.27 : released October 28, 2008
- 1.2.26 : released December 21, 2007
- 1.2.25 : released August 7, 2007
- 1.2.24 : released July 27, 2007, withdrawn August 2, 2007
- 1.2.23 : released May 18, 2007
- 1.2.22 : released April 17, 2007
- 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
- 1.2.17 : not released
- 1.2.16 : not released
- 1.2.15 : released November 8, 2005
- 1.2.14 : released July 13, 2005
- 1.2.13 : released May 16, 2005
- 1.2.12 : released May 7, 2005
- 1.2.11 : released April 29, 2005
- 1.2.10 : released March 30, 2005
- 1.2.9 : not released
- 1.2.8 : released December 24, 2004
- 1.2.7 : not released
- 1.2.6 : released July 23, 2004
- 1.2.5 : released September 30, 2003
- 1.2.4 : released May 27, 2003
- 1.2.3 : released May 16, 2003
- 1.2.2 : released December 17, 2002
-
-
-
-RELEASE SHOWSTOPPERS:
-
-
-
-
-RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
-
-
-
-
-STUFF FOR THE FUTURE:
-
- * enter mature phase ... ?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-connectors] 01/03: Remove svn keywords
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
commit aa62656542dc4a2f3056c1b3bd91050c2eae947b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 19 14:35:20 2020 +0000
Remove svn keywords
---
.../org/apache/jk/status/AbstractJkStatusTask.java | 1 -
.../src/share/org/apache/jk/status/JkBalancer.java | 1 -
.../org/apache/jk/status/JkBalancerMapping.java | 1 -
.../org/apache/jk/status/JkBalancerMember.java | 5 -----
.../src/share/org/apache/jk/status/JkResult.java | 1 -
.../src/share/org/apache/jk/status/JkServer.java | 1 -
.../src/share/org/apache/jk/status/JkSoftware.java | 1 -
.../src/share/org/apache/jk/status/JkStatus.java | 1 -
.../org/apache/jk/status/JkStatusAccessor.java | 1 -
.../share/org/apache/jk/status/JkStatusParser.java | 1 -
.../org/apache/jk/status/JkStatusResetTask.java | 1 -
.../share/org/apache/jk/status/JkStatusTask.java | 1 -
.../jk/status/JkStatusUpdateLoadbalancerTask.java | 1 -
.../org/apache/jk/status/JkStatusUpdateTask.java | 1 -
.../apache/jk/status/JkStatusUpdateWorkerTask.java | 2 --
native/STATUS.txt | 1 -
native/apache-2.0/mod_jk.c | 1 -
native/common/jk_ajp12_worker.c | 1 -
native/common/jk_ajp12_worker.h | 1 -
native/common/jk_ajp13.c | 1 -
native/common/jk_ajp13.h | 1 -
native/common/jk_ajp13_worker.c | 1 -
native/common/jk_ajp13_worker.h | 1 -
native/common/jk_ajp14.c | 10 ++++------
native/common/jk_ajp14.h | 21 ++++++++++-----------
native/common/jk_ajp14_worker.c | 1 -
native/common/jk_ajp14_worker.h | 1 -
native/common/jk_ajp_common.c | 3 +--
native/common/jk_ajp_common.h | 1 -
native/common/jk_connect.c | 11 +++++------
native/common/jk_connect.h | 1 -
native/common/jk_context.c | 3 +--
native/common/jk_context.h | 7 +++----
native/common/jk_global.h | 1 -
native/common/jk_lb_worker.c | 2 --
native/common/jk_lb_worker.h | 3 +--
native/common/jk_logger.h | 1 -
native/common/jk_map.c | 1 -
native/common/jk_map.h | 1 -
native/common/jk_md5.c | 7 +++----
native/common/jk_msg_buff.c | 1 -
native/common/jk_msg_buff.h | 1 -
native/common/jk_mt.h | 3 +--
native/common/jk_pool.c | 1 -
native/common/jk_pool.h | 13 ++++++-------
native/common/jk_service.h | 3 +--
native/common/jk_shm.c | 1 -
native/common/jk_shm.h | 1 -
native/common/jk_sockbuf.c | 5 ++---
native/common/jk_sockbuf.h | 1 -
native/common/jk_status.c | 1 -
native/common/jk_status.h | 3 +--
native/common/jk_types.h.in | 1 -
native/common/jk_uri_worker_map.c | 1 -
native/common/jk_uri_worker_map.h | 1 -
native/common/jk_util.c | 1 -
native/common/jk_util.h | 1 -
native/common/jk_version.h | 1 -
native/common/jk_worker.c | 1 -
native/common/jk_worker.h | 1 -
native/common/jk_worker_list.h | 7 +++----
native/configure.ac | 1 -
native/iis/isapi_install.vbs | 1 -
native/iis/jk_isapi_plugin.c | 1 -
native/netscape/jk_nsapi_plugin.c | 1 -
xdocs/ajp/ajpv13a.xml | 1 -
xdocs/ajp/ajpv13ext.xml | 1 -
xdocs/common_howto/loadbalancers.xml | 1 -
xdocs/common_howto/proxy.xml | 1 -
xdocs/common_howto/quick.xml | 1 -
xdocs/common_howto/timeouts.xml | 1 -
xdocs/common_howto/workers.xml | 1 -
xdocs/empty.xml | 2 --
xdocs/jk2/confighowto.xml | 1 -
xdocs/jk2/configtc.xml | 1 -
xdocs/jk2/configtccom.xml | 1 -
xdocs/jk2/configtcex.xml | 1 -
xdocs/jk2/configweb.xml | 1 -
xdocs/jk2/configwebcom.xml | 2 --
xdocs/jk2/configwebex.xml | 1 -
xdocs/jk2/installhowto.xml | 2 --
xdocs/miscellaneous/doccontrib.xml | 1 -
xdocs/miscellaneous/faq.xml | 1 -
xdocs/miscellaneous/jkstatustasks.xml | 1 -
xdocs/miscellaneous/reporttools.xml | 1 -
xdocs/webserver_howto/apache.xml | 1 -
xdocs/webserver_howto/iis.xml | 1 -
xdocs/webserver_howto/nes.xml | 1 -
88 files changed, 42 insertions(+), 140 deletions(-)
diff --git a/jkstatus/src/share/org/apache/jk/status/AbstractJkStatusTask.java b/jkstatus/src/share/org/apache/jk/status/AbstractJkStatusTask.java
index dfd8345..66ce099 100644
--- a/jkstatus/src/share/org/apache/jk/status/AbstractJkStatusTask.java
+++ b/jkstatus/src/share/org/apache/jk/status/AbstractJkStatusTask.java
@@ -36,7 +36,6 @@ import org.apache.tools.ant.Project;
* Ant task that implements mod_jk 1.2.20 result message string
*
* @author Peter Rossbach
- * @version $Revision$
* @since mod_jk 1.2.20
*/
public abstract class AbstractJkStatusTask extends AbstractCatalinaTask {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkBalancer.java b/jkstatus/src/share/org/apache/jk/status/JkBalancer.java
index 0a43f1e..3da4e0d 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkBalancer.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkBalancer.java
@@ -22,7 +22,6 @@ import java.util.List;
/**
* @author Peter Rossbach
- * @version $Revision$ $Date$
* @see org.apache.jk.status.JkStatusParser
*/
public class JkBalancer implements Serializable {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkBalancerMapping.java b/jkstatus/src/share/org/apache/jk/status/JkBalancerMapping.java
index bba59b3..2ae6944 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkBalancerMapping.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkBalancerMapping.java
@@ -20,7 +20,6 @@ import java.io.Serializable;
/**
* @author Peter Rossbach
- * @version $Revision$ $Date$
* @see org.apache.jk.status.JkStatusParser
*/
public class JkBalancerMapping implements Serializable {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java b/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java
index 2eb8fd5..fd6caec 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java
@@ -20,13 +20,8 @@ import java.io.Serializable;
/**
* @author Peter Rossbach
- * @version $Revision$ $Date$
* @see org.apache.jk.status.JkStatusParser
*/
-/**
- * @author peter
- *
- */
public class JkBalancerMember implements Serializable {
int id = -1;
diff --git a/jkstatus/src/share/org/apache/jk/status/JkResult.java b/jkstatus/src/share/org/apache/jk/status/JkResult.java
index cbf3110..6c0b859 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkResult.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkResult.java
@@ -20,7 +20,6 @@ import java.io.Serializable;
/**
* @author Peter Rossbach
- * @version $Revision$ $Date$
* @see org.apache.jk.status.JkStatusParser
*/
public class JkResult implements Serializable {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkServer.java b/jkstatus/src/share/org/apache/jk/status/JkServer.java
index 66c0356..49e7a55 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkServer.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkServer.java
@@ -20,7 +20,6 @@ import java.io.Serializable;
/**
* @author Peter Rossbach
- * @version $Revision$ $Date$
* @see org.apache.jk.status.JkStatusParser
*/
public class JkServer implements Serializable {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkSoftware.java b/jkstatus/src/share/org/apache/jk/status/JkSoftware.java
index 7e793f8..e377345 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkSoftware.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkSoftware.java
@@ -20,7 +20,6 @@ import java.io.Serializable;
/**
* @author Peter Rossbach
- * @version $Revision$ $Date$
* @see org.apache.jk.status.JkStatusParser
*/
public class JkSoftware implements Serializable {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkStatus.java b/jkstatus/src/share/org/apache/jk/status/JkStatus.java
index 08e1591..5151f3a 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkStatus.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkStatus.java
@@ -22,7 +22,6 @@ import java.util.List;
/**
* @author Peter Rossbach
- * @version $Revision$ $Date$
* @see org.apache.jk.status.JkStatusParser
*/
public class JkStatus implements Serializable {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkStatusAccessor.java b/jkstatus/src/share/org/apache/jk/status/JkStatusAccessor.java
index d2eb3db..970f9c6 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkStatusAccessor.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkStatusAccessor.java
@@ -32,7 +32,6 @@ import org.apache.tomcat.util.digester.Digester;
* Create connection to mod_jk jkstatus page.
* Optional you can use Http basic auth user and password.
* @author Peter Rossbach
- * @version $Revision$ $Date$
* @see org.apache.jk.status.JkStatusParser
* @since 5.5.10
*/
diff --git a/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java b/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
index 0d25902..80f3104 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
@@ -133,7 +133,6 @@ import org.apache.tomcat.util.digester.Digester;
* state="OK/IDLE"
* </code>
* @author Peter Rossbach
- * @version $Revision$ $Date$
* @since 5.5.10
*/
public class JkStatusParser {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkStatusResetTask.java b/jkstatus/src/share/org/apache/jk/status/JkStatusResetTask.java
index 6ac0ee4..f5f88df 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkStatusResetTask.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkStatusResetTask.java
@@ -27,7 +27,6 @@ import org.apache.tools.ant.BuildException;
* mod_jk status (1.2.20) application.
*
* @author Peter Rossbach
- * @version $Revision$
* @since mod_jk 1.2.20
*/
public class JkStatusResetTask extends AbstractJkStatusTask {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java b/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
index 21e769f..45fc6d9 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
@@ -30,7 +30,6 @@ import org.apache.tools.ant.Project;
* by the mod_jk status (1.2.13) application.
*
* @author Peter Rossbach
- * @version $Revision$
* @since 5.5.10
*/
public class JkStatusTask extends BaseRedirectorHelperTask {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java b/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java
index 460b77a..11a4e0a 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java
@@ -28,7 +28,6 @@ import org.apache.tools.ant.BuildException;
*
*
* @author Peter Rossbach
- * @version $Revision$
* @since mod_jk 1.2.20
*/
public class JkStatusUpdateLoadbalancerTask extends AbstractJkStatusTask {
diff --git a/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java b/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java
index 99b6d1e..6896f33 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java
@@ -29,7 +29,6 @@ import org.apache.tools.ant.BuildException;
*
*
* @author Peter Rossbach
- * @version $Revision$
* @since 5.5.10
* @deprecated
*/
diff --git a/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateWorkerTask.java b/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateWorkerTask.java
index 4996fe0..982a066 100644
--- a/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateWorkerTask.java
+++ b/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateWorkerTask.java
@@ -26,9 +26,7 @@ import org.apache.tools.ant.BuildException;
* Ant task that implements the <code>/status</code> update worker command, supported by the
* mod_jk status (1.2.20) application.
*
- *
* @author Peter Rossbach
- * @version $Revision$
* @since mod_jk 1.2.20
*/
public class JkStatusUpdateWorkerTask extends AbstractJkStatusTask {
diff --git a/native/STATUS.txt b/native/STATUS.txt
index 1ac3a1c..821c2ed 100644
--- a/native/STATUS.txt
+++ b/native/STATUS.txt
@@ -14,7 +14,6 @@
limitations under the License.
TOMCAT CONNECTORS (JK) STATUS: -*-text-*-
-Last modified at [$Date$]
Release:
diff --git a/native/apache-2.0/mod_jk.c b/native/apache-2.0/mod_jk.c
index 4047b69..745dc6b 100644
--- a/native/apache-2.0/mod_jk.c
+++ b/native/apache-2.0/mod_jk.c
@@ -19,7 +19,6 @@
* Description: Apache 2 plugin for Tomcat *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
/*
diff --git a/native/common/jk_ajp12_worker.c b/native/common/jk_ajp12_worker.c
index 72923b2..d28d485 100644
--- a/native/common/jk_ajp12_worker.c
+++ b/native/common/jk_ajp12_worker.c
@@ -20,7 +20,6 @@
* This worker is deprecated *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Based on: jserv_ajpv12.c from Jserv *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_ajp12_worker.h"
diff --git a/native/common/jk_ajp12_worker.h b/native/common/jk_ajp12_worker.h
index aeeb70e..306f8ce 100644
--- a/native/common/jk_ajp12_worker.h
+++ b/native/common/jk_ajp12_worker.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: ajpv1.2 worker header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_AJP12_WORKER_H
diff --git a/native/common/jk_ajp13.c b/native/common/jk_ajp13.c
index 3e36627..5488f7d 100644
--- a/native/common/jk_ajp13.c
+++ b/native/common/jk_ajp13.c
@@ -19,7 +19,6 @@
* Description: Experimental bi-directionl protocol handler. *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
diff --git a/native/common/jk_ajp13.h b/native/common/jk_ajp13.h
index 8c45a19..d8cc501 100644
--- a/native/common/jk_ajp13.h
+++ b/native/common/jk_ajp13.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Experimental bi-directionl protocol handler. *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_AJP13_H
#define JK_AJP13_H
diff --git a/native/common/jk_ajp13_worker.c b/native/common/jk_ajp13_worker.c
index 5d520cb..e399897 100644
--- a/native/common/jk_ajp13_worker.c
+++ b/native/common/jk_ajp13_worker.c
@@ -20,7 +20,6 @@
* Author: Costin <co...@costin.dnt.ro> *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_ajp13_worker.h"
diff --git a/native/common/jk_ajp13_worker.h b/native/common/jk_ajp13_worker.h
index 606bf3d..ec495bb 100644
--- a/native/common/jk_ajp13_worker.h
+++ b/native/common/jk_ajp13_worker.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: ajpv1.3 worker header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_AJP13_WORKER_H
diff --git a/native/common/jk_ajp14.c b/native/common/jk_ajp14.c
index b62288f..efd0734 100644
--- a/native/common/jk_ajp14.c
+++ b/native/common/jk_ajp14.c
@@ -18,10 +18,8 @@
/***************************************************************************
* Description: Next generation bi-directional protocol handler. *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
-
#include "jk_global.h"
#include "jk_util.h"
#include "jk_map.h"
@@ -212,7 +210,7 @@ int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
/*
- * Decode the Log Nok Command
+ * Decode the Log Nok Command
*
* +---------------------+-----------------------+
* | LOGNOK CMD (1 byte) | FAILURE CODE (32bits) |
@@ -242,7 +240,7 @@ int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_logger_t *l)
}
-/*
+/*
* Build the Shutdown Cmd
*
* +-----------------------+---------------------------------------+
@@ -677,11 +675,11 @@ int ajp14_unmarshal_context_state_reply(jk_msg_buf_t *msg,
/*
* Decode the Context Update Cmd
- *
+ *
* +-----------------------------+---------------------------------+----------------------------+------------------+
* | CONTEXT UPDATE CMD (1 byte) | VIRTUAL HOST NAME (CString (*)) | CONTEXT NAME (CString (*)) | UP/DOWN (1 byte) |
* +-----------------------------+---------------------------------+----------------------------+------------------+
- *
+ *
*/
int ajp14_unmarshal_context_update_cmd(jk_msg_buf_t *msg,
diff --git a/native/common/jk_ajp14.h b/native/common/jk_ajp14.h
index a1c3c35..0ba4672 100644
--- a/native/common/jk_ajp14.h
+++ b/native/common/jk_ajp14.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Next generation bi-directional protocol handler. *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_AJP14_H
#define JK_AJP14_H
@@ -78,7 +77,7 @@ extern "C"
*/
#define AJP14_CONTEXT_INFO_CMD (unsigned char)0x16
-/*
+/*
* Context Update (servlet engine -> web server), status of context changed
*/
#define AJP14_CONTEXT_UPDATE_CMD (unsigned char)0x17
@@ -120,7 +119,7 @@ extern "C"
/*
- * Negotiation flags
+ * Negotiation flags
*/
/*
@@ -134,7 +133,7 @@ extern "C"
#define AJP14_CONTEXT_UPDATE_NEG 0x40000000
/*
- * web-server want compressed stream
+ * web-server want compressed stream
*/
#define AJP14_GZIP_STREAM_NEG 0x20000000
@@ -164,17 +163,17 @@ extern "C"
#define AJP14_SSL_VMISC_NEG 0x01000000
/*
- * mask of protocol supported
+ * mask of protocol supported
*/
#define AJP14_PROTO_SUPPORT_AJPXX_NEG 0x00FF0000
-/*
- * communication could use AJP14
+/*
+ * communication could use AJP14
*/
#define AJP14_PROTO_SUPPORT_AJP14_NEG 0x00010000
/*
- * communication could use AJP15
+ * communication could use AJP15
*/
#define AJP14_PROTO_SUPPORT_AJP15_NEG 0x00020000
@@ -198,7 +197,7 @@ extern "C"
#define AJP14_CONTEXT_UP 0x02
#define AJP14_CONTEXT_OK 0x03
-/*
+/*
* Misc defines
*/
#define AJP14_ENTROPY_SEED_LEN 32 /* we're using MD5 => 32 chars */
@@ -243,13 +242,13 @@ struct jk_login_service
unsigned long negotiation;
/*
- * What we received from servlet engine
+ * What we received from servlet engine
*/
unsigned long negociated;
};
/*
- * functions defined here
+ * functions defined here
*/
void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l);
diff --git a/native/common/jk_ajp14_worker.c b/native/common/jk_ajp14_worker.c
index debda8b..65a48bc 100644
--- a/native/common/jk_ajp14_worker.c
+++ b/native/common/jk_ajp14_worker.c
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: AJP14 next generation Bi-directional protocol. *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_context.h"
diff --git a/native/common/jk_ajp14_worker.h b/native/common/jk_ajp14_worker.h
index 2ef03a6..18cd89b 100644
--- a/native/common/jk_ajp14_worker.h
+++ b/native/common/jk_ajp14_worker.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: ajpv14 worker header file *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_AJP14_WORKER_H
diff --git a/native/common/jk_ajp_common.c b/native/common/jk_ajp_common.c
index ff39cc9..99d4379 100644
--- a/native/common/jk_ajp_common.c
+++ b/native/common/jk_ajp_common.c
@@ -19,7 +19,6 @@
* Description: common stuff for bi-directional protocols ajp13/ajp14. *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
@@ -1073,7 +1072,7 @@ int ajp_connect_to_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
/* Update maximum number of connections
*/
if (connected > ae->worker->s->max_connected)
- ae->worker->s->max_connected = connected;
+ ae->worker->s->max_connected = connected;
/* set last_access only if needed
*/
if (ae->worker->cache_timeout > 0)
diff --git a/native/common/jk_ajp_common.h b/native/common/jk_ajp_common.h
index 35bfde9..52e653b 100644
--- a/native/common/jk_ajp_common.h
+++ b/native/common/jk_ajp_common.h
@@ -19,7 +19,6 @@
* Description: common stuff for bi-directional protocol ajp13/ajp14. *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_AJP_COMMON_H
diff --git a/native/common/jk_connect.c b/native/common/jk_connect.c
index a9e64d3..2129434 100644
--- a/native/common/jk_connect.c
+++ b/native/common/jk_connect.c
@@ -23,7 +23,6 @@
* @package jk_connect
* @author Gal Shachor <sh...@il.ibm.com>
* @author Mladen Turk <mt...@apache.org>
- * @version $Revision$
*/
@@ -490,13 +489,13 @@ int jk_resolve(const char *host, int port, jk_sockaddr_t *saddr,
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
-
+
#if JK_HAVE_IPV6
if (strchr(host, ':')) {
/* If host name contains colon this must be IPV6 address.
* Set prefer_ipv6 flag in this case if it wasn't set already
*/
- prefer_ipv6 = 1;
+ prefer_ipv6 = 1;
}
if (prefer_ipv6)
hints.ai_family = JK_INET6;
@@ -529,7 +528,7 @@ int jk_resolve(const char *host, int port, jk_sockaddr_t *saddr,
while (ai) {
if (ai->ai_family == JK_INET6) {
/* ignore elements without required address info */
- if((ai->ai_addr != NULL) && (ai->ai_addrlen > 0)) {
+ if((ai->ai_addr != NULL) && (ai->ai_addrlen > 0)) {
family = JK_INET6;
break;
}
@@ -543,7 +542,7 @@ int jk_resolve(const char *host, int port, jk_sockaddr_t *saddr,
while (ai) {
if (ai->ai_family == JK_INET) {
/* ignore elements without required address info */
- if((ai->ai_addr != NULL) && (ai->ai_addrlen > 0)) {
+ if((ai->ai_addr != NULL) && (ai->ai_addrlen > 0)) {
family = JK_INET;
break;
}
@@ -1296,7 +1295,7 @@ char *jk_dump_hinfo(jk_sockaddr_t *saddr, char *buf, size_t size)
}
#endif
}
-
+
sprintf(pb, ":%d", saddr->port);
strncat(buf, pb, size - strlen(buf) - 1);
diff --git a/native/common/jk_connect.h b/native/common/jk_connect.h
index 6d8bccd..b75159e 100644
--- a/native/common/jk_connect.h
+++ b/native/common/jk_connect.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Socket connections header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_CONNECT_H
diff --git a/native/common/jk_context.c b/native/common/jk_context.c
index 54242b6..7805bb0 100644
--- a/native/common/jk_context.c
+++ b/native/common/jk_context.c
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Context handling (Autoconf) *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_global.h"
@@ -27,7 +26,7 @@
/*
- * Set the virtual name of the context
+ * Set the virtual name of the context
*/
int context_set_virtual(jk_context_t *c, char *virt)
diff --git a/native/common/jk_context.h b/native/common/jk_context.h
index ee53fa7..42cd5d8 100644
--- a/native/common/jk_context.h
+++ b/native/common/jk_context.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Context Stuff (Autoconf) *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_CONTEXT_H
#define JK_CONTEXT_H
@@ -37,7 +36,7 @@ typedef struct
{
/*
- * Context base (ie examples)
+ * Context base (ie examples)
*/
char *cbase;
@@ -49,7 +48,7 @@ typedef struct
int status;
/*
- * Num of URI handled
+ * Num of URI handled
*/
int size;
@@ -107,7 +106,7 @@ jk_context_t;
/*
- * functions defined here
+ * functions defined here
*/
int context_set_virtual(jk_context_t *c, char *virt);
diff --git a/native/common/jk_global.h b/native/common/jk_global.h
index fe5398d..adcbd95 100644
--- a/native/common/jk_global.h
+++ b/native/common/jk_global.h
@@ -19,7 +19,6 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_GLOBAL_H
diff --git a/native/common/jk_lb_worker.c b/native/common/jk_lb_worker.c
index 9d2f9c3..c2ec16d 100644
--- a/native/common/jk_lb_worker.c
+++ b/native/common/jk_lb_worker.c
@@ -21,8 +21,6 @@
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Mladen Turk <mt...@apache.org> *
* Author: Rainer Jung <rj...@apache.org> *
- * Based on: *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_pool.h"
diff --git a/native/common/jk_lb_worker.h b/native/common/jk_lb_worker.h
index 06672ea..ad9da1f 100644
--- a/native/common/jk_lb_worker.h
+++ b/native/common/jk_lb_worker.h
@@ -19,7 +19,6 @@
* Description: load balance worker header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Rainer Jung <rj...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_LB_WORKER_H
@@ -62,7 +61,7 @@ extern "C"
#define JK_LB_LOCK_TEXT_DEF (JK_LB_LOCK_TEXT_OPTIMISTIC)
/*
* The following definitions for state and activation
- * need to be kept in sync with the two macros
+ * need to be kept in sync with the two macros
* JK_WORKER_USABLE() and JK_WORKER_USABLE_STICKY() in jk_lb_worker.c.
* Since we use ordered comparisons there instead of multiple
* equal/unequal compares, order of the values is critical here.
diff --git a/native/common/jk_logger.h b/native/common/jk_logger.h
index a9e986a..01d7334 100644
--- a/native/common/jk_logger.h
+++ b/native/common/jk_logger.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Logger object definitions *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_LOGGER_H
diff --git a/native/common/jk_map.c b/native/common/jk_map.c
index 2ea3003..3665595 100644
--- a/native/common/jk_map.c
+++ b/native/common/jk_map.c
@@ -19,7 +19,6 @@
* Description: General purpose map object *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Mladen Turk <mt...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#if defined(AS400) && !defined(AS400_UTF8)
#include "apr_xlate.h"
diff --git a/native/common/jk_map.h b/native/common/jk_map.h
index 4201e48..6e56f9e 100644
--- a/native/common/jk_map.h
+++ b/native/common/jk_map.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Map object header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_MAP_H
diff --git a/native/common/jk_md5.c b/native/common/jk_md5.c
index 2147c06..60372a9 100644
--- a/native/common/jk_md5.c
+++ b/native/common/jk_md5.c
@@ -62,7 +62,6 @@
/***************************************************************************
* Description: MD5 encoding wrapper *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
/*
@@ -72,7 +71,7 @@
* When another web-server is used like NES/IIS, we should use corresponding calls.
* NES/IIS specialists will add the necessary code but until that, I reused the code
* from Apache HTTP server.
- *
+ *
* Nota: If you use an EBCDIC system without Apache, you'll have to use MD5 encoding
* corresponding call or have a ebcdic2ascii() functions somewhere.
* For example current AS/400 have MD5 encoding support APIs but olders not....
@@ -262,8 +261,8 @@ static void JK_METHOD jk_MD5Final(unsigned char digest[16], JK_MD5_CTX * context
*/
ascii2ebcdic(bits, bits, 8);
- /* Since everything is converted to ascii within jk_MD5Update(),
- * the initial 0x80 (PADDING[0]) must be stored as 0x20
+ /* Since everything is converted to ascii within jk_MD5Update(),
+ * the initial 0x80 (PADDING[0]) must be stored as 0x20
*/
ascii2ebcdic(PADDING, PADDING, 1);
#endif /*CHARSET_EBCDIC */
diff --git a/native/common/jk_msg_buff.c b/native/common/jk_msg_buff.c
index e10840c..10ab9d3 100644
--- a/native/common/jk_msg_buff.c
+++ b/native/common/jk_msg_buff.c
@@ -20,7 +20,6 @@
* Author: Costin <co...@costin.dnt.ro> *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_pool.h"
diff --git a/native/common/jk_msg_buff.h b/native/common/jk_msg_buff.h
index a55b151..d77d1dd 100644
--- a/native/common/jk_msg_buff.h
+++ b/native/common/jk_msg_buff.h
@@ -19,7 +19,6 @@
* Description: Data marshaling. XDR like *
* Author: Costin <co...@costin.dnt.ro> *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_MSG_BUF_H
diff --git a/native/common/jk_mt.h b/native/common/jk_mt.h
index 8e3bd7c..c621abf 100644
--- a/native/common/jk_mt.h
+++ b/native/common/jk_mt.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Multi thread portability code for JK *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef _JK_MT_H
@@ -31,7 +30,7 @@
#define jk_gettid() ((jk_uint32_t)GetCurrentThreadId())
#endif
-#ifdef JK_PREFORK
+#ifdef JK_PREFORK
#define _MT_CODE 0
#else
#define _MT_CODE 1
diff --git a/native/common/jk_pool.c b/native/common/jk_pool.c
index 82f5ac3..e3da1bd 100644
--- a/native/common/jk_pool.c
+++ b/native/common/jk_pool.c
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Simple memory pool *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_pool.h"
diff --git a/native/common/jk_pool.h b/native/common/jk_pool.h
index f288a7f..06dd650 100644
--- a/native/common/jk_pool.h
+++ b/native/common/jk_pool.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Memory Pool object header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef _JK_POOL_H
#define _JK_POOL_H
@@ -36,14 +35,14 @@ extern "C"
*
* Similar with apr_pools, but completely unsynchronized.
* XXX use same names
- *
+ *
*/
/*
- * The pool atom (basic pool alocation unit) is an 8 byte long.
- * Each allocation (even for 1 byte) will return a round up to the
- * number of atoms.
- *
+ * The pool atom (basic pool alocation unit) is an 8 byte long.
+ * Each allocation (even for 1 byte) will return a round up to the
+ * number of atoms.
+ *
* This is to help in alignment of 32/64 bit machines ...
* G.S
*/
@@ -84,7 +83,7 @@ extern "C"
#define JK_ALIGN_DEFAULT(size) JK_ALIGN(size, 8)
#endif
-/*
+/*
* Pool size in number of pool atoms.
*/
#define TINY_POOL_SIZE 256 /* Tiny 1/4K atom pool. */
diff --git a/native/common/jk_service.h b/native/common/jk_service.h
index b45f06a..14cdea2 100644
--- a/native/common/jk_service.h
+++ b/native/common/jk_service.h
@@ -22,7 +22,6 @@
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Dan Milstein <da...@shore.net> *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_SERVICE_H
@@ -66,7 +65,7 @@ struct jk_worker_env
/* Virtual server handled - "*" is all virtual */
char *virtual;
-
+
/* Optional APR pool used for configuration */
void *pool;
};
diff --git a/native/common/jk_shm.c b/native/common/jk_shm.c
index 938f5a8..58956dc 100644
--- a/native/common/jk_shm.c
+++ b/native/common/jk_shm.c
@@ -19,7 +19,6 @@
* Description: Shared Memory support *
* Author: Mladen Turk <mt...@jboss.com> *
* Author: Rainer Jung <rj...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_global.h"
diff --git a/native/common/jk_shm.h b/native/common/jk_shm.h
index d3efa5b..6ec737e 100644
--- a/native/common/jk_shm.h
+++ b/native/common/jk_shm.h
@@ -19,7 +19,6 @@
* Description: Shared Memory object header file *
* Author: Mladen Turk <mt...@jboss.com> *
* Author: Rainer Jung <rj...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef _JK_SHM_H
#define _JK_SHM_H
diff --git a/native/common/jk_sockbuf.c b/native/common/jk_sockbuf.c
index 7eef313..107eb09 100644
--- a/native/common/jk_sockbuf.c
+++ b/native/common/jk_sockbuf.c
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Simple buffer object to handle buffered socket IO *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_global.h"
@@ -152,7 +151,7 @@ int jk_sb_gets(jk_sockbuf_t *sb, char **ps)
* start and end indices. May move the data currently in the buffer. If
* new data is read into the buffer (or if it is already full), returns 1.
* If EOF is received on the socket, returns 0. In case of error returns
- * -1.
+ * -1.
*/
static int fill_buffer(jk_sockbuf_t *sb)
{
@@ -175,7 +174,7 @@ static int fill_buffer(jk_sockbuf_t *sb)
/*
* In the unlikely case where the buffer is already full, we won't be
- * reading anything and we'd be calling recv with a 0 count.
+ * reading anything and we'd be calling recv with a 0 count.
*/
if ((SOCKBUF_SIZE - sb->end) > 0) {
/*
diff --git a/native/common/jk_sockbuf.h b/native/common/jk_sockbuf.h
index d53a102..283579e 100644
--- a/native/common/jk_sockbuf.h
+++ b/native/common/jk_sockbuf.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Socket buffer header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_global.h"
diff --git a/native/common/jk_status.c b/native/common/jk_status.c
index 989cfb7..dbdc20d 100644
--- a/native/common/jk_status.c
+++ b/native/common/jk_status.c
@@ -19,7 +19,6 @@
* Description: Status worker, display and manages JK workers *
* Author: Mladen Turk <mt...@jboss.com> *
* Author: Rainer Jung <rj...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_pool.h"
diff --git a/native/common/jk_status.h b/native/common/jk_status.h
index 10c2167..bc810b2 100644
--- a/native/common/jk_status.h
+++ b/native/common/jk_status.h
@@ -17,8 +17,7 @@
/***************************************************************************
* Description: Status worker header file *
- * Author: Mladen Turk <mt...@jboss.com> *
- * Version: $Revision$ *
+ * Author: Mladen Turk <mt...@jboss.com> *
***************************************************************************/
#ifndef JK_STATUS_H
diff --git a/native/common/jk_types.h.in b/native/common/jk_types.h.in
index 6e110f7..c7c9973 100644
--- a/native/common/jk_types.h.in
+++ b/native/common/jk_types.h.in
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Platform specific, auto-detected types. *
* Author: Rainer Jung <rj...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_TYPES_H
diff --git a/native/common/jk_uri_worker_map.c b/native/common/jk_uri_worker_map.c
index eab1cf7..c96add2 100644
--- a/native/common/jk_uri_worker_map.c
+++ b/native/common/jk_uri_worker_map.c
@@ -20,7 +20,6 @@
* *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Mladen Turk <mt...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#include "jk_pool.h"
diff --git a/native/common/jk_uri_worker_map.h b/native/common/jk_uri_worker_map.h
index 3a94662..c52e0b9 100644
--- a/native/common/jk_uri_worker_map.h
+++ b/native/common/jk_uri_worker_map.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: URI to worker mapper header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_URI_WORKER_MAP_H
diff --git a/native/common/jk_util.c b/native/common/jk_util.c
index 324c743..7149fc6 100644
--- a/native/common/jk_util.c
+++ b/native/common/jk_util.c
@@ -20,7 +20,6 @@
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@apache.org> *
* Author: Rainer Jung <rj...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
diff --git a/native/common/jk_util.h b/native/common/jk_util.h
index c10144c..db15775 100644
--- a/native/common/jk_util.h
+++ b/native/common/jk_util.h
@@ -20,7 +20,6 @@
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@apache.org> *
* Author: Rainer Jung <rj...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef _JK_UTIL_H
#define _JK_UTIL_H
diff --git a/native/common/jk_version.h b/native/common/jk_version.h
index aa4d7ca..dcff298 100644
--- a/native/common/jk_version.h
+++ b/native/common/jk_version.h
@@ -17,7 +17,6 @@
/***************************************************************************
* Description: JK version header file *
- * Version: $Revision$ *
***************************************************************************/
#ifndef __JK_VERSION_H
diff --git a/native/common/jk_worker.c b/native/common/jk_worker.c
index b30462a..8790168 100644
--- a/native/common/jk_worker.c
+++ b/native/common/jk_worker.c
@@ -19,7 +19,6 @@
* Description: Workers controller *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
#define _PLACE_WORKER_LIST_HERE
diff --git a/native/common/jk_worker.h b/native/common/jk_worker.h
index 2441e46..230f89b 100644
--- a/native/common/jk_worker.h
+++ b/native/common/jk_worker.h
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: Workers controller header file *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#ifndef JK_WORKER_H
diff --git a/native/common/jk_worker_list.h b/native/common/jk_worker_list.h
index 9f0cd8d..5b36cea 100644
--- a/native/common/jk_worker_list.h
+++ b/native/common/jk_worker_list.h
@@ -19,17 +19,16 @@
* Description: Worker list *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Henri Gomez <hg...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
/*
* This file includes a list of all the possible workers in the jk library
- * plus their factories.
+ * plus their factories.
*
* If you want to add a worker just place it in the worker_factories array
* with its unique name and factory.
*
- * If you want to remove a worker, hjust comment out its line in the
+ * If you want to remove a worker, hjust comment out its line in the
* worker_factories array as well as its header file. For example, look
* at what we have done to the ajp23 worker.
*
@@ -68,7 +67,7 @@ static worker_factory_record_t worker_factories[] = {
*/
{JK_AJP14_WORKER_NAME, JK_AJP14_WORKER_TYPE, ajp14_worker_factory},
/*
- * Load balancing worker. Performs round robin with sticky
+ * Load balancing worker. Performs round robin with sticky
* session load balancing.
*/
{JK_LB_WORKER_NAME, JK_LB_WORKER_TYPE, lb_worker_factory},
diff --git a/native/configure.ac b/native/configure.ac
index 23da4af..d869a6b 100644
--- a/native/configure.ac
+++ b/native/configure.ac
@@ -16,7 +16,6 @@ dnl limitations under the License.
dnl
dnl Process this file with autoconf to produce a configure script
dnl
-AC_REVISION($Id$)dnl
dnl Minimum autoconf version
AC_PREREQ(2.59)
diff --git a/native/iis/isapi_install.vbs b/native/iis/isapi_install.vbs
index 4549e89..6a0fb97 100644
--- a/native/iis/isapi_install.vbs
+++ b/native/iis/isapi_install.vbs
@@ -18,7 +18,6 @@
' =========================================================================
' Description: Install script for Tomcat ISAPI redirector
' Author: Peter S. Horne <ho...@yahoo.com.au>
-' Version: $Revision$
' =========================================================================
'
' This script automatically installs the tomcat isapi_redirector for use in
diff --git a/native/iis/jk_isapi_plugin.c b/native/iis/jk_isapi_plugin.c
index 89be5b9..6b6b9fd 100644
--- a/native/iis/jk_isapi_plugin.c
+++ b/native/iis/jk_isapi_plugin.c
@@ -21,7 +21,6 @@
* Author: Larry Isaacs <la...@apache.org> *
* Author: Ignacio J. Ortega <na...@apache.org> *
* Author: Mladen Turk <mt...@apache.org> *
- * Version: $Revision$ *
***************************************************************************/
/*
diff --git a/native/netscape/jk_nsapi_plugin.c b/native/netscape/jk_nsapi_plugin.c
index d1a7538..b830ba5 100644
--- a/native/netscape/jk_nsapi_plugin.c
+++ b/native/netscape/jk_nsapi_plugin.c
@@ -18,7 +18,6 @@
/***************************************************************************
* Description: NSAPI plugin for Netscape servers *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision$ *
***************************************************************************/
#if defined(WIN32)
diff --git a/xdocs/ajp/ajpv13a.xml b/xdocs/ajp/ajpv13a.xml
index 35fdeb5..65d0b68 100644
--- a/xdocs/ajp/ajpv13a.xml
+++ b/xdocs/ajp/ajpv13a.xml
@@ -25,7 +25,6 @@
<title>AJPv13</title>
<author email="danmil@shore.net">danmil@shore.net</author>
<author email="jfrederic.clere@fujitsu-siemens.com">Jean-Frederic Clere</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Intro">
diff --git a/xdocs/ajp/ajpv13ext.xml b/xdocs/ajp/ajpv13ext.xml
index 081719a..8dbb846 100644
--- a/xdocs/ajp/ajpv13ext.xml
+++ b/xdocs/ajp/ajpv13ext.xml
@@ -24,7 +24,6 @@
<properties>
<title>AJPv13 extensions Proposal</title>
<author email="hgomez@apache.org">Henri Gomez</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
diff --git a/xdocs/common_howto/loadbalancers.xml b/xdocs/common_howto/loadbalancers.xml
index f4f3af0..fce52a1 100644
--- a/xdocs/common_howto/loadbalancers.xml
+++ b/xdocs/common_howto/loadbalancers.xml
@@ -24,7 +24,6 @@
<properties>
<title>Load Balancing HowTo</title>
<author email="mturk@apache.org">Mladen Turk</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
diff --git a/xdocs/common_howto/proxy.xml b/xdocs/common_howto/proxy.xml
index 507145c..0e6bacf 100644
--- a/xdocs/common_howto/proxy.xml
+++ b/xdocs/common_howto/proxy.xml
@@ -24,7 +24,6 @@
<properties>
<title>Reverse Proxy HowTo</title>
<author email="rjung@apache.org">Rainer Jung</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
diff --git a/xdocs/common_howto/quick.xml b/xdocs/common_howto/quick.xml
index 8e3562b..15c1fab 100644
--- a/xdocs/common_howto/quick.xml
+++ b/xdocs/common_howto/quick.xml
@@ -24,7 +24,6 @@
<properties>
<title>Quick Start HowTo</title>
<author email="hgomez@apache.org">Henri Gomez</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
diff --git a/xdocs/common_howto/timeouts.xml b/xdocs/common_howto/timeouts.xml
index 10212b5..ec39a64 100644
--- a/xdocs/common_howto/timeouts.xml
+++ b/xdocs/common_howto/timeouts.xml
@@ -24,7 +24,6 @@
<properties>
<title>Timeouts HowTo</title>
<author email="rjung@apache.org">Rainer Jung</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
diff --git a/xdocs/common_howto/workers.xml b/xdocs/common_howto/workers.xml
index a7661f7..fb32792 100644
--- a/xdocs/common_howto/workers.xml
+++ b/xdocs/common_howto/workers.xml
@@ -26,7 +26,6 @@
<author email="hgomez@apache.org">Henri Gomez</author>
<author email="shachor@il.ibm.com">Gal Shachor</author>
<author email="mturk@apache.org">Mladen Turk</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
diff --git a/xdocs/empty.xml b/xdocs/empty.xml
index e241ce0..280d09e 100644
--- a/xdocs/empty.xml
+++ b/xdocs/empty.xml
@@ -24,8 +24,6 @@
<title>Empty template</title>
<author email="developer@apache.org">Developer Name</author>
-
-<date>$Date$</date>
</properties>
<body>
diff --git a/xdocs/jk2/confighowto.xml b/xdocs/jk2/confighowto.xml
index 0d2fc8a..4151b30 100644
--- a/xdocs/jk2/confighowto.xml
+++ b/xdocs/jk2/confighowto.xml
@@ -19,7 +19,6 @@
<properties>
<title>Quick Start JK2 Configuration Guide</title>
<author email="mturk@mappingsoft.com">Mladen Turk</author>
-<date>$Date$</date>
</properties>
<section name="Introduction">
<p>
diff --git a/xdocs/jk2/configtc.xml b/xdocs/jk2/configtc.xml
index 1b4f131..07dde0d 100644
--- a/xdocs/jk2/configtc.xml
+++ b/xdocs/jk2/configtc.xml
@@ -19,7 +19,6 @@
<properties>
<title>Configuration options</title>
<author email="jfrederic.clere@fujitsu-siemens.com">Jean-Frederic Clere</author>
- <date>$Date$</date>
</properties>
<section name="Intro">
<p>
diff --git a/xdocs/jk2/configtccom.xml b/xdocs/jk2/configtccom.xml
index 774116a..3be6b14 100644
--- a/xdocs/jk2/configtccom.xml
+++ b/xdocs/jk2/configtccom.xml
@@ -19,7 +19,6 @@
<properties>
<title>Coyote/JK2 Handlers</title>
<author email="jfrederic.clere@fujitsu-siemens.com">Jean-Frederic Clere</author>
- <date>$Date$</date>
</properties>
<section name="apr">
<p>
diff --git a/xdocs/jk2/configtcex.xml b/xdocs/jk2/configtcex.xml
index 5c035f6..007b2c1 100644
--- a/xdocs/jk2/configtcex.xml
+++ b/xdocs/jk2/configtcex.xml
@@ -19,7 +19,6 @@
<properties>
<title>Examples</title>
<author email="jfrederic.clere@fujitsu-siemens.com">Jean-Frederic Clere</author>
-<date>$Date$</date>
</properties>
<section name="jk2.properties">
diff --git a/xdocs/jk2/configweb.xml b/xdocs/jk2/configweb.xml
index 644a2f4..4c98778 100644
--- a/xdocs/jk2/configweb.xml
+++ b/xdocs/jk2/configweb.xml
@@ -20,7 +20,6 @@
<title>Configuration file</title>
<author email="cmanolache@yahoo.com">Costin Manolache</author>
<author email="jfrederic.clere@fujitsu-siemens.com">Jean-Frederic Clere</author>
-<date>$Date$</date>
</properties>
<section name="Intro">
diff --git a/xdocs/jk2/configwebcom.xml b/xdocs/jk2/configwebcom.xml
index b7fd6b9..c15c871 100644
--- a/xdocs/jk2/configwebcom.xml
+++ b/xdocs/jk2/configwebcom.xml
@@ -23,8 +23,6 @@
<author email="cmanolache@yahoo.com">Costin Manolache</author>
<author email="jfrederic.clere@fujitsu-siemens.com">Jean-Frederic Clere</author>
<author email="yoavs@apache.org">Yoav Shapira</author>
-
- <date>$Date$</date>
</properties>
<section name="Intro">
diff --git a/xdocs/jk2/configwebex.xml b/xdocs/jk2/configwebex.xml
index e3fd198..27b4417 100644
--- a/xdocs/jk2/configwebex.xml
+++ b/xdocs/jk2/configwebex.xml
@@ -20,7 +20,6 @@
<title>Examples</title>
<author email="cmanolache@yahoo.com">Costin Manolache</author>
<author email="jfrederic.clere@fujitsu-siemens.com">Jean-Frederic Clere</author>
-<date>$Date$</date>
</properties>
<section name="Sockets">
<p>
diff --git a/xdocs/jk2/installhowto.xml b/xdocs/jk2/installhowto.xml
index dd3a9ed..dbc0479 100644
--- a/xdocs/jk2/installhowto.xml
+++ b/xdocs/jk2/installhowto.xml
@@ -23,8 +23,6 @@
<author email="jfrederic.clere@fujitsu-siemens.com">Jean-Frederic Clere</author>
<author email="andy@tagish.com">Andy Armstrng</author>
<author email="yoavs@apache.org">Yoav Shapira</author>
-
- <date>$Date$</date>
</properties>
<section name="Installation">
diff --git a/xdocs/miscellaneous/doccontrib.xml b/xdocs/miscellaneous/doccontrib.xml
index 84b6125..a0c9e6b 100644
--- a/xdocs/miscellaneous/doccontrib.xml
+++ b/xdocs/miscellaneous/doccontrib.xml
@@ -24,7 +24,6 @@
<properties>
<title>How to Contribute to the Documentation</title>
<author email="rsowders@usgs.gov">Robert Sowders</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
diff --git a/xdocs/miscellaneous/faq.xml b/xdocs/miscellaneous/faq.xml
index 1fcf637..b46b0bb 100644
--- a/xdocs/miscellaneous/faq.xml
+++ b/xdocs/miscellaneous/faq.xml
@@ -24,7 +24,6 @@
<properties>
<title>Frequently Asked Questions</title>
<author email="hgomez@apache.org">Henri Gomez</author>
-<date>$Date$</date>
</properties>
<body>
<section name="General">
diff --git a/xdocs/miscellaneous/jkstatustasks.xml b/xdocs/miscellaneous/jkstatustasks.xml
index c414e0b..1503dcd 100644
--- a/xdocs/miscellaneous/jkstatustasks.xml
+++ b/xdocs/miscellaneous/jkstatustasks.xml
@@ -26,7 +26,6 @@
<properties>
<title>Status Worker Ant Tasks</title>
<author>Peter Rossbach</author>
-<date>$Date$</date>
</properties>
<body>
diff --git a/xdocs/miscellaneous/reporttools.xml b/xdocs/miscellaneous/reporttools.xml
index 7761476..22470fd 100644
--- a/xdocs/miscellaneous/reporttools.xml
+++ b/xdocs/miscellaneous/reporttools.xml
@@ -24,7 +24,6 @@
<properties>
<title>Reporting Tools</title>
<author>Glenn Nielsen</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Reporting Tools">
diff --git a/xdocs/webserver_howto/apache.xml b/xdocs/webserver_howto/apache.xml
index ef9c2b8..62a4e74 100644
--- a/xdocs/webserver_howto/apache.xml
+++ b/xdocs/webserver_howto/apache.xml
@@ -25,7 +25,6 @@
<title>Apache HTTP Server HowTo</title>
<author email="hgomez@apache.org">Henri Gomez</author>
<author email="shachor@il.ibm.com">Gal Shachor</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
diff --git a/xdocs/webserver_howto/iis.xml b/xdocs/webserver_howto/iis.xml
index 04f1be7..cdc6cd0 100644
--- a/xdocs/webserver_howto/iis.xml
+++ b/xdocs/webserver_howto/iis.xml
@@ -26,7 +26,6 @@
<author email="hgomez@apache.org">Henri Gomez</author>
<author email="shachor@il.ibm.com">Gal Shachor</author>
<author email="yoavs@apache.org">Yoav Shapira</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
diff --git a/xdocs/webserver_howto/nes.xml b/xdocs/webserver_howto/nes.xml
index 3297bc8..d94f75e 100644
--- a/xdocs/webserver_howto/nes.xml
+++ b/xdocs/webserver_howto/nes.xml
@@ -27,7 +27,6 @@
<author email="jim@apache.org">Jim Jagielski</author>
<author email="shachor@il.ibm.com">Gal Shachor</author>
<author email="mturk@apache.org">Mladen Turk</author>
-<date>$Date$</date>
</properties>
<body>
<section name="Introduction">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org