svn commit: r1647280 - /tomcat/jk/trunk/native/common/jk_ajp_common.c

2014-12-22 Thread kkolinko
Author: kkolinko
Date: Mon Dec 22 10:12:23 2014
New Revision: 1647280

URL: http://svn.apache.org/r1647280
Log:
For BZ 56770: fix pair of typos noted when reviewing r1647159

Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1647280&r1=1647279&r2=1647280&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Mon Dec 22 10:12:23 2014
@@ -618,7 +618,7 @@ static int ajp_marshal_into_msgb(jk_msg_
 jk_b_append_string(msg, SC_A_REQ_LOCAL_ADDR)   ||
 jk_b_append_string(msg, s->local_addr)) {
 jk_log(l, JK_LOG_ERROR,
-   "(s) failed appending the local address %s",
+   "(%s) failed appending the local address %s",
ae->worker->name, s->local_addr);
 JK_TRACE_EXIT(l);
 return JK_FALSE;
@@ -1049,7 +1049,7 @@ int ajp_connect_to_endpoint(ajp_endpoint
 if (!IS_VALID_SOCKET(ae->sd)) {
 ae->last_errno = errno;
 jk_log(l, JK_LOG_INFO,
-   "(%s)Failed opening socket to (%s) (errno=%d)",
+   "(%s) Failed opening socket to (%s) (errno=%d)",
ae->worker->name, jk_dump_hinfo(&ae->worker->worker_inet_addr, 
buf),
ae->last_errno);
 JK_TRACE_EXIT(l);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 56733] High memory demand when JkOption +FlushPackets is enabled and Apache 2.2 is used

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56733

Konstantin Kolinko  changed:

   What|Removed |Added

 Resolution|FIXED   |WONTFIX

-- 
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: r1647282 - /tomcat/jk/trunk/native/common/jk_shm.c

2014-12-22 Thread kkolinko
Author: kkolinko
Date: Mon Dec 22 10:28:33 2014
New Revision: 1647282

URL: http://svn.apache.org/r1647282
Log:
Correct a typo noted when reviewing r1647149

Modified:
tomcat/jk/trunk/native/common/jk_shm.c

Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1647282&r1=1647281&r2=1647282&view=diff
==
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Mon Dec 22 10:28:33 2014
@@ -145,7 +145,7 @@ int jk_shm_calculate_size(jk_map_t *init
JK_SHM_SLOT_SIZE , needed_slot_size);
 if (needed_slot_size > JK_SHM_SLOT_SIZE) {
 jk_log(l, JK_LOG_ERROR,
-   "JK_SHM_SLOT_SIZE %d is to small, need at least %d",
+   "JK_SHM_SLOT_SIZE %d is too small, need at least %d",
JK_SHM_SLOT_SIZE, needed_slot_size);
 JK_TRACE_EXIT(l);
 return 0;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1647051 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/manager/ catalina/manager/host/ catalina/servlets/ catalina/users/ catalina/util/ catalina/valves/ tomcat/util

2014-12-22 Thread Konstantin Kolinko
2014-12-20 23:32 GMT+03:00  :
> Author: markt
> Date: Sat Dec 20 20:32:39 2014
> New Revision: 1647051
>
> URL: http://svn.apache.org/r1647051
> Log:
> Remove duplicate utility method.


1). RequestUtil.filter() is used in 404.jsp of manager and
host-manager applications. Those JSP pages have to be fixed as well.

2). Actually searching for uses of HttpMessages.filter() method in
Tomcat 8/7/6, it is only used once, in
org.apache.catalina.ssi.SSIMediator.encode(String,String).

The HttpMessages class is about HTTP protocol reason phrase.

As such, I think that HTML markup filtering method does not belong
there, and that is better to fix this duplicate code issue in the
opposite way by choosing  RequestUtil.filter() as the winner.

> Modified:
> tomcat/trunk/java/org/apache/catalina/connector/Response.java
> tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
> tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
> tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
> 
> tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
> tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
> tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
> tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
> tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
> tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1647051&r1=1647050&r2=1647051&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Sat Dec 20 
> 20:32:39 2014
> @@ -45,12 +45,12 @@ import org.apache.catalina.Globals;
>  import org.apache.catalina.Session;
>  import org.apache.catalina.Wrapper;
>  import org.apache.catalina.security.SecurityUtil;
> -import org.apache.catalina.util.RequestUtil;
>  import org.apache.catalina.util.SessionConfig;
>  import org.apache.coyote.ActionCode;
>  import org.apache.tomcat.util.buf.CharChunk;
>  import org.apache.tomcat.util.buf.UEncoder;
>  import org.apache.tomcat.util.http.FastHttpDateFormat;
> +import org.apache.tomcat.util.http.HttpMessages;
>  import org.apache.tomcat.util.http.MimeHeaders;
>  import org.apache.tomcat.util.http.parser.MediaTypeCache;
>  import org.apache.tomcat.util.net.URL;
> @@ -1297,7 +1297,7 @@ public class Response
>  if (getContext().getSendRedirectBody()) {
>  PrintWriter writer = getWriter();
>  writer.print(sm.getString("coyoteResponse.sendRedirect.note",
> -RequestUtil.filter(absolute)));
> +HttpMessages.filter(absolute)));
>  flushBuffer();
>  }
>  } catch (IllegalArgumentException e) {
>
(...)

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1647044 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/ClassLoaderLogManager.java webapps/docs/changelog.xml

2014-12-22 Thread Konstantin Kolinko
2014-12-20 22:43 GMT+03:00  :
> Author: markt
> Date: Sat Dec 20 19:43:29 2014
> New Revision: 1647044
>
> URL: http://svn.apache.org/r1647044
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57363
> Log to stderr if LogManager is unable to read configuration files rather than 
> swallowing the exception silently.
>
> Modified:
> tomcat/tc7.0.x/trunk/   (props changed)
> tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
> Modified: tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1647044&r1=1647043&r2=1647044&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java 
> (original)
> +++ tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Sat 
> Dec 20 19:43:29 2014
> @@ -465,7 +465,8 @@ public class ClassLoaderLogManager exten
>  try {
>  is = new FileInputStream(replace(configFileStr));
>  } catch (IOException e) {
> -// Ignore
> +System.err.println("Configuration error");
> +e.printStackTrace();
>  }
>  }
>  // Try the default JVM configuration
> @@ -475,7 +476,8 @@ public class ClassLoaderLogManager exten
>  try {
>  is = new FileInputStream(defaultFile);
>  } catch (IOException e) {
> -// Critical problem, do something ...
> +System.err.println("Configuration error");
> +e.printStackTrace();
>  }
>  }
>  }


1) Maybe mention the file name in that println line. In general, it
shall be present in the IOException message, but it is not 100%
certain.

2) The recipe for using Log4J with Tomcat says:
http://tomcat.apache.org/tomcat-8.0-doc/logging.html#Using_Log4j

[[[
6. Delete $CATALINA_BASE/conf/logging.properties to prevent
java.util.logging generating zero length log files.
]]]

As such, I expect that those configurations will start logging this
error message.

I think that that step shall be replaced with creating a zero-length
logging.properties file. (I thought that our docs were already saying
so, but the actual text is different).


Best regards,
Konstantin Kolinko


> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1647044&r1=1647043&r2=1647044&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Dec 20 19:43:29 2014
> @@ -173,6 +173,11 @@
>
>Add more AJP unit tests. (rjung)
>
> +  
> +57363: Log to stderr if LogManager is unable to read
> +configuration files rather than swallowing the exception silently.
> +(markt)
> +  
>  
>

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 57376] host specified in worker is misunderstood

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57376

--- Comment #3 from Alvaro C  ---
Rainer

I used "debug" level and it ran fine with version .40. I switched back to
"info" and ran fine. I don“t understand what happened but now it runs fine with
version .40

Neither the server nor the Apache service had been rebooted or restarted since
the bogus behaviour except of course stopping/restarting for replacing the
mod_jk module

I'm unable to reproduce now but I'll keep trying. In the mean time I guess this
bug can dubious be marked as "resolved"

Regards
Alvaro

-- 
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



[Bug 57376] host specified in worker is misunderstood

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57376

Rainer Jung  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #4 from Rainer Jung  ---
Thanks for testing again.

Please let us know if it happens again for you, so we can reopen the ticket.

In the meantime I will resolve this as WORKSFORME.

Regards,

Rainer

-- 
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: r1647354 - /tomcat/jk/trunk/conf/workers.properties

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 17:24:19 2014
New Revision: 1647354

URL: http://svn.apache.org/r1647354
Log:
Clarify use of property value references in
the example configuration.

Modified:
tomcat/jk/trunk/conf/workers.properties

Modified: tomcat/jk/trunk/conf/workers.properties
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/conf/workers.properties?rev=1647354&r1=1647353&r2=1647354&view=diff
==
--- tomcat/jk/trunk/conf/workers.properties (original)
+++ tomcat/jk/trunk/conf/workers.properties Mon Dec 22 17:24:19 2014
@@ -18,14 +18,14 @@
 #
 # Reference documentation: 
http://tomcat.apache.org/connectors-doc/reference/workers.html
 #
-# As a general note, the characters $( and ) are used internally to define
-# macros. Do not use them in your own configuration!!!
+# As a general note, the characters $( and ) are used to reference
+# property values in other properties.
 #
 # Whenever you see a set of lines such as:
 # x=value
-# y=$(x)\something
+# y=$(x)othervalue
 #
-# the final value for y will be value\something
+# the final value for y will be "valueothervalue"
 
 # Define two status worker:
 # - jk-status for read-only use
@@ -162,4 +162,3 @@ worker.template.reply_timeout=30
 #   Value "3" disables retries, whenever a part of the request was
 #   successfully send to the backend.
 worker.template.recovery_options=3
-



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1647356 - /tomcat/jk/trunk/conf/workers.properties.minimal

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 17:25:46 2014
New Revision: 1647356

URL: http://svn.apache.org/r1647356
Log:
Remove minimal config. It was a really bad one.
Having one example config should be anough.

Removed:
tomcat/jk/trunk/conf/workers.properties.minimal


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1647362 - in /tomcat/jk/trunk/xdocs: generic_howto/ miscellaneous/ reference/ webserver_howto/

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 18:05:17 2014
New Revision: 1647362

URL: http://svn.apache.org/r1647362
Log:
Dcos update:
- explain syntax for boolean properties
  in worker docs and iis docs
- standardize on true and false in docs
  because lower-case is what most configs actually use
- use bold markup instead of quotation marks
  because it is the majority markup
- wrap some very long lines
- Fix some grammar in changelog
- Clarify meaning of "strip_session" (IIS)
  resp. "JkStripSession" (Apache)
- Replace one occurence of "dynamically" by "automatically"
- Fix one typo "ForwarDirectories" to "ForwardDirectories"

Modified:
tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml
tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml
tomcat/jk/trunk/xdocs/generic_howto/workers.xml
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/apache.xml
tomcat/jk/trunk/xdocs/reference/iis.xml
tomcat/jk/trunk/xdocs/reference/status.xml
tomcat/jk/trunk/xdocs/reference/workers.xml
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml

Modified: tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml?rev=1647362&r1=1647361&r2=1647362&view=diff
==
--- tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/loadbalancers.xml Mon Dec 22 18:05:17 
2014
@@ -83,9 +83,9 @@ not need to appear in the worker.l
 load balancer to it suffices.
 sticky_session specifies whether requests with SESSION ID's should 
be routed
 back to the same Tomcat instance that created the session. You can set 
sticky_session to
-False when Tomcat is using a session manager which can share session 
data across
+false when Tomcat is using a session manager which can share session 
data across
 multiple instances of Tomcat - or if your application is stateless.
-By default sticky_session is set to True.
+By default sticky_session is set to true.
 lbfactor can be added to each member worker to configure individual
 strengths for the members. A higher lbfactor will lead to more
 requests being balanced to that worker. The factors must be given by integers 
and the

Modified: tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml?rev=1647362&r1=1647361&r2=1647362&view=diff
==
--- tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/timeouts.xml Mon Dec 22 18:05:17 2014
@@ -259,9 +259,9 @@ on the Tomcat side to prevent idle conne
 
 Furthermore using the boolean attribute socket_keepalive you can
 set a standard socket option, that automatically sends TCP keepalive packets
-after some idle time on each connection. By default this is set to "False".
+after some idle time on each connection. By default this is set to 
false.
 If you suspect idle connection drops by firewalls you should set this to
-"True".
+true.
 
 
 Unfortunately the default intervals and algorithms for these packets

Modified: tomcat/jk/trunk/xdocs/generic_howto/workers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/workers.xml?rev=1647362&r1=1647361&r2=1647362&view=diff
==
--- tomcat/jk/trunk/xdocs/generic_howto/workers.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/workers.xml Mon Dec 22 18:05:17 2014
@@ -253,7 +253,9 @@ other workers managed by the lb worker.
 
 
 
-The overall result is that workers managed by the same lb worker are 
load-balanced (based on their lbfactor and current user session) and also 
fall-backed so a single Tomcat process death will not "kill" the entire site.
+The overall result is that workers managed by the same lb worker are 
load-balanced
+(based on their lbfactor and current user session) and also fall-backed so a 
single
+Tomcat process death will not "kill" the entire site.
 The following table specifies some properties that the lb worker can accept:
 
 balance_workers is a comma separated list of workers that the load 
balancer need to manage.
@@ -261,8 +263,9 @@ As long as these workers should only be
 there is no need to also put them into the worker.list property.
 This directive can be used multiple times for the same load balancer.
 sticky_session specifies whether requests with SESSION ID's should 
be routed back to the same
-Tomcat worker. Set sticky_session to False when Tomcat is using a Session 
Manager which
-can persist session data across multiple instances of Tomcat. By default 
sticky_session is set to True.
+Tomcat worker. Set sticky_session to false when Tomcat is using a 
Session Manager which
+can persist session data across multiple instances of Tomcat. By default 

[Bug 54646] socket_keepalive is sometimes 1 or true or True in documentation

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54646

Rainer Jung  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #3 from Rainer Jung  ---
I added an explanation to the workers doc and to the iis doc, explaining the
various possible syntaxes for boolean properties. In the docs (examples,
explanations, defaults) I standardized now on "true" and "false", because
that's what most people actually use in their configs.

Committed by 1647362, will be part of version 1.2.41.

-- 
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



[Bug 44290] mod_jk/1.2.26: retry is not useful for an important use case

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44290

Rainer Jung  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #4 from Rainer Jung  ---
Closing this as WORKSFORME since I don't expect this issue to be possible with
the releases from the last few years. Properly using cping/cpong and
connect_timeout should prevent the behavior described in the original post.

-- 
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: r1647356 - /tomcat/jk/trunk/conf/workers.properties.minimal

2014-12-22 Thread Konstantin Kolinko
2014-12-22 20:25 GMT+03:00  :
> Author: rjung
> Date: Mon Dec 22 17:25:46 2014
> New Revision: 1647356
>
> URL: http://svn.apache.org/r1647356
> Log:
> Remove minimal config. It was a really bad one.
> Having one example config should be anough.
>
> Removed:
> tomcat/jk/trunk/conf/workers.properties.minimal

1) There is one more file with the same name:
native\iis\installer\conf\workers.properties.minimal

2) If I search for ".minimal", I see it being mentioned in the following files:

conf\uriworkermap.properties
native\iis\installer\conf\uriworkermap.properties
native\iis\installer\isapi-redirector-win32-msi.ism
tools\jkrelease.sh

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 44349] mod_jk/1.2.26 module does not read worker.status.sticky_session_force property correctly

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44349

Rainer Jung  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #23 from Rainer Jung  ---
I will resolve this as WORKSFORME because lots of people use this with correct
display of configuration by the status worker and we didn't have any feedback
for years.

-- 
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: r1647376 - in /tomcat/jk/trunk/xdocs: reference/apache.xml webserver_howto/apache.xml

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 18:57:48 2014
New Revision: 1647376

URL: http://svn.apache.org/r1647376
Log:
- Give access log logging via notes preference
  over old-style mod_jk request logging in the
  mod_jk log file.
- Remove some Apache 1.3 artefacts from docs.

Modified:
tomcat/jk/trunk/xdocs/reference/apache.xml
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml

Modified: tomcat/jk/trunk/xdocs/reference/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/apache.xml?rev=1647376&r1=1647375&r2=1647376&view=diff
==
--- tomcat/jk/trunk/xdocs/reference/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/apache.xml Mon Dec 22 18:57:48 2014
@@ -562,12 +562,11 @@ set the log level between :
 
 
 JkLogStampFormat will configure the date/time format found on mod_jk 
log file. 
-Using the strftime() format string it's set by
-default to "[%a %b %d %H:%M:%S %Y]"
+See above for details.
 
 
 
-  JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
+  JkLogStampFormat "[%Y-%m-%d %H:%M:%S.%Q] "
 
 
 
@@ -576,41 +575,7 @@ default to "[%a %b %d %H:%M:%S %Y]"
 
 
-JkRequestLogFormat will configure the format of mod_jk individual 
request logging. 
-Request logging is configured and enabled on a per virtual host basis. 
-To enable request logging for a virtual host just add a JkRequestLogFormat 
config. 
-The syntax of the format string is similar to the Apache LogFormat command, 
-here is a list of the available request log format options:
-
-
-
-
-  Bytes sent, excluding HTTP headers 
(CLF format)
-  Bytes sent, excluding HTTP 
headers
-  The request protocol
-  The request method
-  The canonical Port of the server 
serving the request
-  The query string (prepended with a ? 
if a query string exists, otherwise an empty string)
-  First line of request
-  Request HTTP status code
-  Request duration, elapsed time to 
handle request in seconds '.' micro seconds
-  The URL path requested, not including 
any query string.
-  The canonical ServerName of the server 
serving the request
-  The server name according to the 
UseCanonicalName setting
-  Tomcat worker name
-  Real worker name
-
-
-
-  JkRequestLogFormat "%w %V %T"
-
-
-
-
-
-
-
-You can also log mod_jk information using the Apache standard module 
mod_log_config.
+You can log mod_jk information using the Apache standard module 
mod_log_config.
 The module sets several notes in the Apache httpd notes table.
 Most of them are are only useful in combination with a load balancer worker.
 
@@ -652,6 +617,42 @@ Most of them are are only useful in comb
 
 
 
+
+
+
+
+You can also log a request protocol in the mod_jk log file instead of
+the access log. This is not recommended and mostly a backward compatibility
+feature. The directive JkRequestLogFormat will configure the format
+of this protocol. It gets configured and enabled on a per virtual host basis. 
+To enable request logging for a virtual host just add a JkRequestLogFormat 
config. 
+The syntax of the format string is similar to the Apache LogFormat command, 
+here is a list of the available request log format options:
+
+
+
+
+  Bytes sent, excluding HTTP headers 
(CLF format)
+  Bytes sent, excluding HTTP 
headers
+  The request protocol
+  The request method
+  The canonical Port of the server 
serving the request
+  The query string (prepended with a ? 
if a query string exists, otherwise an empty string)
+  First line of request
+  Request HTTP status code
+  Request duration, elapsed time to 
handle request in seconds '.' micro seconds
+  The URL path requested, not including 
any query string.
+  The canonical ServerName of the server 
serving the request
+  The server name according to the 
UseCanonicalName setting
+  Tomcat worker name
+  Real worker name
+
+
+
+  JkRequestLogFormat "%w %V %T"
+
+
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1647376&r1=1647375&r2=1647376&view=diff
==
--- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Mon Dec 22 18:57:48 2014
@@ -319,9 +319,9 @@ Here is a simple configuration:
 
 
 # Load mod_jk module
-LoadModulejk_module  libexec/mod_jk.so
-# Declare the module for  (remove this line on 
Apache 2.x)
-AddModule mod_jk.c
+LoadModulejk_module  modules/mod_jk.so
+# Add the module (activate this lne for Apache 1.3)
+# AddModule mod_jk.c
 # Where to find workers.properties
 JkWorkersFile /etc/httpd/conf/workers.properties
 # Where to put jk shared memory
@@ -330,8 +330,6 @@ Here is a simple configuration:
 JkLogFile /var/log/httpd/mod_jk.log
 # Set the jk log level [debug/error/info]
 JkLogLevelinfo
-# Select th

[Bug 46337] route item in mod_jk bultin request log is wrong after failover

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46337

Rainer Jung  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX
Summary|real worker name is wrong   |route item in mod_jk bultin
   ||request log is wrong after
   ||failover

--- Comment #4 from Rainer Jung  ---
After having again looked at the code I'm closing this as WONTFIX.
Please use the more powerful access log logging supported by mod_jk via Apache
logging notes. I think you get everything you are lokking for that way.

I have updated the docs to favor access log logging instead of the old-style
mod_jk request loging in the mod_jk log file.

Regards,

Rainer

-- 
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



[Bug 47327] Return tomcat authenticated user back to mod_jk (AJP improvement)

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47327

Rainer Jung  changed:

   What|Removed |Added

Summary|remote_user not logged in   |Return tomcat authenticated
   |apache logfile  |user back to mod_jk (AJP
   ||improvement)

-- 
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



[Bug 47617] include time spent doing ajp_get_endpoint() in error log

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47617

Rainer Jung  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WONTFIX

--- Comment #2 from Rainer Jung  ---
Note that Apache logs the request start time in the access log. So you can
estimate the required duration by taking the delta to the mod_jk log time.

Apache 2.4 can also log request start time in the access log with milliseconds,
and mod_jk logs its messages also with milliseconds, so you get a reasonable
number from comparing the two.

No feedback for several years.

Closing as WONTFIX for performance reasons.

-- 
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



[Bug 47750] ISAPI: Loss of worker settings when changing via jkstatus

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47750

Rainer Jung  changed:

   What|Removed |Added

Summary|Loss of worker settings |ISAPI: Loss of worker
   |when changing via jkstatus  |settings when changing via
   ||jkstatus

-- 
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



[Bug 47840] A broken worker name is written in the log file.

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47840

Rainer Jung  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |FIXED

--- Comment #7 from Rainer Jung  ---
I think this was fixed recently in r1646958:

Copy instead of reference another log note.

Value was taken from service struct which
doesn't live until logging phase.

I observed a similar issue with another log note I was able to analyze and
explain looking at the life cycle of the service struct.

The fix will be part of version 1.2.41.

-- 
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



[Bug 48490] Changing a node to stopped in uriworkermap.properties not reflected in jkstatus

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48490

Rainer Jung  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #1 from Rainer Jung  ---
There have been lots of improvements in the shared memory handling used for
controlling configuration and the status worker.

Could you comment, whether the problem still happens for you using mod_jk
1.2.40?

Thanks!

Rainer

-- 
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



[Bug 48564] Allow to turn off retries for LB worker

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48564

Rainer Jung  changed:

   What|Removed |Added

Summary|Unable to turn off retries  |Allow to turn off retries
   |for LB worker   |for LB worker
   Severity|normal  |enhancement

--- Comment #1 from Rainer Jung  ---
I will mark this as an enhancement request.

The retries attribute of the LB is meant to control, how often the list of
members will betried before giving up. So a "1" means, an LB will try each
member at most once, a "2" (default) means, there will be at most two rounds of
trying each member.

I will clarify the docs and think about whether a complete disabling of retries
makes sense and how to implement it.

-- 
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: r1647398 - /tomcat/jk/trunk/tools/jkrelease.sh

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 21:01:23 2014
New Revision: 1647398

URL: http://svn.apache.org/r1647398
Log:
workers.properties.minimal is gone.

Modified:
tomcat/jk/trunk/tools/jkrelease.sh

Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1647398&r1=1647397&r2=1647398&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Mon Dec 22 21:01:23 2014
@@ -36,7 +36,7 @@ JK_TOOLS="`pwd`"
 COPY_JK="README.txt HOWTO-RELEASE.txt native jkstatus support tools xdocs"
 COPY_NATIVE="LICENSE NOTICE"
 COPY_BUILD="docs"
-COPY_CONF="httpd-jk.conf uriworkermap.properties workers.properties 
workers.properties.minimal"
+COPY_CONF="httpd-jk.conf uriworkermap.properties workers.properties"
 SIGN_OPTS=""
 
  NO CHANGE BELOW THIS LINE ##



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1647408 - in /tomcat/jk/trunk/native/iis: ./ installer/ installer/bin/ installer/conf/ installer/log/

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 21:24:30 2014
New Revision: 1647408

URL: http://svn.apache.org/r1647408
Log:
- Replace "Jakarta" by "Tomcat" in the IIS ISAPI
  Redirector. Keep Registry path containing "Jakarta"
  for compatibility.
- Add example isapi_redirect.properties to conf
- Update example config files
Hopefully I haven't broken the ism file.

Added:
tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties   (with 
props)
tomcat/jk/trunk/native/iis/installer/conf/workers.properties   (with props)
Removed:
tomcat/jk/trunk/native/iis/installer/conf/workers.properties.minimal
Modified:
tomcat/jk/trunk/native/iis/installer/bin/README
tomcat/jk/trunk/native/iis/installer/conf/rewrite.properties
tomcat/jk/trunk/native/iis/installer/conf/uriworkermap.properties
tomcat/jk/trunk/native/iis/installer/iisfilter.vbs
tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/jk/trunk/native/iis/installer/log/README
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/installer/bin/README
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/bin/README?rev=1647408&r1=1647407&r2=1647408&view=diff
==
--- tomcat/jk/trunk/native/iis/installer/bin/README (original)
+++ tomcat/jk/trunk/native/iis/installer/bin/README Mon Dec 22 21:24:30 2014
@@ -1 +1 @@
-Jakarta Isapi Redirector
\ No newline at end of file
+Tomcat Isapi Redirector

Added: tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties?rev=1647408&view=auto
==
--- tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties (added)
+++ tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties Mon Dec 
22 21:24:30 2014
@@ -0,0 +1,86 @@
+# 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.
+
+# Note that the distributed version of this file requires modification
+# before it is usable.
+#
+# Reference documentation: 
http://tomcat.apache.org/connectors-doc/reference/iis.html
+#
+# Configuration file for the Tomcat ISAPI Redirector
+
+# The path to the ISAPI Redirector Extension, relative to the website
+# This must be in a virtual directory with execute privileges
+extension_uri=/jakarta/isapi_redirect.dll
+
+# Full path to the log file for the ISAPI Redirector
+# Use of strftime(3) format in the name is supported.
+log_file=c:\tomcat\logs\isapi_redirect.%Y-%m-%d.log
+
+# Rotate the log file every day
+log_rotationtime=86400
+
+# Log level (trace, debug, info, warn or error)
+log_level=info
+
+# Full path to the workers.properties file
+worker_file=c:\tomcat\conf\workers.properties
+
+# Full path to the uriworkermap.properties file
+worker_mount_file=c:\tomcat\conf\uriworkermap.properties
+
+# Full path to the rewrite.properties file
+rewrite_rule_file=
+
+# Specify the time in seconds upon which the worker_mount_file will be 
reloaded.
+worker_mount_reload=
+
+# If this is set to true, URL session suffixes of the form ";jsessionid=..."
+# get stripped of URLs if the are served locally by the web server.
+# Default value is false.
+strip_session=false
+
+# If this is set to true, URLs containing percent signs '%' or backslashes '\'
+# after decoding will be rejected. Most web apps do not use such URLs.
+# By enabling "reject_unsafe" you can block several well known URL encoding
+# attacks.
+# Default value is false.
+reject_unsafe=false
+
+# A value representing the watchdog thread interval in seconds. The workers are
+# maintained periodically by a background thread running periodically every
+# watchdog_interval seconds. Worker maintenance checks for idle connections,
+# corrects load status and is able to detect backend health status.
+#
+# The maintenance only happens, if since the last maintenance at least
+# worker.maintain seconds have passed. So setting the watchdog_interval much
+# smaller than worker.maintain is not useful.
+#
+# The default value is 0 seconds, meaning the watchdog thread will not be
+# created, and the maintenance is 

svn commit: r1647409 - /tomcat/jk/trunk/conf/uriworkermap.properties

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 21:25:08 2014
New Revision: 1647409

URL: http://svn.apache.org/r1647409
Log:
Update example config.

Modified:
tomcat/jk/trunk/conf/uriworkermap.properties

Modified: tomcat/jk/trunk/conf/uriworkermap.properties
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/conf/uriworkermap.properties?rev=1647409&r1=1647408&r2=1647409&view=diff
==
--- tomcat/jk/trunk/conf/uriworkermap.properties (original)
+++ tomcat/jk/trunk/conf/uriworkermap.properties Mon Dec 22 21:25:08 2014
@@ -13,27 +13,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# uriworkermap.properties - IIS
+# uriworkermap.properties
 #
-# This file provides sample mappings for example wlb
-# worker defined in workermap.properties.minimal
+# Use for IIS or with the Apache web server as an alternative
+# to JkMount and JkUnmount
+#
+# This file provides sample mappings for the example
+# worker "balancer" defined in workermap.properties.
 # The general syntax for this file is:
 # [URL]=[Worker name]
 
-/admin/*=lb
-/manager/*=lb
-/jsp-examples/*=lb
-/servlets-examples/*=lb
-/examples/*=lb
+/admin/*=balancer
+/manager/*=balancer
+/examples/*=balancer
 
-# Optionally filter out all .jpeg files inside that context
-# For no mapping the url has to start with exclamation (!)
+# Optionally filter out all .jpg files inside that context
+# For no mapping the url has to start with exclamation mark (!)
 
-!/servlets-examples/*.jpeg=lb
+!/examples/*.jpg=balancer
 
 #
-# Mount jkstatus to /jkmanager
+# Mount jk status and manager
 # For production servers you will need to
-# secure the access to the /jkmanager url
+# secure the access to the /jk-manager and
+# /jk-status urls
 #
-/jk-manager=jk-status
+/jk-manager=jk-manager
+/jk-status=jk-status



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1647410 - /tomcat/jk/trunk/xdocs/generic_howto/proxy.xml

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 21:26:00 2014
New Revision: 1647410

URL: http://svn.apache.org/r1647410
Log:
Fix typo in docs.

Modified:
tomcat/jk/trunk/xdocs/generic_howto/proxy.xml

Modified: tomcat/jk/trunk/xdocs/generic_howto/proxy.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/proxy.xml?rev=1647410&r1=1647409&r2=1647410&view=diff
==
--- tomcat/jk/trunk/xdocs/generic_howto/proxy.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/proxy.xml Mon Dec 22 21:26:00 2014
@@ -312,7 +312,7 @@ changes like this:
 /oldapp/=/myapp/
 
 and then put the name of the file in the rewrite_rule_file 
entry of the registry or your
-isapi_redirect.properties file. In you 
uriworkermap.properties file, you
+isapi_redirect.properties file. In your 
uriworkermap.properties file, you
 still need to map the URLs as they are before rewriting!
 
 More complex rewrites can be done using the same file, but with regular 
expressions. A leading



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1647411 - /tomcat/jk/trunk/xdocs/reference/iis.xml

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 21:26:30 2014
New Revision: 1647411

URL: http://svn.apache.org/r1647411
Log:
Fix wrong variable name in docs config example.

Modified:
tomcat/jk/trunk/xdocs/reference/iis.xml

Modified: tomcat/jk/trunk/xdocs/reference/iis.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/iis.xml?rev=1647411&r1=1647410&r2=1647411&view=diff
==
--- tomcat/jk/trunk/xdocs/reference/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/iis.xml Mon Dec 22 21:26:30 2014
@@ -329,7 +329,7 @@ automatically added to the environment t
 
 
 # Use the logs in the installation path of ISAPI Redirector
-log_file=$(ISAPI_PATH)\$(ISAPI_NAME).log
+log_file=$(JKISAPI_PATH)\$(JKISAPI_NAME).log
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 57391] New: Allow TLS Session Tickets to be disabled

2014-12-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57391

Bug ID: 57391
   Summary: Allow TLS Session Tickets to be disabled
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: josiah.purtleba...@gmail.com

Created attachment 32322
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32322&action=edit
svn diff output

OpenSSL contexts support the SSL_OP_NO_TICKET option as of OpenSSL 1.0.0 that
disables the use of TLS Session Tickets (RRC 4507) in order to protect perfect
forward secrecy. The APR connector should support the ability to enable/disable
this functionality at runtime.

With 'SSLDisableSessionTickets' omitted or set to false:

New, TLSv1/SSLv3, Cipher is ECDHE-RSA-AES256-SHA
Server public key is 2048 bit
Secure Renegotiation IS supported
Compression: NONE
Expansion: NONE
SSL-Session:
Protocol  : TLSv1
Cipher: ECDHE-RSA-AES256-SHA
Session-ID:
FE4BF00CC4B357A046F5A0EDDDF874C3194FB10453480986E9B798028DCC1FB1
Session-ID-ctx: 
Master-Key:
65F45CFC648ADCAFB84026B702C800D18E05F7DB27618D2E036308F95AE479C7428D006D2CB4A68342FD23F39099C291
Key-Arg   : None
Krb5 Principal: None
PSK identity: None
PSK identity hint: None
TLS session ticket lifetime hint: 300 (seconds)
TLS session ticket:
 - 7d 37 a8 08 28 98 ff 9f-0d 74 bb 2c 04 90 cf 7b   }7..(t.,...{
0010 - 23 34 11 49 4e db c4 04-4a e3 9e 76 06 59 10 5f   #4.IN...J..v.Y._
0020 - c6 c4 05 4e f2 76 f6 d4-3e a2 a5 ec e4 51 e9 15   ...N.v..>Q..
0030 - 6d 71 ba 19 2e b7 b1 79-a2 13 3e 4d f4 08 a7 94   mq.y..>M
0040 - 2f ab 77 2a 92 03 04 12-a0 8a 7e 24 c3 de b1 64   /.w*..~$...d
0050 - fd b9 ba 0b bd 8e 0d b9-99 0e 86 f4 16 a0 9d ad   
0060 - 99 78 26 eb 59 30 9f 69-93 d4 17 95 99 70 c1 e1   .x&.Y0.i.p..
0070 - b8 2e fc 6e d0 ca af f6-10 37 05 73 92 49 2e e4   ...n.7.s.I..
0080 - 22 e5 9c db 10 f2 2a 59-3e a2 a1 15 fb c3 07 06   ".*Y>...
0090 - 17 9b e9 f4 cd 89 14 43-c3 40 eb 8b b5 c7 e7 e1   ...C.@..
00a0 - ce ec c8 39 46 de ae 98-bc 5b c9 3f 55 a5 e9 31   ...9F[.?U..1

With 'SSLDisableSessionTickets' set to true:
New, TLSv1/SSLv3, Cipher is ECDHE-RSA-AES256-SHA
Server public key is 2048 bit
Secure Renegotiation IS supported
Compression: NONE
Expansion: NONE
SSL-Session:
Protocol  : TLSv1
Cipher: ECDHE-RSA-AES256-SHA
Session-ID:
019AE5FB556C2D52857B711395E19EAA5B580C704EB43B2787AD72FDE5077F81
Session-ID-ctx: 
Master-Key:
22C1A1DDB686D745F456DB6E1DCC2C38D3F651B483C2F2CCC280E9D8A148B20CE65475862F058E099C6B34FCEA7BC295
Key-Arg   : None
Krb5 Principal: None
PSK identity: None
PSK identity hint: None
Start Time: 1419283439
Timeout   : 7200 (sec)
Verify return code: 18 (self signed certificate)

Versions:
CentOS release 6.5 (Final)
OpenSSL 1.0.1e-fips 11 Feb 2013
Tomcat 8.x trunk

-- 
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: r1647418 - in /tomcat/jk/trunk: native/iis/installer/isapi-redirector-win32-msi.ism xdocs/reference/iis.xml xdocs/webserver_howto/iis.xml

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 21:48:39 2014
New Revision: 1647418

URL: http://svn.apache.org/r1647418
Log:
More de-Jakartify.

Modified:
tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/jk/trunk/xdocs/reference/iis.xml
tomcat/jk/trunk/xdocs/webserver_howto/iis.xml

Modified: tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=1647418&r1=1647417&r2=1647418&view=diff
==
--- tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism 
(original)
+++ tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism Mon Dec 
22 21:48:39 2014
@@ -1972,7 +1972,6 @@
ISProductFolder1
ISProjectDataFolder1
ISProjectFolder1
-   
PATH_TO_IIS_FILESC:\W\jakarta\jtc\jk\native\iis2
ProgramFilesFolder1
SystemFolder1
WindowsFolder1
@@ -2887,7 +2886,7 @@
IDS__TargetReq_DESC_PROCESSOR1033The 
processor is not adequate for running 
[ProductName].0-1256677244
IDS__TargetReq_DESC_RAM1033The 
amount of RAM is not adequate for running 
[ProductName].0-1256677244

IDS__TargetReq_DESC_RESOLUTION1033The screen 
resolution is not adequate for running 
[ProductName].0-1256677244
-   
ID_STRING11033http://jakarta.apache.org02115538665
+   
ID_STRING11033http://tomcat.apache.org02115538665

ID_STRING21033DisplayName102115549418

ID_STRING31033jakarta02115510538

ID_STRING41033CoreFiles02115544011

Modified: tomcat/jk/trunk/xdocs/reference/iis.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/iis.xml?rev=1647418&r1=1647417&r2=1647418&view=diff
==
--- tomcat/jk/trunk/xdocs/reference/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/iis.xml Mon Dec 22 21:48:39 2014
@@ -287,7 +287,7 @@ The property names and values in the pro
 
 
 
-# Configuration file for the Jakarta ISAPI Redirector
+# Configuration file for the Tomcat ISAPI Redirector
 
 # The path to the ISAPI Redirector Extension, relative to the website
 # This must be in a virtual directory with execute privileges
@@ -344,7 +344,7 @@ If both are specified, the log_rotati
 For example, to configure daily rotation of the log file:
 
 
-# Configuration file for the Jakarta ISAPI Redirector
+# Configuration file for the Tomcat ISAPI Redirector
 ...
 
 # Full path to the log file for the ISAPI Redirector
@@ -362,7 +362,7 @@ log_rotationtime=86400
 Or to configure rotation of the log file when it reaches 5MB in size:
 
 
-# Configuration file for the Jakarta ISAPI Redirector
+# Configuration file for the Tomcat ISAPI Redirector
 ...
 
 # Full path to the log file for the ISAPI Redirector

Modified: tomcat/jk/trunk/xdocs/webserver_howto/iis.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/iis.xml?rev=1647418&r1=1647417&r2=1647418&view=diff
==
--- tomcat/jk/trunk/xdocs/webserver_howto/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/iis.xml Mon Dec 22 21:48:39 2014
@@ -259,7 +259,7 @@ you need to insert the full path to isap
 
 If you're using IIS 6.0 you must also do the following:
 
-Using the IIS management console, add the Jakarta Isapi Redirector to the Web
+Using the IIS management console, add the Tomcat Isapi Redirector to the Web
 Service Extensions. 
 
 Right-click on Web Service Extensions and choose Add a new Web Service



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1647419 - /tomcat/jk/trunk/native/iis/isapi_redirect.reg

2014-12-22 Thread rjung
Author: rjung
Date: Mon Dec 22 21:49:09 2014
New Revision: 1647419

URL: http://svn.apache.org/r1647419
Log:
Update registry config file.

Modified:
tomcat/jk/trunk/native/iis/isapi_redirect.reg

Modified: tomcat/jk/trunk/native/iis/isapi_redirect.reg
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/isapi_redirect.reg?rev=1647419&r1=1647418&r2=1647419&view=diff
==
--- tomcat/jk/trunk/native/iis/isapi_redirect.reg (original)
+++ tomcat/jk/trunk/native/iis/isapi_redirect.reg Mon Dec 22 21:49:09 2014
@@ -2,7 +2,11 @@ REGEDIT4
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta Isapi 
Redirector\1.0]
 "extension_uri"="/jakarta/isapi_redirect.dll"
-"log_file"="C:\\tomcat\\logs\\isapi.log"
-"log_level"="debug"
+"log_file"="C:\\tomcat\\logs\\isapi_redirect.%Y-%m-%d.log"
+"log_level"="info"
 "worker_file"="C:\\tomcat\\conf\\workers.properties"
 "worker_mount_file"="C:\\tomcat\\conf\\uriworkermap.properties"
+"log_rotationtime"="86400"
+"strip_session"="false"
+"reject_unsafe"="false"
+"enable_chunked_encoding"="false"



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1647356 - /tomcat/jk/trunk/conf/workers.properties.minimal

2014-12-22 Thread Rainer Jung

Am 22.12.2014 um 19:23 schrieb Konstantin Kolinko:

2014-12-22 20:25 GMT+03:00  :

Author: rjung
Date: Mon Dec 22 17:25:46 2014
New Revision: 1647356

URL: http://svn.apache.org/r1647356
Log:
Remove minimal config. It was a really bad one.
Having one example config should be anough.

Removed:
 tomcat/jk/trunk/conf/workers.properties.minimal


1) There is one more file with the same name:
native\iis\installer\conf\workers.properties.minimal

2) If I search for ".minimal", I see it being mentioned in the following files:

conf\uriworkermap.properties
native\iis\installer\conf\uriworkermap.properties
native\iis\installer\isapi-redirector-win32-msi.ism
tools\jkrelease.sh


Thanks, should be fixed now.

A lot of the ISAPI stuff is not in good shape, I try to update parts of 
it but can't actually check the installer build.


Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GUMP@vmgump]: Project tomcat-native-make (in module tomcat-native) failed

2014-12-22 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-native-make has an issue affecting its community integration.
This issue affects 4 projects,
 and has been outstanding for 16 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-native-make :  Tomcat native library using Apache Portable Runtime
- tomcat-native-make-install :  Tomcat native library using Apache Portable 
Runtime
- tomcat-tc8.0.x-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/gump_work/build_tomcat-native_tomcat-native-make.html
Work Name: build_tomcat-native_tomcat-native-make (Type: Build)
Work ended in a state of : Failed
Elapsed: 7 secs
Command Line: make 
[Working Directory: /srv/gump/public/workspace/tomcat-native/native]
-
make[1]: Entering directory `/srv/gump/public/workspace/tomcat-native/native'
/bin/bash /srv/gump/public/workspace/apr-1/dest-20141223/build-1/libtool 
--silent --mode=compile gcc -g -O2 -pthread   -DHAVE_CONFIG_H  -DLINUX 
-D_REENTRANT -D_GNU_SOURCE   -g -O2 -DHAVE_OPENSSL   
-I/srv/gump/public/workspace/tomcat-native/native/include 
-I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux 
-I/srv/gump/public/workspace/openssl/dest-20141223/include  
-I/srv/gump/public/workspace/apr-1/dest-20141223/include/apr-1   -o 
src/address.lo -c src/address.c && touch src/address.lo
/bin/bash /srv/gump/public/workspace/apr-1/dest-20141223/build-1/libtool 
--silent --mode=compile gcc -g -O2 -pthread   -DHAVE_CONFIG_H  -DLINUX 
-D_REENTRANT -D_GNU_SOURCE   -g -O2 -DHAVE_OPENSSL   
-I/srv/gump/public/workspace/tomcat-native/native/include 
-I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux 
-I/srv/gump/public/workspace/openssl/dest-20141223/include  
-I/srv/gump/public/workspace/apr-1/dest-20141223/include/apr-1   -o src/bb.lo 
-c src/bb.c && touch src/bb.lo
/bin/bash /srv/gump/public/workspace/apr-1/dest-20141223/build-1/libtool 
--silent --mode=compile gcc -g -O2 -pthread   -DHAVE_CONFIG_H  -DLINUX 
-D_REENTRANT -D_GNU_SOURCE   -g -O2 -DHAVE_OPENSSL   
-I/srv/gump/public/workspace/tomcat-native/native/include 
-I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux 
-I/srv/gump/public/workspace/openssl/dest-20141223/include  
-I/srv/gump/public/workspace/apr-1/dest-20141223/include/apr-1   -o src/dir.lo 
-c src/dir.c && touch src/dir.lo
/bin/bash /srv/gump/public/workspace/apr-1/dest-20141223/build-1/libtool 
--silent --mode=compile gcc -g -O2 -pthread   -DHAVE_CONFIG_H  -DLINUX 
-D_REENTRANT -D_GNU_SOURCE   -g -O2 -DHAVE_OPENSSL   
-I/srv/gump/public/workspace/tomcat-native/native/include 
-I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux 
-I/srv/gump/public/workspace/openssl/dest-20141223/include  
-I/srv/gump/public/workspace/apr-1/dest-20141223/include/apr-1   -o 
src/error.lo -c src/error.c && touch src/error.lo
/bin/bash /srv/gump/public/workspace/apr-1/dest-20141223/build-1/libtool 
--silent --mode=compile gcc -g -O2 -pthread   -DHAVE_CONFIG_H  -DLINUX 
-D_REENTRANT -D_GNU_SOURCE   -g -O2 -DHAVE_OPENSSL   
-I/srv/gump/public/workspace/tomcat-native/native/include 
-I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux 
-I/srv/gump/public/workspace/openssl/dest-20141223/include  
-I/srv/gump/public/workspace/apr-1/dest-20141223/include/apr-1   -o src/file.lo 
-c src/file.c && touch src/file.lo
/bin/bash /srv/gump/public/workspace/apr-1/dest-20141223/build-1/libtool 
--silent --mode=compile gcc -g -O2 -pthread   -DHAVE_CONFIG_H  -DLINUX 
-D_REENTRANT -D_GNU_SOURCE   -g -O2 -DHAVE_OPENSSL   
-I/srv/gump/public/workspace/tomcat-native/native/include 
-I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux 
-I/srv/gump/public/workspace/openssl/dest-20141223/include  
-I/srv/gump/public/workspace/apr-1/dest-20141223/include/apr-1   -o src/info.lo 
-c src/info.c && touch src/info.lo
/bin/bash /srv/gump/public/workspace/apr-1/dest-20141223/build-1/libtool 
--silent --mode=compile gcc -g -O2 -pthread   -DHAVE_CONFIG_H  -DLINUX 
-D_REENTRANT -D_GNU_SOURCE   -g -O2 -DHAVE_OPENSSL   
-I/srv/gump/public/workspace/tomcat