svn commit: r1761532 - in /tomcat/site/trunk: ./ docs/ xdocs/

2016-09-19 Thread violetagg
Author: violetagg
Date: Tue Sep 20 06:56:13 2016
New Revision: 1761532

URL: http://svn.apache.org/viewvc?rev=1761532&view=rev
Log:
Updates (excluding docs) for 7.0.72 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-70.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1761532&r1=1761531&r2=1761532&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Tue Sep 20 06:56:13 2016
@@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to
 
 # - Tomcat versions -
 tomcat60=6.0.45
-tomcat70=7.0.70
+tomcat70=7.0.72
 tomcat80=8.0.37
 tomcat85=8.5.5
 tomcat90=9.0.0.M10

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1761532&r1=1761531&r2=1761532&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue Sep 20 06:56:13 2016
@@ -67,8 +67,8 @@
 
   
 Latest Stable 7.0.x Release
-2016-06-20
-7.0.70
+2016-09-19
+7.0.72
   
 
 

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1761532&r1=1761531&r2=1761532&view=diff
==
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Tue Sep 20 06:56:13 2016
@@ -222,7 +222,7 @@
 Quick Navigation
 
 
-[define v]7.0.70[end]
+[define v]7.0.72[end]
 https://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1761532&r1=1761531&r2=1761532&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Sep 20 06:56:13 2016
@@ -245,6 +245,40 @@ project logo are trademarks of the Apach
 
 
 
+
+2016-09-19 Tomcat 7.0.72 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 7.0.72 of
+Apache Tomcat. This release contains a number of bug fixes and improvements
+compared to version 7.0.70. The notable changes since 7.0.70 include:
+
+
+
+
+Treat paths used to obtain a request dispatcher as encoded
+(configurable)
+
+Update the Tomcat Native Library to 1.2.8
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 7 changelog.
+
+
+
+
+
+Download |
+ChangeLog for 7.0.72
+
+
+
+
 
 2016-09-05 Tomcat 8.5.5 Released
 
@@ -386,42 +420,6 @@ using 1.2.x in preference to 1.1.x.
 
 
 
-
-
-2016-06-20 Tomcat 7.0.70 Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 7.0.70 of
-Apache Tomcat. This release contains a number of bug fixes and improvements
-compared to version 7.0.69. The notable changes since 7.0.69 include:
-
-
-
-
-Update the packaged version of the Tomcat Native Library to 1.2.7 to pick
-up the Windows binaries that are based on OpenSSL 1.0.2h and APR 1.5.2.
-
-
-Remove native code (Windows Service Wrapper, APR/native connector) support
-for Windows Itanium. 
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 7 changelog.
-
-
-
-
-
-Download |
-ChangeLog for 7.0.70
-
-
-
 
 
 2016-02-11 Tomcat 6.0.45 Released

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1761532&r1=1761531&r2=1761532&view=diff
==
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Tue Sep 20 06:56:13 2016
@@ -1095,7 +1095,8 @@ of Apache Tomcat.
   "7.0.67":"1718339",
   "7.0.68":"1729238",
   "7.0.69":"1738539",
-  "7.0.70":"1748587"
+  "7.0.70":"1748587",
+  "7.0.72":"1760687"
 };
 
 formSubmit.action = 
"http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/"; +
@@ -1173,8 +1174,9 @@ of Apache Tomcat.
 7.0.65

[Bug 60151] JNDI Datasource lookup failure - throws javax.naming.NamingException

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60151

--- Comment #1 from Mark Thomas  ---
Configuration please. We need to see the DataSource configuration and the
details of which file(s) it is in.

-- 
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 60013] Non-ASCII characters in querystring get mangled after URL Rewrite using RewriteValve

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60013

--- Comment #36 from Santhana Preethi  ---
Any update in QSA issue?

-- 
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 59897] Buffer Overflow in FD_SET in nb_connect (jk_connect.c) leading to apache2 crash

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=59897

Fredrik Carpio  changed:

   What|Removed |Added

 CC||fredrik.car...@sony.com

-- 
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: Should we update version scheme information for tomcat 9?

2016-09-19 Thread Mark Thomas
On 19/09/2016 16:29, Jarosław Górny wrote:
> Hi,
> 
> 
> 2016-09-19 16:10 GMT+02:00 Coty Sutherland :
>> OK, I've read over what I proposed again and it looks correct to me. I
>> only made one change after you provided further explanation and that
>> change was to add 'finalized' in the Alpha release description:
>>
>> +functionality required by the finalised specification and/or significant 
>> bugs
>>
>> I did this to further demarcate Milestone releases from Alpha
>> releases. If this sounds good to everyone, I'll push it up.
>>
> 
> Thanks for that! If I'm reading all of that correctly, "M-builds"
> (milestones) are actually pre-alpha, right?

To some extent, we are working out the detail as we go along. The spec
is normally ready before Tomcat is. It is a first (in my memory) for
Tomcat to be waiting for the spec.

> Which means, there will be a 9.0.0-alpha at some point.

It would be 9.0.0 (alpha).

> Also, I assume there might be more than
> one alpha or beta release. So we can again expect something like:
> 9.0.0-alpha1, 9.0.0-alpha2, etc. If so, will the first alpha contain
> numerical suffix. Or first one will be just 9.0.0-alpha, and prefixes
> added only if it turns out there are more than one "alpha" stage
> releases?

No. It would be:
9.0.0 (alpha)
9.0.1 (alpha)

etc.

> Additional note, on http://tomcat.apache.org/ Milestone builds are at
> the moment referenced as "alpha", which IMVHO is confusing. For
> example:
> 
> "The Apache Tomcat Project is proud to announce the release of version
> 9.0.0.M10 (alpha) of Apache Tomcat.(...)"
> 
> Thank you!

The milestone is primarily there to indicate that the specification API
JARs are subject to change. We don't want to have a version of a spec
JAR in the wild that doesn't represent the final version of the spec API
that isn't clearly marked in some way. Milestone release suffixes are
the simplest way of doing this.

Alpha / Beta / Stable is primarily there to indicate how production
ready the code is.

Milestones will always be alpha.

Depending on the pace of change in the specs between now and the final
releases, it is possible that 9.0.0 could be a beta. We'll have to see.

Mark

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



buildbot success in on tomcat-trunk

2016-09-19 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1694

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1761500
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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



svn commit: r1761501 - /tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 20:40:49 2016
New Revision: 1761501

URL: http://svn.apache.org/viewvc?rev=1761501&view=rev
Log:
Confirm ':' is not encoded in a redirect to http://localhost/

Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

Modified: 
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1761501&r1=1761500&r2=1761501&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
Mon Sep 19 20:40:49 2016
@@ -465,6 +465,15 @@ public class TestRewriteValve extends To
 }
 
 
+@Test
+public void testHostRewrite() throws Exception {
+// Based on report from users list that ':' was encoded and breaking
+// the redirect
+doTestRewrite("RewriteRule ^/b(.*) 
http://%{HTTP_HOST}:%{SERVER_PORT}/a$1 [R]",
+"/b/%255A", "/a/%255A");
+}
+
+
 private void doTestRewrite(String config, String request, String 
expectedURI) throws Exception {
 doTestRewrite(config, request, expectedURI, null);
 }



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



svn commit: r1761500 - in /tomcat/trunk: build.xml test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 20:29:04 2016
New Revision: 1761500

URL: http://svn.apache.org/viewvc?rev=1761500&view=rev
Log:
Fix RewriteValve test failures.

Modified:
tomcat/trunk/build.xml
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1761500&r1=1761499&r2=1761500&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Sep 19 20:29:04 2016
@@ -1414,6 +1414,7 @@
 threads="${test.threads}" >
 
 
+
 
 
 

Modified: 
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1761500&r1=1761499&r2=1761500&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
Mon Sep 19 20:29:04 2016
@@ -27,6 +27,15 @@ import org.apache.catalina.startup.Tomca
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
 
+/*
+ * Implementation note:
+ *
+ * A number of these tests involve the rewrite valve returning a HTTP Location
+ * header that include un-encoded UTF-8 bytes. How the HTTP client handles 
these
+ * depends on the default character encoding configured for the JVM running the
+ * test. The tests expect the client to be configured with UTF-8 as the default
+ * encoding. Use of any other encoding is likely to lead to test failures.
+ */
 public class TestRewriteValve extends TomcatBaseTest {
 
 @Test



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



svn commit: r1761498 - /tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 20:20:35 2016
New Revision: 1761498

URL: http://svn.apache.org/viewvc?rev=1761498&view=rev
Log:
Remove the property - it doesn't help

Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java  
 (props changed)

Propchange: 
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
('svn:mime-type' removed)



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



svn commit: r1761491 - /tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 19:54:58 2016
New Revision: 1761491

URL: http://svn.apache.org/viewvc?rev=1761491&view=rev
Log:
Fix typo

Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java  
 (props changed)

Propchange: 
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
--
--- svn:mime-type (original)
+++ svn:mime-type Mon Sep 19 19:54:58 2016
@@ -1 +1 @@
-test/plain; charset=UTF-8
+text/plain; charset=UTF-8



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



[Bug 60151] JNDI Datasource lookup failure - throws javax.naming.NamingException

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60151

Per Carlson  changed:

   What|Removed |Added

 CC||per.carl...@vegvesen.no
   Severity|normal  |regression

-- 
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 60151] New: JNDI Datasource lookup failure - throws javax.naming.NamingException

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60151

Bug ID: 60151
   Summary: JNDI Datasource lookup failure - throws
javax.naming.NamingException
   Product: Tomcat 8
   Version: 8.0.37
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: per.carl...@vegvesen.no

After upgrading from Tomcat 8.0.32 to 8.0.37 all bases using Datasources
started failing.

Start of forensics:

19-Sep-2016 10:45:49.046 WARNING [localhost-startStop-1]
org.apache.naming.NamingContext.lookup Unexpected exception resolving reference
 java.lang.NullPointerException
at java.lang.Class.forName0(Native Method)
at java.lang.Class.forName(Class.java:348)
at
org.apache.naming.factory.ResourceLinkFactory.getObjectInstance(ResourceLinkFactory.java:150)
at
javax.naming.spi.NamingManager.getObjectInstance(NamingManager.java:321)
at org.apache.naming.NamingContext.lookup(NamingContext.java:847)
at org.apache.naming.NamingContext.lookup(NamingContext.java:158)
at org.apache.naming.NamingContext.lookup(NamingContext.java:835)
at org.apache.naming.NamingContext.lookup(NamingContext.java:158)
at org.apache.naming.NamingContext.lookup(NamingContext.java:835)
at org.apache.naming.NamingContext.lookup(NamingContext.java:158)
at org.apache.naming.NamingContext.lookup(NamingContext.java:835)
at org.apache.naming.NamingContext.lookup(NamingContext.java:172)
at org.apache.naming.SelectorContext.lookup(SelectorContext.java:157)
at javax.naming.InitialContext.lookup(InitialContext.java:417)
at
org.springframework.jndi.JndiTemplate$1.doInContext(JndiTemplate.java:155)
at org.springframework.jndi.JndiTemplate.execute(JndiTemplate.java:87)
at org.springframework.jndi.JndiTemplate.lookup(JndiTemplate.java:152)
at org.springframework.jndi.JndiTemplate.lookup(JndiTemplate.java:179)
at
org.springframework.jndi.JndiLocatorSupport.lookup(JndiLocatorSupport.java:95)
at
org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup.getDataSource(JndiDataSourceLookup.java:45)
at
org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration.dataSource(JndiDataSourceAutoConfiguration.java:58)
at
org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$6f321833.CGLIB$dataSource$0()
at
org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$6f321833$$FastClassBySpringCGLIB$$9024b67d.invoke()
at
org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:228)
at
org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:355)
at
org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$6f321833.dataSource()
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at
org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:162)
at
org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:588)
at
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1123)
at
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1018)
at
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:510)
at
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:482)
at
org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:306)
at
org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:230)
at
org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:302)
at
org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:197)
at
org.springframework.beans.factory.support.DefaultListableBeanFactory.findAutowireCandidates(DefaultListableBeanFactory.java:1192)
at
org.springframework.beans.factory.support.Defa

Re: Should we update version scheme information for tomcat 9?

2016-09-19 Thread Jarosław Górny
Hi,


2016-09-19 16:10 GMT+02:00 Coty Sutherland :
> OK, I've read over what I proposed again and it looks correct to me. I
> only made one change after you provided further explanation and that
> change was to add 'finalized' in the Alpha release description:
>
> +functionality required by the finalised specification and/or significant bugs
>
> I did this to further demarcate Milestone releases from Alpha
> releases. If this sounds good to everyone, I'll push it up.
>

Thanks for that! If I'm reading all of that correctly, "M-builds"
(milestones) are actually pre-alpha, right? Which means, there will be
a 9.0.0-alpha at some point. Also, I assume there might be more than
one alpha or beta release. So we can again expect something like:
9.0.0-alpha1, 9.0.0-alpha2, etc. If so, will the first alpha contain
numerical suffix. Or first one will be just 9.0.0-alpha, and prefixes
added only if it turns out there are more than one "alpha" stage
releases?

Additional note, on http://tomcat.apache.org/ Milestone builds are at
the moment referenced as "alpha", which IMVHO is confusing. For
example:

"The Apache Tomcat Project is proud to announce the release of version
9.0.0.M10 (alpha) of Apache Tomcat.(...)"

Thank you!

-- 
Jarosław Górny

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



Re: Should we update version scheme information for tomcat 9?

2016-09-19 Thread Coty Sutherland
OK, I've read over what I proposed again and it looks correct to me. I
only made one change after you provided further explanation and that
change was to add 'finalized' in the Alpha release description:

+functionality required by the finalised specification and/or significant bugs

I did this to further demarcate Milestone releases from Alpha
releases. If this sounds good to everyone, I'll push it up.

Thanks!

On Sat, Sep 17, 2016 at 12:35 PM, Jarosław Górny
 wrote:
> 2016-09-16 15:52 GMT+02:00 Mark Thomas :
>> On 16/09/2016 13:59, Coty Sutherland wrote:
>>> I'm not sure where to file a bug for this, but I produced a first pass
>>> at a patch to update the page. I'm not sure I have a solid grasp on
>>> why we're doing milestones in tc9 (other than to prevent a bunch of
>>> revisions from being releases pre-beta) so this might need some
>>> changes to convey the intent a bit better.
>>
>> Version numbers aren't the concern.
>>
>> Think of it as:
>> - Milestone - Specification JARs not complete
>> - Alpha - Specification JARs complete, other stuff (including the
>>   implementation of the specification) not complete
>> - Beta  - Feature complete, not production ready
>> - Stable- Production ready
>>
>> Once the spec is final getting to Alpha is pretty easy. Historically, we
>> haven't been this far ahead of the curve before. We've usually been
>> playing catch up so we've started with Alpha.
>>
>> Does that help?
>>
>
>
> Thanks! This is very interesting and important to what I'm doing!
>
>
> --
> Jarosław Górny
>
> -
> 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: r1761441 - in /tomcat/jk/trunk/xdocs: miscellaneous/changelog.xml reference/workers.xml

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 13:58:25 2016
New Revision: 1761441

URL: http://svn.apache.org/viewvc?rev=1761441&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58249
Add a note the the documentation that max_packet_size will be aligned to the 
next multiple of 1024 if a value is specified that is not a multiple of 1024.

Modified:
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/workers.xml

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1761441&r1=1761440&r2=1761441&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 19 13:58:25 2016
@@ -58,6 +58,11 @@
 57836: ISAPI: Empty REMOTE_USER should not be
 translated to "". (rjung)
   
+  
+58249: Add a note the the documentation that max_packet_size
+will be aligned to the next multiple of 1024 if a value is specified
+that is not a multiple of 1024. (markt)
+  
   
 58309: ISAPI: Update bundled pcre from version 5.0
 to 8.38. (rjung)

Modified: tomcat/jk/trunk/xdocs/reference/workers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/workers.xml?rev=1761441&r1=1761440&r2=1761441&view=diff
==
--- tomcat/jk/trunk/xdocs/reference/workers.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/workers.xml Mon Sep 19 13:58:25 2016
@@ -912,11 +912,12 @@ This feature is experimental and has bee
 
 
 
-This attribute sets the maximal AJP packet size in Bytes.
-The maximum value is 65536. If you change it from the default,
-you must also change the packetSize attribute of your AJP
-connector on the Tomcat side! The attribute packetSize is only available
-in Tomcat 5.5.20+ and 6.0.2+.
+This attribute sets the maximal AJP packet size in Bytes. It should be a
+multiple of 1024. Configuration values that are not a multiple of 1024 will be
+aligned to the next multiple of 1024. The maximum value is 65536. If you change
+it from the default, you must also change the packetSize attribute of
+your AJP connector on the Tomcat side! The attribute packetSize is available in
+Tomcat 6.0.2 onwards.
 
 Normally it is not necessary to change the maximum packet size. Problems
 with the default value have been reported when sending certificates or



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



[Bug 58249] Documentation regarding max_packet_size parameter not correct

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58249

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 OS||All
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Thanks for the report. This has been fixed in trunk and will be included in
1.2.42 onwards.

-- 
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 45063] JK-1.2.26 IIS ISAPI filter issue when running different identities running apppools

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=45063

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
There have been quite a few changes since 1.2.28.

I can't reproduce this with IIS7 and 1.2.42-dev built from trunk.

If this is still an issue, please provide step-by-step instructions for
creating this from a clean IIS7 install with the ISAPI redirector release.

-- 
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: r1761423 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 11:32:08 2016
New Revision: 1761423

URL: http://svn.apache.org/viewvc?rev=1761423&view=rev
Log:
Fail earlier if the client closes the connection during SNI processing.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 19 11:32:08 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759611,1760005,1760300,1760446,1760454,1760640,1760648
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,

svn commit: r1761422 - in /tomcat/trunk: java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 11:31:35 2016
New Revision: 1761422

URL: http://svn.apache.org/viewvc?rev=1761422&view=rev
Log:
Fail earlier if the client closes the connection during SNI processing.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1761422&r1=1761421&r2=1761422&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Sep 
19 11:31:35 2016
@@ -148,14 +148,19 @@ public class SecureNioChannel extends Ni
 }
 
 /**
- * Performs SSL handshake, non blocking, but performs NEED_TASK on the 
same thread.
- * Hence, you should never call this method using your Acceptor thread, as 
you would slow down
- * your system significantly.
- * The return for this operation is 0 if the handshake is complete and a 
positive value if it is not complete.
- * In the event of a positive value coming back, reregister the selection 
key for the return values interestOps.
+ * Performs SSL handshake, non blocking, but performs NEED_TASK on the same
+ * thread. Hence, you should never call this method using your Acceptor
+ * thread, as you would slow down your system significantly. If the return
+ * value from this method is positive, the selection key should be
+ * registered interestOps given by the return value.
+ *
  * @param read boolean - true if the underlying channel is readable
  * @param write boolean - true if the underlying channel is writable
- * @return int - 0 if hand shake is complete, otherwise it returns a 
SelectionKey interestOps value
+ *
+ * @return 0 if hand shake is complete, -1 if an error (other than an
+ * IOException) occurred, otherwise it returns a SelectionKey
+ * interestOps value
+ *
  * @throws IOException If an I/O error occurs during the handshake or if 
the
  * handshake fails during wrapping or unwrapping
  */
@@ -254,14 +259,19 @@ public class SecureNioChannel extends Ni
  * Peeks at the initial network bytes to determine if the SNI extension is
  * present and, if it is, what host name has been requested. Based on the
  * provided host name, configure the SSLEngine for this connection.
+ *
+ * @return 0 if SNI processing is complete, -1 if an error (other than an
+ * IOException) occurred, otherwise it returns a SelectionKey
+ * interestOps value
+ *
+ * @throws IOException If an I/O error occurs during the SNI processing
  */
 private int processSNI() throws IOException {
 // Read some data into the network input buffer so we can peek at it.
 int bytesRead = sc.read(netInBuffer);
 if (bytesRead == -1) {
-// Reached end of stream before SNI could be processed. Treat this
-// as if no SNI was present.
-return 0;
+// Reached end of stream before SNI could be processed.
+return -1;
 }
 TLSClientHelloExtractor extractor = new 
TLSClientHelloExtractor(netInBuffer);
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1761422&r1=1761421&r2=1761422&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 19 11:31:35 2016
@@ -87,6 +87,10 @@
 track this. This removes the possibility that blocking the 
non-container
 thread could trigger a deadlock. (markt)
   
+  
+Fail earlier if the client closes the connection during SNI processing.
+(markt)
+  
 
   
   



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



Re: svn commit: r1757487 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml

2016-09-19 Thread Mark Thomas
On 19/09/2016 11:13, Rémy Maucherat wrote:
> 2016-08-24 12:26 GMT+02:00 :
> 
>> Author: markt
>> Date: Wed Aug 24 10:26:08 2016
>> New Revision: 1757487
>>
>> URL: http://svn.apache.org/viewvc?rev=1757487&view=rev
>> Log:
>> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60030
>> Correct a potential infinite loop in the SNI parsing code triggered by
>> failing to handle an end of stream condition.
>>
> 
> Following an email on the user list, I don't quite understand why it
> doesn't return -1 to abort the handshake since it got an EOF from the
> network read (so it's over after that). When returning 0, it proceeds with
> a handshake while nothing is initialized (like the handshakeStatus, buffers
> to their appropriate sizes, etc.
> Did I miss something ?

I don't think so.

>From what I recall, I was aiming to keep the SNI code as unobtrusive as
possible so I went for the return value that would let processing
continue as if the SNI code had never been called.

I agree returning -1 and failing earlier would be better in this case.

Mark



>> Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureN
>> ioChannel.java
>> URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/a
>> pache/tomcat/util/net/SecureNioChannel.java?rev=1757487&r1=
>> 1757486&r2=1757487&view=diff
>> 
>> ==
>> --- 
>> tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
>> (original)
>> +++ 
>> tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
>> Wed Aug 24 10:26:08 2016
>> @@ -257,7 +257,12 @@ public class SecureNioChannel extends Ni
>>   */
>>  private int processSNI() throws IOException {
>>  // Read some data into the network input buffer so we can peek at
>> it.
>> -sc.read(netInBuffer);
>> +int bytesRead = sc.read(netInBuffer);
>> +if (bytesRead == -1) {
>> +// Reached end of stream before SNI could be processed. Treat
>> this
>> +// as if no SNI was present.
>> +return 0;
>> +}
>>  TLSClientHelloExtractor extractor = new
>> TLSClientHelloExtractor(netInBuffer);
>>
>>  while (extractor.getResult() == ExtractorResult.UNDERFLOW &&




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



[Bug 54621] [PATCH] custom mod_jk availability checks

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=54621

Mark Thomas  changed:

   What|Removed |Added

   Severity|normal  |enhancement

-- 
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 58425] validate::jk_ajp12_worker.c always returns JK_FALSE.

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58425

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #4 from Mark Thomas  ---
Thanks for the patch. This has been fixed in trunk for 1.2.42

-- 
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: r1761420 - in /tomcat/jk/trunk: native/common/jk_ajp12_worker.c xdocs/miscellaneous/changelog.xml

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 10:33:58 2016
New Revision: 1761420

URL: http://svn.apache.org/viewvc?rev=1761420&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58425
Fix regression in 1.4.41 that prevented  AJP 1.2 workers from initialising. 
Note that the AJP 1.2 protocol is deprecated.
Patch provided by yagisita.

Modified:
tomcat/jk/trunk/native/common/jk_ajp12_worker.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/common/jk_ajp12_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp12_worker.c?rev=1761420&r1=1761419&r2=1761420&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp12_worker.c Mon Sep 19 10:33:58 2016
@@ -219,6 +219,7 @@ static int JK_METHOD validate(jk_worker_
source);
 }
 }
+return JK_TRUE;
 }
 else {
 jk_log(l, JK_LOG_ERROR,

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1761420&r1=1761419&r2=1761420&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 19 10:33:58 2016
@@ -75,6 +75,11 @@
 (rjung)
   
   
+58425: Fix regression in 1.4.41 that prevented  AJP 1.2
+workers from initialising. Note that the AJP 1.2 protocol is 
deprecated.
+Patch provided by yagisita. (markt)
+  
+  
 58504: If a background thread is used to perform worker
 maintenance, ensure that maintenance runs are not skipped. Patch
 provided by Hiroto Shimizu. (markt)



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



[Bug 59184] mod_jk segmentation fault at jk_shm.c:875

2016-09-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=59184

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #12 from Mark Thomas  ---
This has been fixed in trunk and will be included in 1.2.42 onwards.

-- 
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: r1761419 - in /tomcat/jk/trunk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 10:23:46 2016
New Revision: 1761419

URL: http://svn.apache.org/viewvc?rev=1761419&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59184
HTTPD: Avoid segmentation fault if mod_jk is configured with an invalid value 
for JkShmFile. This causes the server startup to fail.

Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1761419&r1=1761418&r2=1761419&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Mon Sep 19 10:23:46 2016
@@ -3287,9 +3287,9 @@ static void jk_init(server_rec * s, ap_p
"You can remove the JkShmSize directive if you want to use the 
optimal size.");
 }
 if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) != 0) {
-jk_log(conf->log, JK_LOG_ERROR,
-   "Initializing shm:%s errno=%d. Load balancing workers will not 
function properly.",
-   jk_shm_name(), rc);
+jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
+  "Initializing shm:%s errno=%d. Unable to start due to 
shared memory failure.",
+  jk_shm_name(), rc);
 }
 
 /* SREVILAK -- register cleanup handler to clear resources on restart,

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1761419&r1=1761418&r2=1761419&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Sep 19 10:23:46 2016
@@ -3575,9 +3575,9 @@ static int init_jk(apr_pool_t * pconf, j
   apr_pool_cleanup_null);
 }
 else {
-jk_log(conf->log, JK_LOG_ERROR,
-   "Initializing shm:%s errno=%d. Load balancing workers will not 
function properly.",
-   jk_shm_name(), rc);
+jk_error_exit(JKLOG_MARK, APLOG_EMERG, s, s->process->pool,
+  "Initializing shm:%s errno=%d. Unable to start due to 
shared memory failure.",
+  jk_shm_name(), rc);
 }
 /* we add the URI->WORKER MAP since workers using AJP14
will feed it */

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1761419&r1=1761418&r2=1761419&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 19 10:23:46 2016
@@ -101,6 +101,11 @@
 specified for the worker that cannot be resolved to an IP address.
 (markt)
   
+  
+59184: HTTPD: Avoid segmentation fault if mod_jk is
+configured with an invalid value for JkShmFile. This causes the server
+startup to fail. (markt)
+  
 
   
 



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



svn commit: r1761417 - /tomcat/jk/trunk/native/STATUS.txt

2016-09-19 Thread markt
Author: markt
Date: Mon Sep 19 10:16:43 2016
New Revision: 1761417

URL: http://svn.apache.org/viewvc?rev=1761417&view=rev
Log:
Add 1.2.41 release date

Modified:
tomcat/jk/trunk/native/STATUS.txt

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1761417&r1=1761416&r2=1761417&view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Mon Sep 19 10:16:43 2016
@@ -19,7 +19,7 @@ Last modified at [$Date$]
 Release:
 
 1.2.42  : in development
-1.2.41  : release vote in progress
+1.2.41  : released August 11, 2015
 1.2.40  : released April 15, 2014
 1.2.39  : released March 11, 2014
 1.2.38  : not released



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



Re: svn commit: r1757487 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml

2016-09-19 Thread Rémy Maucherat
2016-08-24 12:26 GMT+02:00 :

> Author: markt
> Date: Wed Aug 24 10:26:08 2016
> New Revision: 1757487
>
> URL: http://svn.apache.org/viewvc?rev=1757487&view=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60030
> Correct a potential infinite loop in the SNI parsing code triggered by
> failing to handle an end of stream condition.
>

Following an email on the user list, I don't quite understand why it
doesn't return -1 to abort the handshake since it got an EOF from the
network read (so it's over after that). When returning 0, it proceeds with
a handshake while nothing is initialized (like the handshakeStatus, buffers
to their appropriate sizes, etc.
Did I miss something ?

Rémy

>
> Modified:
> tomcat/tc8.5.x/trunk/   (props changed)
> tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureN
> ioChannel.java
> tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
>
> Propchange: tomcat/tc8.5.x/trunk/
> 
> --
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Wed Aug 24 10:26:08 2016
> @@ -1 +1 @@
> -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,
> 1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,
> 1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,
> 1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,
> 1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,
> 1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,
> 1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,
> 1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-
> 1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,
> 1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,
> 1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,
> 1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,
> 1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,
> 1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,
> 1741501
>  ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,
> 1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,
> 1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,
> 1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,
> 1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,
> 1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,
> 1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,
> 1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,
> 1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,
> 1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,
> 1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-
> 1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,
> 1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,
> 1747028,1747035,1747210,1747225,1747234,1747253,
> 1747404,1747506,1747536,1747
>  924,1747980,1747993,1748001,1748253,1748452,1748547,1748629
> ,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,
> 1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,
> 1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,
> 1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,
> 1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,
> 1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,
> 1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,
> 1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,
> 1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,
> 1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,
> 1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,
> 1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,
> 1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
>  756778,1756798,1756878,1756898,1756939,1757123-1757124,
> 1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,
> 1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,
> 1757374,1757399,1757406,1757408
> +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,
> 1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,
> 1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,
> 1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,
> 1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,
> 1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,
> 1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,
> 17386

svn commit: r15408 - /dev/tomcat/tomcat-7/v7.0.72/ /release/tomcat/tomcat-7/v7.0.72/

2016-09-19 Thread violetagg
Author: violetagg
Date: Mon Sep 19 08:31:50 2016
New Revision: 15408

Log:
Release 7.0.72

Added:
release/tomcat/tomcat-7/v7.0.72/
  - copied from r15407, dev/tomcat/tomcat-7/v7.0.72/
Removed:
dev/tomcat/tomcat-7/v7.0.72/


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



svn commit: r1761396 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2016-09-19 Thread violetagg
Author: violetagg
Date: Mon Sep 19 07:46:39 2016
New Revision: 1761396

URL: http://svn.apache.org/viewvc?rev=1761396&view=rev
Log:
Update the release date for 7.0.72

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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=1761396&r1=1761395&r2=1761396&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 19 07:46:39 2016
@@ -81,7 +81,7 @@
 
   
 
-
+
   
 
   



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



Re: [RESULT][VOTE] Release Apache Tomcat 7.0.72

2016-09-19 Thread Violeta Georgieva
Hi,

2016-09-14 16:01 GMT+03:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.72 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.72/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1095/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_72/
>
> The proposed 7.0.72 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.72 Stable

+1 (binding):   mgrigorov, violetagg, fschumacher, remm
+1 (non binding):   csutherl, Sukhwinder_K, huxing

No other voters were cast.

The vote has passed.

I'll do the release shortly and announce it once the mirrors catch up.

Thanks,
Violeta