Google Summer of Code
Folks, I added Tomcat to the GSoC page on the wiki along with an idea for a task. Comments on the idea or additional ideas welcome. http://wiki.apache.org/general/SummerOfCode2009#tomcat-project Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Google Summer of Code
Mark Thomas wrote: > Folks, > > I added Tomcat to the GSoC page on the wiki along with an idea for a task. > Comments on the idea or additional ideas welcome. > > http://wiki.apache.org/general/SummerOfCode2009#tomcat-project Won't it be problematic to implement access to the correct ServletContext (via FilterConfig), particularly at Engine level? p > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Google Summer of Code
Pid wrote: > Mark Thomas wrote: >> Folks, >> >> I added Tomcat to the GSoC page on the wiki along with an idea for a task. >> Comments on the idea or additional ideas welcome. >> >> http://wiki.apache.org/general/SummerOfCode2009#tomcat-project > > Won't it be problematic to implement access to the correct > ServletContext (via FilterConfig), particularly at Engine level? Configuration at Engine level doesn't automatically mean it would be executed there. Configuration at engine level could just be a short-cut for configuring it on every context. There are already mechanisms for doing something very similar (global web.xml). There is some interesting debate to be had on the implementation details but that is something I think any prospective student should be involved in. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Google Summer of Code
Mark Thomas wrote: > Pid wrote: >> Mark Thomas wrote: >>> Folks, >>> >>> I added Tomcat to the GSoC page on the wiki along with an idea for a task. >>> Comments on the idea or additional ideas welcome. >>> >>> http://wiki.apache.org/general/SummerOfCode2009#tomcat-project >> Won't it be problematic to implement access to the correct >> ServletContext (via FilterConfig), particularly at Engine level? > > Configuration at Engine level doesn't automatically mean it would be executed > there. Configuration at engine level could just be a short-cut for configuring > it on every context. There are already mechanisms for doing something very > similar (global web.xml). True. p > There is some interesting debate to be had on the implementation details but > that is something I think any prospective student should be involved in. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46834] New: A few links missing from the docs
https://issues.apache.org/bugzilla/show_bug.cgi?id=46834 Summary: A few links missing from the docs Product: Tomcat Connectors Version: 1.2.27 Platform: All URL: http://tomcat.apache.org/connectors-doc/index.html OS/Version: Linux Status: NEW Severity: minor Priority: P4 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: pche...@redhat.com Here are a few links missing from the docs on the apache.org site: >From index.html: URL `miscellaneous/tools.html' Name `Tools' Link to: miscellaneous/tools.html >From generic_howto/quick.html: URL `apache.html' Name `Apache HowTo' Link to: generic_howto/apache.html URL `iis.html' Name `IIS HowTo' Link to: generic_howto/iis.html URL `nes.html' Name `Netscape/iPlanet HowTo' Link to: generic_howto/nes.html >From webserver_howto/iis.html: URL `workers.html' Name `Workers HowTo' Link to: webserver_howto/workers.html URL `../reference/worker.html' Name `workers.properties' Link to: reference/worker.html >From generic_howto/printer/quick.html: URL `apache.html' Name `Apache HowTo' Link to: generic_howto/printer/apache.html URL `iis.html' Name `IIS HowTo' Link to: generic_howto/printer/iis.html URL `nes.html' Name `Netscape/iPlanet HowTo' Link to: generic_howto/printer/nes.html -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46835] JkLogLevel emerg not working properly
https://issues.apache.org/bugzilla/show_bug.cgi?id=46835 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Component|All |mod_jk Version|2.2.6 |unspecified Resolution||INVALID AssignedTo|b...@httpd.apache.org |dev@tomcat.apache.org Product|Apache httpd-2 |Tomcat Connectors --- Comment #1 from Rainer Jung 2009-03-11 08:52:46 PST --- You activated a JK request log with JkRequestLogFormat "%w %V %T" Remove that line and those log entries will be gone. A separate JK request log is no longer generally recommended, because you can add all JK specific access log information to the httpd access log directly. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46835] JkLogLevel emerg not working properly
https://issues.apache.org/bugzilla/show_bug.cgi?id=46835 BibekDash changed: What|Removed |Added Status|RESOLVED|VERIFIED --- Comment #2 from BibekDash 2009-03-11 09:31:25 PST --- Thanks, I have verified and it worked now. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r752584 [2/2] - in /tomcat/trunk: LICENSE NOTICE java/javax/servlet/resources/javaee_5.xsd java/javax/servlet/resources/javaee_web_services_1_2.xsd java/javax/servlet/resources/javaee_web_
Added: tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd?rev=752584&view=auto
==
--- tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd
(added)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd Wed
Mar 11 19:12:03 2009
@@ -0,0 +1,761 @@
+
+http://www.w3.org/2001/XMLSchema";
+ targetNamespace="http://java.sun.com/xml/ns/javaee";
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.2">
+
+
+ @(#)javaee_web_services_1_2.xsds 1.18 02/13/06
+
+
+
+
+
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2003-2007 Sun Microsystems, Inc. All rights reserved.
+
+ The contents of this file are subject to the terms of either the
+ GNU General Public License Version 2 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with
+ the License. You can obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL.html or
+ glassfish/bootstrap/legal/LICENSE.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.
+
+ When distributing the software, include this License Header
+ Notice in each file and include the License file at
+ glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
+ particular file as subject to the "Classpath" exception as
+ provided by Sun in the GPL Version 2 section of the License file
+ that accompanied this code. If applicable, add the following
+ below the License Header, with the fields enclosed by brackets []
+ replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ If you wish your version of this file to be governed by only the
+ CDDL or only the GPL Version 2, indicate your decision by adding
+ "[Contributor] elects to include this software in this
+ distribution under the [CDDL or GPL Version 2] license." If you
+ don't indicate a single choice of license, a recipient has the
+ option to distribute your version of this file under either the
+ CDDL, the GPL Version 2 or to extend the choice of license to its
+ licensees as provided above. However, if you add GPL Version 2
+ code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such
+ option by the copyright holder.
+
+
+
+
+
+
+ The Apache Software Foundation elects to include this software under the
+ CDDL license.
+
+
+
+
+
+
+ (C) Copyright International Business Machines Corporation 2002
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The following conventions apply to all Java EE
+ deployment descriptor elements unless indicated otherwise.
+
+ - In elements that specify a pathname to a file within the
+ same JAR file, relative filenames (i.e., those not
+ starting with "/") are considered relative to the root of
+ the JAR file's namespace. Absolute filenames (i.e., those
+ starting with "/") also specify names in the root of the
+ JAR file's namespace. In general, relative names are
+ preferred. The exception is .war files where absolute
+ names are preferred for consistency with the Servlet API.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The webservices element is the root element for the web services
+ deployment descriptor. It specifies the set of web service
+ descriptions that are to be deployed into the Java EE Application Server
+ and the dependencies they have on container resources and services.
+
+ Used in: webservices.xml
+
+
+
+
+
+
+
+
+ The webservice-description-name identifies the collection of
+ port-components associated with a WSDL file and JAX-RPC mapping. The
+ name must be unique within the deployment descriptor.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The handler-chain element defines the handlerchain.
+ Handlerchain can be defined such that the handlers in the
+ handlerchain operate,all ports of a service, on a specific
+ port or on a list of protocol-bindings. The choice of elements
+ service-name-pattern, port-name-pattern and protocol-bindings
+ are used to specify whether the handlers in handler-chain are
+
svn commit: r752589 - in /tomcat/trunk/java/org/apache/catalina/startup: Constants.java DigesterFactory.java
Author: markt
Date: Wed Mar 11 19:28:18 2009
New Revision: 752589
URL: http://svn.apache.org/viewvc?rev=752589&view=rev
Log:
Add missing and new schemas to resolver used by digester.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Constants.java
tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=752589&r1=752588&r2=752589&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Wed Mar 11
19:28:18 2009
@@ -83,11 +83,26 @@
public static final String J2eeSchemaResourcePath_14 =
"/javax/servlet/resources/j2ee_1_4.xsd";
+public static final String JavaeeSchemaPublicId_5 =
+"javaee_5.xsd";
+public static final String JavaeeSchemaResourcePath_5 =
+"/javax/servlet/resources/javaee_5.xsd";
+
public static final String W3cSchemaPublicId_10 =
"xml.xsd";
public static final String W3cSchemaResourcePath_10 =
"/javax/servlet/resources/xml.xsd";
+public static final String W3cSchemaDTDPublicId_10 =
+"XMLSchema.dtd";
+public static final String W3cSchemaDTDResourcePath_10 =
+"/javax/servlet/resources/XMLSchema.dtd";
+
+public static final String W3cDatatypesDTDPublicId_10 =
+"datatypes.dtd";
+public static final String W3cDatatypesDTDResourcePath_10 =
+"/javax/servlet/resources/datatypes.dtd";
+
public static final String JspSchemaPublicId_20 =
"jsp_2_0.xsd";
public static final String JspSchemaResourcePath_20 =
@@ -108,4 +123,14 @@
public static final String J2eeWebServiceClientSchemaResourcePath_11 =
"/javax/servlet/resources/j2ee_web_services_client_1_1.xsd";
+public static final String JavaeeWebServiceSchemaPublicId_12 =
+"javaee_web_services_1_2.xsd";
+public static final String JavaeeWebServiceSchemaResourcePath_12 =
+"/javax/servlet/resources/javaee_web_services_1_2.xsd";
+
+public static final String JavaeeWebServiceClientSchemaPublicId_12 =
+"javaee_web_services_client_1_2.xsd";
+public static final String JavaeeWebServiceClientSchemaResourcePath_12 =
+"/javax/servlet/resources/javaee_web_services_client_1_2.xsd";
+
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java?rev=752589&r1=752588&r2=752589&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java Wed Mar
11 19:28:18 2009
@@ -37,12 +37,6 @@
org.apache.juli.logging.LogFactory.getLog(DigesterFactory.class);
/**
- * The XML entiry resolver used by the Digester.
- */
-private static SchemaResolver schemaResolver;
-
-
-/**
* Create a Digester parser with no Rule
* associated and XML validation turned off.
*/
@@ -78,8 +72,8 @@
configureSchema(digester);
}
-schemaResolver = new SchemaResolver(digester);
-registerLocalSchema();
+SchemaResolver schemaResolver = new SchemaResolver(digester);
+registerLocalSchema(schemaResolver);
digester.setEntityResolver(schemaResolver);
if ( rule != null ) {
@@ -94,52 +88,88 @@
* Utilities used to force the parser to use local schema, when available,
* instead of the schemaLocation XML element.
*/
-protected static void registerLocalSchema(){
+protected static void registerLocalSchema(SchemaResolver schemaResolver){
// J2EE
register(Constants.J2eeSchemaResourcePath_14,
- Constants.J2eeSchemaPublicId_14);
+ Constants.J2eeSchemaPublicId_14,
+ schemaResolver);
+
+register(Constants.JavaeeSchemaResourcePath_5,
+Constants.JavaeeSchemaPublicId_5,
+schemaResolver);
+
// W3C
register(Constants.W3cSchemaResourcePath_10,
- Constants.W3cSchemaPublicId_10);
+ Constants.W3cSchemaPublicId_10,
+ schemaResolver);
+
+register(Constants.W3cSchemaDTDResourcePath_10,
+Constants.W3cSchemaDTDPublicId_10,
+schemaResolver);
+
+register(Constants.W3cDatatypesDTDResourcePath_10,
+Constants.W3cDatatypesDTDPublicId_10,
+schemaResolver);
+
// JSP
register(Constants.JspSchemaResourcePath_20,
- Constants.JspSchemaPublicId_20);
+
Re: svn commit: r752584 [1/2] - in /tomcat/trunk: LICENSE NOTICE java/javax/servlet/resources/javaee_5.xsd java/javax/servlet/resources/javaee_web_services_1_2.xsd java/javax/servlet/resources/javae
On 11/03/2009, ma...@apache.org wrote: > Author: markt > Date: Wed Mar 11 19:12:03 2009 > New Revision: 752584 > > URL: http://svn.apache.org/viewvc?rev=752584&view=rev > Log: > Add missing XML Schemas for Java EE Deployment Descriptors > Unlike the existing schemas, these files are CDDL licensed. > > Added: > tomcat/trunk/java/javax/servlet/resources/javaee_5.xsd > tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd > > tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd What about the svn:eol-style native property? Should that not be set for these files? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r752627 - /tomcat/connectors/trunk/jk/native/NOTICE
Author: rjung Date: Wed Mar 11 21:31:31 2009 New Revision: 752627 URL: http://svn.apache.org/viewvc?rev=752627&view=rev Log: Apply ASF NOTICE file conventions as documented at http://www.apache.org/legal/src-headers.html#notice (add project name and copyright years). Modified: tomcat/connectors/trunk/jk/native/NOTICE Modified: tomcat/connectors/trunk/jk/native/NOTICE URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/NOTICE?rev=752627&r1=752626&r2=752627&view=diff == --- tomcat/connectors/trunk/jk/native/NOTICE (original) +++ tomcat/connectors/trunk/jk/native/NOTICE Wed Mar 11 21:31:31 2009 @@ -1,4 +1,7 @@ -This product includes software developed by +Apache Tomcat Connectors +Copyright 2002-2009 The Apache Software Foundation + +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). This software contains code derived from UNIX V7, Copyright(C) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r752629 - /tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
Author: rjung
Date: Wed Mar 11 21:33:54 2009
New Revision: 752629
URL: http://svn.apache.org/viewvc?rev=752629&view=rev
Log:
Formally fix JavaDoc.
The JavaDocs are more like dummies though.
Modified:
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
Modified:
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java?rev=752629&r1=752628&r2=752629&view=diff
==
---
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
(original)
+++
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
Wed Mar 11 21:33:54 2009
@@ -439,6 +439,7 @@
/**
* @param balancer
+ * @param balancerIndex
* @return
*/
private void setPropertyBalancer(JkBalancer balancer,String balancerIndex)
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r752629 - /tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
On 11/03/2009, rj...@apache.org wrote:
> Author: rjung
> Date: Wed Mar 11 21:33:54 2009
> New Revision: 752629
>
> URL: http://svn.apache.org/viewvc?rev=752629&view=rev
> Log:
> Formally fix JavaDoc.
> The JavaDocs are more like dummies though.
>
> Modified:
>
> tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
>
> Modified:
> tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
> URL:
> http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java?rev=752629&r1=752628&r2=752629&view=diff
>
> ==
> ---
> tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
> (original)
> +++
> tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
> Wed Mar 11 21:33:54 2009
> @@ -439,6 +439,7 @@
>
> /**
> * @param balancer
> + * @param balancerIndex
> * @return
@return is not allowed for void methods ...
> */
> private void setPropertyBalancer(JkBalancer balancer,String
> balancerIndex) {
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r752636 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c
Author: rjung
Date: Wed Mar 11 21:43:04 2009
New Revision: 752636
URL: http://svn.apache.org/viewvc?rev=752636&view=rev
Log:
Replace verbatim constant by a define.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/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?rev=752636&r1=752635&r2=752636&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Wed Mar 11 21:43:04
2009
@@ -86,6 +86,7 @@
#define JK_MAGIC_TYPE ("application/x-jakarta-servlet")
#define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x)
#define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)")
+#define INITIAL_LOG_FORMAT_ARRAY_SZ (15)
/*
* If you are not using SSL, comment out the following line. It will make
@@ -1628,7 +1629,7 @@
static array_header *parse_request_log_string(pool * p, const char *s,
const char **err)
{
-array_header *a = ap_make_array(p, 15, sizeof(request_log_format_item));
+array_header *a = ap_make_array(p, INITIAL_LOG_FORMAT_ARRAY_SZ,
sizeof(request_log_format_item));
char *res;
while (*s) {
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=752636&r1=752635&r2=752636&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 Wed Mar 11 21:43:04
2009
@@ -129,6 +129,7 @@
#define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x)
#define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)")
#define JK_LOG_LOCK_KEY ("jk_log_lock_key")
+#define INITIAL_LOG_FORMAT_ARRAY_SZ (15)
/*
* If you are not using SSL, comment out the following line. It will make
* apache run faster.
@@ -1713,7 +1714,7 @@
const char **err)
{
apr_array_header_t *a =
-apr_array_make(p, 15, sizeof(request_log_format_item));
+apr_array_make(p, INITIAL_LOG_FORMAT_ARRAY_SZ,
sizeof(request_log_format_item));
char *res;
while (*s) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r752641 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c
Author: rjung
Date: Wed Mar 11 21:48:41 2009
New Revision: 752641
URL: http://svn.apache.org/viewvc?rev=752641&view=rev
Log:
Since the JK request log isn't really useful any
more (using log notes in the standard access log
is much better), and the log format is only parsed
during startup/restart (not performance critical),
lets get rid of the default array size "15".
Start with 0, and let it get resized on demand.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/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?rev=752641&r1=752640&r2=752641&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Wed Mar 11 21:48:41
2009
@@ -86,7 +86,6 @@
#define JK_MAGIC_TYPE ("application/x-jakarta-servlet")
#define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x)
#define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)")
-#define INITIAL_LOG_FORMAT_ARRAY_SZ (15)
/*
* If you are not using SSL, comment out the following line. It will make
@@ -1629,7 +1628,7 @@
static array_header *parse_request_log_string(pool * p, const char *s,
const char **err)
{
-array_header *a = ap_make_array(p, INITIAL_LOG_FORMAT_ARRAY_SZ,
sizeof(request_log_format_item));
+array_header *a = ap_make_array(p, 0, sizeof(request_log_format_item));
char *res;
while (*s) {
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=752641&r1=752640&r2=752641&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 Wed Mar 11 21:48:41
2009
@@ -129,7 +129,6 @@
#define NULL_FOR_EMPTY(x) ((x && !strlen(x)) ? NULL : x)
#define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)")
#define JK_LOG_LOCK_KEY ("jk_log_lock_key")
-#define INITIAL_LOG_FORMAT_ARRAY_SZ (15)
/*
* If you are not using SSL, comment out the following line. It will make
* apache run faster.
@@ -1714,7 +1713,7 @@
const char **err)
{
apr_array_header_t *a =
-apr_array_make(p, INITIAL_LOG_FORMAT_ARRAY_SZ,
sizeof(request_log_format_item));
+apr_array_make(p, 0, sizeof(request_log_format_item));
char *res;
while (*s) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r752644 - /tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
Author: rjung
Date: Wed Mar 11 21:52:23 2009
New Revision: 752644
URL: http://svn.apache.org/viewvc?rev=752644&view=rev
Log:
... part 2 of the JavaDoc fix.
Modified:
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
Modified:
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java?rev=752644&r1=752643&r2=752644&view=diff
==
---
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
(original)
+++
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
Wed Mar 11 21:52:23 2009
@@ -440,7 +440,6 @@
/**
* @param balancer
* @param balancerIndex
- * @return
*/
private void setPropertyBalancer(JkBalancer balancer,String balancerIndex)
{
if(balancer.id >= 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Apache Tomcat Connectors snapshot 1.2.28-dev-752124 available for testing.
Hi Sebb,
On 10.03.2009 21:33, sebb wrote:
On 10/03/2009, Rainer Jung wrote:
Hi all,
version 1.2.28 of mod_jk is approaching its release. A code snapshot
(revision 752124) is available at:
http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/source/jk-1.2.28-dev/
The NOTICE file is non-standard, as it does not contain the product
name or the Copyright year(s).
See:
http://www.apache.org/legal/src-headers.html#notice
for details
Fixed in r752627.
===
Incorrect Javadoc:
org.apache.jk.status.JkStatusTask.setPropertyBalancer
Fixed in r752629 +r752644. The whole JavaDocs are a mess though, they
are more or less only stubs. The Java parts of the connectors release
would need a bit of love.
===
Findbugs reports:
org.apache.jk.status.JkStatusParser.digester isn't final but should be
I asked Peter to have a look.
===
Some odd numbers in the code in mod_jk.c:
static array_header *parse_request_log_string(pool * p, const char *s,
const char **err)
{
array_header *a = ap_make_array(p, 15, sizeof(request_log_format_item));
// Why 15?
...
Initial size, the array will automatically grow, if needed. I first
introduced a defined constant for that, and then changed my mind and
switched to using "0" as the initial size. Arrays and tables resize
automatically and this is not a critical code path w.r.t. performance.
r752636 + r752641.
static const char *jk_add_env_var(cmd_parms * cmd,
void *dummy,
char *env_name, char *default_value)
{
...
conf->envvar_items = ap_make_array(cmd->pool, 0,
sizeof(envvar_item));
// Why 0? This is the number of entries to create?
Default + automatic resize. See above.
Thanks for having a look.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r752651 - in /tomcat/trunk: java/org/apache/catalina/Host.java java/org/apache/catalina/core/StandardHost.java java/org/apache/catalina/startup/HostConfig.java webapps/docs/config/host.xml
Author: fhanik
Date: Wed Mar 11 22:05:12 2009
New Revision: 752651
URL: http://svn.apache.org/viewvc?rev=752651&view=rev
Log:
Allow xmlBase to be configurable, just like appBase.
Modified:
tomcat/trunk/java/org/apache/catalina/Host.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/config/host.xml
Modified: tomcat/trunk/java/org/apache/catalina/Host.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Host.java?rev=752651&r1=752650&r2=752651&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Host.java Wed Mar 11 22:05:12 2009
@@ -68,6 +68,22 @@
/**
+ * Return the XML root for this Host. This can be an absolute
+ * pathname, a relative pathname, or a URL.
+ * If null, defaults to ${catalina.base}/conf/ directory
+ */
+public String getXmlBase();
+
+/**
+ * Set the Xml root for this Host. This can be an absolute
+ * pathname, a relative pathname, or a URL.
+ * If null, defaults to ${catalina.base}/conf/ directory
+ *
+ * @param xmlBase The new XML root
+ */
+public void setXmlBase(String xmlBase);
+
+/**
* Return the application root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
*/
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=752651&r1=752650&r2=752651&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Wed Mar 11
22:05:12 2009
@@ -79,6 +79,10 @@
*/
private String appBase = ".";
+/**
+ * The XML root for this Host.
+ */
+private String xmlBase = null;
/**
* The auto deploy flag for this Host.
@@ -170,6 +174,16 @@
}
+/**
+ * Return the XML root for this Host. This can be an absolute
+ * pathname, a relative pathname, or a URL.
+ * If null, defaults to ${catalina.base}/conf/ directory
+ */
+public String getXmlBase() {
+
+return (this.xmlBase);
+
+}
/**
* Set the application root for this Host. This can be an absolute
@@ -184,6 +198,21 @@
support.firePropertyChange("appBase", oldAppBase, this.appBase);
}
+
+/**
+ * Set the Xml root for this Host. This can be an absolute
+ * pathname, a relative pathname, or a URL.
+ * If null, defaults to ${catalina.base}/conf/ directory
+ *
+ * @param xmlBase The new XML root
+ */
+public void setXmlBase(String xmlBase) {
+
+String oldXmlBase = this.xmlBase;
+this.xmlBase = xmlBase;
+support.firePropertyChange("xmlBase", oldXmlBase, this.xmlBase);
+
+}
/**
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=752651&r1=752650&r2=752651&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Mar 11
22:05:12 2009
@@ -304,6 +304,9 @@
setUnpackWARs(((StandardHost) host).isUnpackWARs());
setXmlNamespaceAware(((StandardHost)
host).getXmlNamespaceAware());
setXmlValidation(((StandardHost) host).getXmlValidation());
+if (((StandardHost) host).getXmlBase()!=null) {
+
+}
}
} catch (ClassCastException e) {
log.error(sm.getString("hostConfig.cce", event.getLifecycle()), e);
@@ -394,6 +397,18 @@
return (digester);
}
+protected File returnCanonicalPath(String path) {
+File file = new File(path);
+File base = new File(System.getProperty("catalina.base"));
+if (!file.isAbsolute())
+file = new File(base,path);
+try {
+return file.getCanonicalFile();
+} catch (IOException e) {
+return file;
+}
+}
+
/**
* Return a File object representing the "application root" directory
@@ -404,17 +419,9 @@
if (appBase != null) {
return appBase;
}
-
-File file = new File(host.getAppBase());
-if (!file.isAbsolute())
-file = new File(System.getProperty("catalina.base"),
-host.getAppBase());
-try {
-appBase = file.getCanonicalFile();
-} catc
svn commit: r752655 - in /tomcat/connectors/trunk/jk/xdocs: ajp/project.xml generic_howto/project.xml miscellaneous/project.xml news/project.xml project.xml reference/project.xml webserver_howto/proje
Author: rjung Date: Wed Mar 11 22:21:24 2009 New Revision: 752655 URL: http://svn.apache.org/viewvc?rev=752655&view=rev Log: Fix menue links to Bugzilla. JK is no longer a component of Tomcat in Bugzilla. Modified: tomcat/connectors/trunk/jk/xdocs/ajp/project.xml tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml tomcat/connectors/trunk/jk/xdocs/news/project.xml tomcat/connectors/trunk/jk/xdocs/project.xml tomcat/connectors/trunk/jk/xdocs/reference/project.xml tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml Modified: tomcat/connectors/trunk/jk/xdocs/ajp/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/ajp/project.xml?rev=752655&r1=752654&r2=752655&view=diff == --- tomcat/connectors/trunk/jk/xdocs/ajp/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/ajp/project.xml Wed Mar 11 22:21:24 2009 @@ -59,7 +59,7 @@ -http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+5&component=Native%3AJK&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="/> +http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="/> Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml?rev=752655&r1=752654&r2=752655&view=diff == --- tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml Wed Mar 11 22:21:24 2009 @@ -59,7 +59,7 @@ -http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+5&component=Native%3AJK&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="/> +http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="/> Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml?rev=752655&r1=752654&r2=752655&view=diff == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml Wed Mar 11 22:21:24 2009 @@ -59,7 +59,7 @@ -http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+5&component=Native%3AJK&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=
svn commit: r752664 - in /tomcat/connectors/trunk/jk/xdocs: generic_howto/quick.xml index.xml miscellaneous/changelog.xml webserver_howto/iis.xml
Author: rjung Date: Wed Mar 11 22:38:41 2009 New Revision: 752664 URL: http://svn.apache.org/viewvc?rev=752664&view=rev Log: BZ 46834: fix some broken links in documentation and add some missing ones. Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml tomcat/connectors/trunk/jk/xdocs/index.xml tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml?rev=752664&r1=752663&r2=752664&view=diff == --- tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml Wed Mar 11 22:38:41 2009 @@ -69,7 +69,7 @@ Here is a minimum information about Apache configuration, a - complete documentation is available in Apache HowTo. + more complete separate HowTo for Apache is available. You should first have mod_jk.so (unix) or mod_jk.dll (Windows) installed @@ -143,16 +143,16 @@ - A complete documentation is available in IIS HowTo. + A separate HowTo for the IIS web server is available. More information to be added! - + - A complete documentation is available in Netscape/iPlanet HowTo. + A separate HowTo for the Netscape/iPlanet/Sun web server is available. More information to be added? Modified: tomcat/connectors/trunk/jk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/index.xml?rev=752664&r1=752663&r2=752664&view=diff == --- tomcat/connectors/trunk/jk/xdocs/index.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/index.xml Wed Mar 11 22:38:41 2009 @@ -108,6 +108,13 @@ +Status Worker + +The status worker is a builtin management worker. It displays state information +and can also be used to dynamically reconfigure JK. + + + Apache This page contains detailed description of all directives related to Apache web server. @@ -144,6 +151,11 @@ This page contains an introduction on load balancing with JK. +Reverse Proxy +This page contains an introduction to reverse proxies, how JK +handles this situation and how you can influence the JK proxying behaviour. + + @@ -190,12 +202,12 @@ Changelog -The FAQ detail the changes made in each version of JK. +This page contains the detailed list of all changes made in each version of JK. -http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+5&component=Native%3AJK&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=";> -Current Native:JK bugs -This is the Bugzilla Bug List related to Native:JK. +http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=";> +Current Tomcat Connectors bugs +This is the Bugzilla Bug List related to Tomcat Connectors. Contribute documentation @@ -203,9 +215,14 @@ This page describes, how to contribute to the JK documentation. -Tools +JK Status Ant Tasks + +This page describes ant tasks to automate JK management via the status worker. + + +Reporting Tools -This page contains information, on some tool scripts contained in the Jk distribution. +This page contains information, on some report analysis scripts contained in the JK distribution. http://tomcat.apache.org/connectors-doc-archive/jk2/index.html";> Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=752664&r1=752663&r2=752664&view=diff == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Mar 1
Re: Apache Tomcat Connectors snapshot 1.2.28-dev-752124 available for testing.
On 11/03/2009, Rainer Jung wrote:
> Hi Sebb,
>
> On 10.03.2009 21:33, sebb wrote:
>
> > On 10/03/2009, Rainer Jung wrote:
> >
> > > Hi all,
> > >
> > > version 1.2.28 of mod_jk is approaching its release. A code snapshot
> > > (revision 752124) is available at:
> > >
> > >
> http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/source/jk-1.2.28-dev/
> > >
> > >
> >
> > The NOTICE file is non-standard, as it does not contain the product
> > name or the Copyright year(s).
> >
> > See:
> >
> > http://www.apache.org/legal/src-headers.html#notice
> >
> > for details
> >
>
> Fixed in r752627.
OK.
>
> > ===
> >
> > Incorrect Javadoc:
> >
> org.apache.jk.status.JkStatusTask.setPropertyBalancer
> >
>
> Fixed in r752629 +r752644. The whole JavaDocs are a mess though, they are
> more or less only stubs. The Java parts of the connectors release would need
> a bit of love.
OK, point taken.
>
> > ===
> >
> > Findbugs reports:
> > org.apache.jk.status.JkStatusParser.digester isn't final
> but should be
> >
>
> I asked Peter to have a look.
>
Good.
Shared mutable static fields are generally a bad idea.
Even private fields are better made final if possible.
>
> > ===
> >
> > Some odd numbers in the code in mod_jk.c:
> >
> > static array_header *parse_request_log_string(pool * p, const char *s,
> > const char **err)
> > {
> > array_header *a = ap_make_array(p, 15,
> sizeof(request_log_format_item));
> > // Why 15?
> > ...
> >
>
> Initial size, the array will automatically grow, if needed. I first
Oh, I see.
> introduced a defined constant for that, and then changed my mind and
> switched to using "0" as the initial size. Arrays and tables resize
> automatically and this is not a critical code path w.r.t. performance.
OK.
I'm always wary about numbers in code - anything other than +/-1 or 0
has the potential to be wrong or misunderstood, especially if it is
not documented.
There was recent Tomcat bug to do with timeouts where there was a bare
number 10 or was it 100? The meaning of number was/is not
documented, so it's not trivial to check if it's correct.
Much easier to understand would be something like
#define 100MILLISECS_AS_MICROSECS 10
I'd like to see all numbers (apart from 0/1) expressed as defines, but
that is perhaps asking too much.
Helps document the code, and makes it much easier to change later, as
one can distinguish numbers with the same value but different
functions.
> r752636 + r752641.
>
> > static const char *jk_add_env_var(cmd_parms * cmd,
> > void *dummy,
> > char *env_name, char *default_value)
> > {
> > ...
> > conf->envvar_items = ap_make_array(cmd->pool, 0,
> >sizeof(envvar_item));
> > // Why 0? This is the number of entries to create?
> >
>
> Default + automatic resize. See above.
>
> Thanks for having a look.
>
> Regards,
>
> Rainer
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r752685 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/common/jk_global.h xdocs/miscellaneous/changelog.xml
Author: rjung Date: Wed Mar 11 23:16:22 2009 New Revision: 752685 URL: http://svn.apache.org/viewvc?rev=752685&view=rev Log: Activate forwarding of SSL key size by default in Apache. It was always documented like that, but not implemented. 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/xdocs/miscellaneous/changelog.xml 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?rev=752685&r1=752684&r2=752685&view=diff == --- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Wed Mar 11 23:16:22 2009 @@ -2468,7 +2468,7 @@ c->mountcopy = JK_FALSE; c->mount_file_reload = JK_URIMAP_DEF_RELOAD; c->log_level = JK_LOG_DEF_LEVEL; -c->options = JK_OPT_FWDURIDEFAULT; +c->options = JK_OPT_DEFAULT; c->worker_indicator = JK_ENV_WORKER_NAME; /* 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=752685&r1=752684&r2=752685&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 Wed Mar 11 23:16:22 2009 @@ -2694,7 +2694,7 @@ c->mountcopy = JK_FALSE; c->mount_file_reload = JK_URIMAP_DEF_RELOAD; c->log_level = JK_LOG_DEF_LEVEL; -c->options = JK_OPT_FWDURIDEFAULT; +c->options = JK_OPT_DEFAULT; c->worker_indicator = JK_ENV_WORKER_NAME; /* 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?rev=752685&r1=752684&r2=752685&view=diff == --- tomcat/connectors/trunk/jk/native/common/jk_global.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_global.h Wed Mar 11 23:16:22 2009 @@ -263,6 +263,8 @@ #define JK_OPT_FWDKEYSIZE 0x0200 #define JK_OPT_REJECTUNSAFE 0x0400 +#define JK_OPT_DEFAULT (JK_OPT_FWDURIDEFAULT | JK_OPT_FWDKEYSIZE) + /* Check for EBCDIC systems */ /* Check for Apache 2.0 running on an EBCDIC system */ Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=752685&r1=752684&r2=752685&view=diff == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Mar 11 23:16:22 2009 @@ -44,6 +44,9 @@ +Apache: Activate forwarding of SSL key size by default. (rjung) + + 46834: Docs: Fix a couple of missing or broken links. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r752691 - /tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml
Author: rjung Date: Wed Mar 11 23:28:42 2009 New Revision: 752691 URL: http://svn.apache.org/viewvc?rev=752691&view=rev Log: Add a few tweaks to the new proxy docs page. Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml?rev=752691&r1=752690&r2=752691&view=diff == --- tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml Wed Mar 11 23:28:42 2009 @@ -92,9 +92,13 @@ SSL cipher: getAttribute(javax.servlet.request.cipher_suite) -SSL key size: getAttribute(javax.servlet.request.key_size) +SSL key size: getAttribute(javax.servlet.request.key_size). +Can be disabled using JkOptions -ForwardKeySize. -SSL client certificate: getAttribute(javax.servlet.request.X509Certificate) +SSL client certificate: getAttribute(javax.servlet.request.X509Certificate). +If you want the whole certificate chain, then you need to also set JkOptions ForwardSSLCertChain. +It is likely, that in this case you also need to adjust the maximal AJP packet size +using the worker attribute max_packet_size. SSL session ID: getAttribute(javax.servlet.request.ssl_session). This is for Tomcat, it has not yet been standardized. @@ -169,6 +173,11 @@ All variables, that are not SSL-related have only been introduced in version 1.2.27. +Finally there is a shortcut to forward the local IP of the web server as the remote IP. +This can be useful, e.g. when using the Tomcat remote address valve for allowing connections +only from registered Apache web servers. This feature is activated by setting +JkOptions ForwardLocalAddress. + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46834] A few links missing from the docs
https://issues.apache.org/bugzilla/show_bug.cgi?id=46834 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Rainer Jung 2009-03-11 16:34:11 PST --- (In reply to comment #0) > Here are a few links missing from the docs on the apache.org site: > > From index.html: > URL `miscellaneous/tools.html' > Name `Tools' > Link to: miscellaneous/tools.html Replaced with link to reporttools.html. Added some more missing Links on this page. Also Fixed Menue link to Bugzilla. > From generic_howto/quick.html: > URL `apache.html' > Name `Apache HowTo' > Link to: generic_howto/apache.html > > URL `iis.html' > Name `IIS HowTo' > Link to: generic_howto/iis.html > > URL `nes.html' > Name `Netscape/iPlanet HowTo' > Link to: generic_howto/nes.html Fixed. > From webserver_howto/iis.html: > > URL `workers.html' > Name `Workers HowTo' > Link to: webserver_howto/workers.html I didn't find this one. > URL `../reference/worker.html' > Name `workers.properties' > Link to: reference/worker.html Fixed. > From generic_howto/printer/quick.html: > URL `apache.html' > Name `Apache HowTo' > Link to: generic_howto/printer/apache.html > > URL `iis.html' > Name `IIS HowTo' > Link to: generic_howto/printer/iis.html > > URL `nes.html' > Name `Netscape/iPlanet HowTo' > Link to: generic_howto/printer/nes.html Should be automatically fixed like the non-print versions, because they are generated from the same source. The new docs are visible at http://people.apache.org/~rjung/mod_jk-dev/docs/jk-1.2.28-dev/ and should also soon be updated at http://tomcat.apache.org/dev/dist/tomcat-connectors/jk/docs/jk-1.2.28-dev/ The official web site will be updated when 1.2.28 is released. We expect that to happen soon (about 1 week from now). Thanks for reporting. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r752584 [1/2] - in /tomcat/trunk: LICENSE NOTICE java/javax/servlet/resources/javaee_5.xsd java/javax/servlet/resources/javaee_web_services_1_2.xsd java/javax/servlet/resources/javaee_
On Wed, 2009-03-11 at 19:12 +, ma...@apache.org wrote: > Author: markt > Date: Wed Mar 11 19:12:03 2009 > New Revision: 752584 > > URL: http://svn.apache.org/viewvc?rev=752584&view=rev > Log: > Add missing XML Schemas for Java EE Deployment Descriptors > Unlike the existing schemas, these files are CDDL licensed. I would like to understand why you bother with these CDDL nasty things. G probably may have them somewhere, but I don't see how this provides Tomcat with value. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46808] mod_jk 1.2.27 can't detect network error
https://issues.apache.org/bugzilla/show_bug.cgi?id=46808 Eiji Takahashi changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #17 from Eiji Takahashi 2009-03-11 17:49:43 PST --- Hi. The result of the test was excellent. Thanks a lot! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
