Re: Removal of libtcnative-1.dll files from /dist

2010-01-04 Thread jean-frederic clere
On 01/04/2010 01:25 AM, Konstantin Kolinko wrote:
> Hi, all!
> 
> I removed the libtcnative-1.dll files of Tomcat Native 1.1.18 from
> www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries
> 
> Those were the wrong ones, dynamically linked with apr and ssl,
> as already discussed in the "[VOTE] Release build 6.0.21" thread.
> 
> I hope that nobody minds my action.

My bad... I should have done that.

> 
> The deleted files will eventually disappear from the www.apache.org site and
> mirrors, but will be preserved on archive.apache.org.
> 
> Should we go further and request deleting them from the
> archive.apache.org as well?

+1

Cheers

Jean-Frederic

> 
> Best regards,
> Konstantin Kolinko
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 


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



Re: DO NOT REPLY [Bug 43819] Support latest JSR245 proposal to make EL "self-contained"

2010-01-04 Thread Mark Thomas
On 31/12/2009 17:55, bugzi...@apache.org wrote:
> https://issues.apache.org/bugzilla/show_bug.cgi?id=43819
> 
> --- Comment #17 from Mark Thomas  2009-12-31 09:55:14 GMT 
> ---
> (In reply to comment #16)
>> I think package org.apache.jasper.compiler needs some changes too, though 
>> this
>> might not be in the scope of this bug.
> 
> Correct. This discussion should be continued on the dev list.
> 
>> The ELParser class seems to parse
>> expressions using its own internal parsing mechanism
> 
> As far as I recall (and it is a while since I looked at the EL code) that
> parser just parses something - eg an attribute value - into bits that are an
> expression and bits that are not. It doesn't parse the actual expressions.

This isn't quite correct. The Jasper parser currently looks at:
- type of expression (${...}, #{...} or none
- functions in the expression

>> and doesn't support syntax for method invocations which is part of EE6.
> 
> Nothing does yet. That is still on the Tomcat 7 todo list. Oddly enough I am
> working on it at the moment. First step will be to update the jtt file.
> 
>> To eliminate redundancy, the code should probably be refactored to use an
>> expression factory instead.
> 
> I'm not sure that refactoring is needed.

My first attempt to add method invocation support hit an issue in that
the Jasper parser thought it was a function. In an effort of avoid
adding method invocation support to the Jasper parser and the EL parser,
I am now looking at this re-factoring.

There is an issue in that the EL parser does not provide a mechanism to
distinguish between ${...} and #{...} so Jasper will have to do a little
parsing. I've refactored this part and am currently looking to see if I
can refactor the function validation code to use the EL parser. My
current ideas are around using a function mapper that checks the TLDs
when resolve() is called during the parsing process but I haven't had a
chance to try coding it yet. Hopefully, I'll get some time early this week.

Mark



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



Re: Removal of libtcnative-1.dll files from /dist

2010-01-04 Thread Rainer Jung

On 04.01.2010 09:20, jean-frederic clere wrote:

On 01/04/2010 01:25 AM, Konstantin Kolinko wrote:

Hi, all!

I removed the libtcnative-1.dll files of Tomcat Native 1.1.18 from
www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries

Those were the wrong ones, dynamically linked with apr and ssl,
as already discussed in the "[VOTE] Release build 6.0.21" thread.

I hope that nobody minds my action.


My bad... I should have done that.



The deleted files will eventually disappear from the www.apache.org site and
mirrors, but will be preserved on archive.apache.org.

Should we go further and request deleting them from the
archive.apache.org as well?


+1


+1

I removed them from the archive at p.a.o, but I think archive needs a 
bit longer to sync (like a day or so). In case we need them back, I kept 
a copy in my home dir.


In the Mac tarball, there are the following files:

  186280 Dec 21 11:30 libtcnative-1.0.1.18.dylib
 1095200 Dec 21 11:30 libtcnative-1.a

So it seems, it contains a static library and a dynamic which is to 
small to contain a statically linked apr and OpenSSL. What we would need 
is a dynamic library with statically linked in apr and OpenSSL, right?


Should we remove the Mac-Tarball?

Henri: could you build such a tcnative dylib containing a statically 
linked apr and OpenSSL?


Regards,

Rainer

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



Re: Problem loading classes with Class.forName() in StandardContext.createWrapper()

2010-01-04 Thread Mark Thomas
On 04/01/2010 02:46, Tim Whittington wrote:
> 
No need to re-post. A ping would have sufficed.

> We've experienced similar issues integrating lots of third party libraries 
> (Tomcat being one of them) into our OSGi runtime.

Thanks for your input. I can't speak for the other Tomcat committers but
I know very little about OSGI so it is useful to have input from those
more experienced.

> Essentially this boils down to OSGi liking extension functionality to be 
> provided by instantiation in the providing bundles, and publication using 
> OSGi services. 
> (i.e. pure OSGi services or declarative services etc.). Put another way, the 
> concepts of global application classloaders where Class.forName works (ala 
> Java EE etc.) break down in OSGi. 
> 
> Libraries that use the TCCL in preference to Class.forName help, but in cases 
> like the one you describe where there's no direct invocation from the bundle 
> that has access to the classes it doesn't help. Fragment bundles (and Eclipse 
> specific buddy classloaders) also help, and we've had to use them with tools 
> like Hibernate, but they're less than ideal. 
> 
> I think the conclusion you've reached is correct - either fragment bundles 
> (which is a sub-optimal solution) or a pluggable extension loading framework 
> could be the solution. 

OK. The consensus amongst those that know OSGI seems to be some form for
pluggable extension point.

> I believe we ran into issues like this when integrating Tomcat 5.5 into our 
> OSGi runtime - we had to patch up the web app ClassLoaders at runtime to make 
> taglib loading work. 
> In that case we were able to wrap the ClassLoaders with the help of some 
> declarative metadata in bundles containing taglibs. 
> 
> If you can tell which bundles can contain implementions of whatever it is 
> you're trying to instantiate, you can construct a ClassLoader spanning those 
> bundles yourself and use that (you'd only want to use it for loading these 
> extensions, as it defeats the purpose/nature of OSGi to some extent to do 
> this). 
> It might be that the web application bundles would be all you need (and the 
> upcoming OSGi Enterprise Spec will give you a standard way of locating 
> these), and that'd probably be a reasonable limitation, or you could 
> accomodate applications partitioned to a finer degree by some additional 
> marker to include other bundles. 
> 
> The other, more OSGi approach would be for listeners to be published as OSGi 
> services with target properties, that are then just looked up by name by the 
> OSGi version of the extension loader (as opposed to instantiating them). 
> i.e. an instance of the Listener interface is published by a bundle as an 
> OSGi service with a property tomcatClassName=org.myproject.impl.MyListener. 
> The extension loader then looks up the service with a property filter on 
> 'tomcatClassName' to find the available extension. 
> OSGi apps using Tomcat would simply publish these using Declarative Services 
> or similar, and this would be a very natural approach for an OSGi app. 

Using Services does seem more in the spirit of OSGI.

> With this latter approach you have delightful lifecycle management issues 
> because of the dynamic nature of OSGi (extension bundles starting after the 
> Tomcat bundles for instance). We solve some of these with a combination of 
> declarative only metadata (using the Eclipse Extension Registry) to advertise 
> extension existence on bundle resolution, and Declarative Services to 
> instantiate and publish the actual extension, and some by having the 
> framework accept dynamic injection of extensions (Listeners come and go). 

Glad I don't have to worry about those issues :)

The main purpose of the InstanceManager is meet some of the requirements
for annotations support. As such, it is only used for instances that may
have annotations. There is one InstanceManager instance per web application.

One thing that isn't clear to me is whether the requirement is for an
extension point for web application related instances (ie things that in
a J2EE environment would be bundled in the WAR) or for container related
instances such as LifecycleListeners. The current patch in bug 48414
seems to focussed on Tomcat internals and I don't understand how the
line was drawn between what to access via the InstanceManager and what
not to.

Mark



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



svn commit: r895595 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml

2010-01-04 Thread markt
Author: markt
Date: Mon Jan  4 11:06:46 2010
New Revision: 895595

URL: http://svn.apache.org/viewvc?rev=895595&view=rev
Log: (empty)

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=895595&r1=895594&r2=895595&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan  4 11:06:46 2010
@@ -159,11 +159,6 @@
   +1: kkolinko
   -1:
 
-* Fix line-endings in src build
-  http://svn.apache.org/viewvc?rev=894831&view=rev
-  +1: markt, jfclere, kkolinko
-  -1: 
-
 * Add some missing deprecation markers
   http://svn.apache.org/viewvc?rev=895045&view=rev
   +1: markt, kkolinko (with r895057)

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=895595&r1=895594&r2=895595&view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Mon Jan  4 11:06:46 2010
@@ -88,19 +88,40 @@
 
   
   
-
+
+   
+
+
 
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
   
 
   
@@ -606,7 +627,7 @@
   
 
-  
+  
 
 
   
@@ -621,7 +642,7 @@
   
 
-  
+  
 
 



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



svn commit: r895596 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2010-01-04 Thread markt
Author: markt
Date: Mon Jan  4 11:09:38 2010
New Revision: 895596

URL: http://svn.apache.org/viewvc?rev=895596&view=rev
Log:
Update the changelog assuming 6.0.23

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

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=895596&r1=895595&r2=895596&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan  4 11:09:38 2010
@@ -33,7 +33,16 @@
   
 
 
-
+
+  
+
+  
+47609: Correct regression in previous fix. (markt)
+  
+
+  
+
+
   
 
   



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



svn commit: r895600 - /tomcat/trunk/bin/catalina.bat

2010-01-04 Thread markt
Author: markt
Date: Mon Jan  4 11:29:45 2010
New Revision: 895600

URL: http://svn.apache.org/viewvc?rev=895600&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464
Provide an option to specify the command window title
Patch provided by LiuYan

Modified:
tomcat/trunk/bin/catalina.bat

Modified: tomcat/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=895600&r1=895599&r2=895600&view=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Mon Jan  4 11:29:45 2010
@@ -68,6 +68,11 @@
 rem   Example (all one line)
 rem   set 
LOGGING_CONFIG="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
 rem
+rem   TITLE   (Optional) Specify the title of Tomcat window. The 
default
+rem   TITLE is Tomcat if it's not specified.
+rem   Example (all one line)
+rem   set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%]
+rem
 rem
 rem
 rem $Id$
@@ -224,7 +229,8 @@
 :doStart
 shift
 if not "%OS%" == "Windows_NT" goto noTitle
-set _EXECJAVA=start "Tomcat" %_RUNJAVA%
+if "%TITLE%" == "" set TITLE=Tomcat
+set _EXECJAVA=start "%TITLE%" %_RUNJAVA%
 goto gotTitle
 :noTitle
 set _EXECJAVA=start %_RUNJAVA%



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



svn commit: r895601 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-01-04 Thread markt
Author: markt
Date: Mon Jan  4 11:30:48 2010
New Revision: 895601

URL: http://svn.apache.org/viewvc?rev=895601&view=rev
Log:
Proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=895601&r1=895600&r2=895601&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan  4 11:30:48 2010
@@ -191,3 +191,9 @@
   Tested on Windows XP.
   +1: kkolinko
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464
+  Provide an option to specify the command window title
+  Patch provided by LiuYan
+  +1: markt
+  -1: 



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



DO NOT REPLY [Bug 48464] Feature request: startup.bat: -title option needed

2010-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48464

--- Comment #10 from Mark Thomas  2010-01-04 03:33:43 GMT ---
Patch looks good to me. I have applied it to trunk and proposed it for 6.0.x.

I have credited the patch to "LiuYan". If this is wrong, let me know the
correct name to use and I'll make the necessary changes.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



svn commit: r895616 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-01-04 Thread kkolinko
Author: kkolinko
Date: Mon Jan  4 12:35:07 2010
New Revision: 895616

URL: http://svn.apache.org/viewvc?rev=895616&view=rev
Log:
add patch URL and vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=895616&r1=895615&r2=895616&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan  4 12:35:07 2010
@@ -195,5 +195,6 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464
   Provide an option to specify the command window title
   Patch provided by LiuYan
-  +1: markt
+  http://svn.apache.org/viewvc?rev=895600&view=rev
+  +1: markt, kkolinko
   -1: 



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



svn propchange: r895595 - svn:log

2010-01-04 Thread kkolinko
Author: kkolinko
Revision: 895595
Modified property: svn:log

Modified: svn:log at Mon Jan  4 12:38:59 2010
--
--- svn:log (original)
+++ svn:log Mon Jan  4 12:38:59 2010
@@ -0,0 +1,6 @@
+Correct regression in previous fix for
+https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
+
+Fix src build.
+- When  is nested in a  each include can only 
specify a single pattern
+- Reference existing  in  rather than defining 
a new one


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



T&R Tomcat Native 1.1.19

2010-01-04 Thread Mladen Turk

Hi,

Version 1.1.18 wasn't properly tagged, so it
carries the 1.1.16 version in the windows binary builds
(only when you check the .dll version itself)

It's a minor issue already fixed in the SVN, so
before releasing new Tomcat I'd like we have the
native release clean.

I'll make a tag and fixed binaries by tomorrow.

Comments?

Regards
--
^TM

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



Re: T&R Tomcat Native 1.1.19

2010-01-04 Thread Henri Gomez
It's not the case in the OS/X version

2010/1/4 Mladen Turk :
> Hi,
>
> Version 1.1.18 wasn't properly tagged, so it
> carries the 1.1.16 version in the windows binary builds
> (only when you check the .dll version itself)
>
> It's a minor issue already fixed in the SVN, so
> before releasing new Tomcat I'd like we have the
> native release clean.
>
> I'll make a tag and fixed binaries by tomorrow.
>
> Comments?
>
> Regards
> --
> ^TM
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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



Re: T&R Tomcat Native 1.1.19

2010-01-04 Thread Mark Thomas
On 04/01/2010 12:59, Mladen Turk wrote:
> Hi,
> 
> Version 1.1.18 wasn't properly tagged, so it
> carries the 1.1.16 version in the windows binary builds
> (only when you check the .dll version itself)
> 
> It's a minor issue already fixed in the SVN, so
> before releasing new Tomcat I'd like we have the
> native release clean.
> 
> I'll make a tag and fixed binaries by tomorrow.
> 
> Comments?

+1

Mark



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



Re: T&R Tomcat Native 1.1.19

2010-01-04 Thread Mladen Turk

On 01/04/2010 02:10 PM, Henri Gomez wrote:

It's not the case in the OS/X version



Nope. the windows .rc file wasn't updated
before 1.1.18 tag, so when you compile a .dll
and check it's resource version, it reports 1.1.16

This can be a problem with some third party install
tools that depend on version number in .dll for
updating the file (might be even our nsis does the
same thing, so the .dll won't get overwritten if
installed over the exiting version).


Regards
--
^TM

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



Re: T&R Tomcat Native 1.1.19

2010-01-04 Thread Rainer Jung

On 04.01.2010 14:10, Henri Gomez wrote:

It's not the case in the OS/X version


Henri: are you able to build a dylib for MacOS wit statically linked in 
APR and OpenSSL libs?



2010/1/4 Mladen Turk:

Hi,

Version 1.1.18 wasn't properly tagged, so it
carries the 1.1.16 version in the windows binary builds
(only when you check the .dll version itself)

It's a minor issue already fixed in the SVN, so
before releasing new Tomcat I'd like we have the
native release clean.

I'll make a tag and fixed binaries by tomorrow.

Comments?


+1

Should we update the recommended version in AprLifecycleListener to 19?
At the moment we have recommended=17 and required=17.

Regards,

Rainer

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



EL processing enhancements for TC 7 (re: [Bug 43819] thread)

2010-01-04 Thread Konstantin Kolinko
Replying to DO NOT REPLY [Bug 43819] Support latest JSR245 proposal to
make EL "self-contained"
http://markmail.org/message/gx3zg5h47x32xdgt

2010/1/4 Mark Thomas :
>
> My first attempt to add method invocation support hit an issue in that
> the Jasper parser thought it was a function. In an effort of avoid
> adding method invocation support to the Jasper parser and the EL parser,
> I am now looking at this re-factoring.
>
> There is an issue in that the EL parser does not provide a mechanism to
> distinguish between ${...} and #{...} so Jasper will have to do a little
> parsing. I've refactored this part and am currently looking to see if I
> can refactor the function validation code to use the EL parser. My
> current ideas are around using a function mapper that checks the TLDs
> when resolve() is called during the parsing process but I haven't had a
> chance to try coding it yet. Hopefully, I'll get some time early this week.
>
> Mark
>

Will you change the parsing, or it will affect validation only? I was
not looking in the sources, so I have some difficulty to grasp what
you are mentioning above.

The following is my somewhat half-baked opinion based on my investigation
around the ${a}${b} composite expressions bug, which itself was caused
by a fix for quotes processing bugs.


1. There are certain differences in escaping rules between JSP pages,
JSP documents and EL expressions.

In the EL expressions themselves there are differences in escaping
between Literal-expressions (EL.1.2.2) (the chapter numbers are from
"Expression Language 2.2" spec) and Eval-expressions (EL.1.2.1).

The escaping rules in EL.1.3 apply to the string literals in
Eval-expressions, but not to Literal expressions.

Specifically, the following test in TestELEvaluation.java is wrong:

  assertEquals("\\", evaluateExpression(""));

It should be
  assertEquals("", evaluateExpression(""));
  assertEquals("\\", evaluateExpression("${''}"));

See also
https://jsp-spec-public.dev.java.net/issues/show_bug.cgi?id=165
and
JSP.10.1.11 Request-Time Attribute Expressions

2. I am hesitant to try fixing the EL parser right now (at least until
we release the next 6.0.x), because I suspect that it leverages
certain Jasper behavior.

3. Testing compliance with the escaping rules should involve JSP pages
and Jasper.

TCK helps here, but there are cases that it does not catch. I do not
have TCK access, but I see from bug reports that were fixed thus far.

Also the behavior triggered by
org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING property is
not tested by TCK.

4.
> parsing. I've refactored this part and am currently looking to see if I
> can refactor the function validation code to use the EL parser. My

Currently when generating Java code Jasper evaluates the composite
expressions in the following way:
a) It parses an expression and splits it into Eval and Literal
expressions, according to JSP escaping rules.
b) Literal expressions are processed as is, and only Eval expressions
are passed to the EL interpreter.
c) The result is concatenated, and has to be coerced to the expected type.

This becomes a bit complicated.

There could be another implementation: re-escape the Literal
expression (e.g. replacing '\' with ${'\\'}), recombine the
expressions and pass it to the EL interpreter.

I think that you will face these issues, so here is my warning.



Also, in the Java code generated from
/examples/jsp/jsp2/el/composite.jsp (of TC7)
I see some example, where composite EL expression is evaluated as is.
I suspect that it will exhibit the quoting bugs, but I have not payed
it much attention yet:

> org.apache.jasper.runtime.JspRuntimeLibrary.handleSetPropertyExpression(
> _jspx_page_context.findAttribute("values"), "long", "000${1}${7}",
> _jspx_page_context, null);

The above is generated from



We also have https://issues.apache.org/bugzilla/show_bug.cgi?id=48112


Best regards,
Konstantin Kolinko

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



Re: T&R Tomcat Native 1.1.19

2010-01-04 Thread Rainer Jung

On 04.01.2010 15:53, Mladen Turk wrote:

On 01/04/2010 02:10 PM, Henri Gomez wrote:

It's not the case in the OS/X version



Nope. the windows .rc file wasn't updated
before 1.1.18 tag, so when you compile a .dll
and check it's resource version, it reports 1.1.16

This can be a problem with some third party install
tools that depend on version number in .dll for
updating the file (might be even our nsis does the
same thing, so the .dll won't get overwritten if
installed over the exiting version).


That's what Mladen means:

http://svn.apache.org/viewvc?rev=893131&view=rev

The version numbers are usually updated after a release is done, the 
TCN_IS_DEV_VERSION toggle is flipped before the release to "0" and after 
the release back to "1".


Mladen fixed the rc file in the tag after tagging, so you won't find the 
bug in the tag any more.


Regards,

Rainer

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



Re: EL processing enhancements for TC 7 (re: [Bug 43819] thread)

2010-01-04 Thread Mark Thomas
On 04/01/2010 15:01, Konstantin Kolinko wrote:
> Will you change the parsing, or it will affect validation only? I was
> not looking in the sources, so I have some difficulty to grasp what
> you are mentioning above.

The current parsing is going to have to change to handle the addition of
method invocation to the unifed EL.

> 1. There are certain differences in escaping rules between JSP pages,
> JSP documents and EL expressions.
> 
> In the EL expressions themselves there are differences in escaping
> between Literal-expressions (EL.1.2.2) (the chapter numbers are from
> "Expression Language 2.2" spec) and Eval-expressions (EL.1.2.1).
> 
> The escaping rules in EL.1.3 apply to the string literals in
> Eval-expressions, but not to Literal expressions.
> 
> Specifically, the following test in TestELEvaluation.java is wrong:
> 
>   assertEquals("\\", evaluateExpression(""));
> 
> It should be
>   assertEquals("", evaluateExpression(""));
>   assertEquals("\\", evaluateExpression("${''}"));
> 
> See also
> https://jsp-spec-public.dev.java.net/issues/show_bug.cgi?id=165
> and
> JSP.10.1.11 Request-Time Attribute Expressions

I agree with your analysis. I wasn't planning on addressing any of this
at this stage.

> 2. I am hesitant to try fixing the EL parser right now (at least until
> we release the next 6.0.x), because I suspect that it leverages
> certain Jasper behavior.

+1. Past experience is that the EL implementation is very fragile.

> 3. Testing compliance with the escaping rules should involve JSP pages
> and Jasper.

+1. In Tomcat 7 it is much easier to write test cases that use an
embedded Tomcat instance for things like this. I have some test JSPs
kicking around - I'll try and add them to the Tomcat 7 code base.

> TCK helps here, but there are cases that it does not catch. I do not
> have TCK access, but I see from bug reports that were fixed thus far.

That is easy to arrange if you would like TCK access.

> Also the behavior triggered by
> org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING property is
> not tested by TCK.

Yep. More test cases required...

> 4.
>> parsing. I've refactored this part and am currently looking to see if I
>> can refactor the function validation code to use the EL parser. My
> 
> Currently when generating Java code Jasper evaluates the composite
> expressions in the following way:
> a) It parses an expression and splits it into Eval and Literal
> expressions, according to JSP escaping rules.
> b) Literal expressions are processed as is, and only Eval expressions
> are passed to the EL interpreter.
> c) The result is concatenated, and has to be coerced to the expected type.
> 
> This becomes a bit complicated.

It gets worse as Jasper then parses the Eval expression as well as
passing it to the EL code.

> There could be another implementation: re-escape the Literal
> expression (e.g. replacing '\' with ${'\\'}), recombine the
> expressions and pass it to the EL interpreter.

That is probably worth considering once the other changes are in place
to see if it simplifies things at all.

> Also, in the Java code generated from
> /examples/jsp/jsp2/el/composite.jsp (of TC7)
> I see some example, where composite EL expression is evaluated as is.
> I suspect that it will exhibit the quoting bugs, but I have not payed
> it much attention yet:
> 
>> org.apache.jasper.runtime.JspRuntimeLibrary.handleSetPropertyExpression(
>> _jspx_page_context.findAttribute("values"), "long", "000${1}${7}",
>> _jspx_page_context, null);
> 
> The above is generated from
> 
> 
> 
> We also have https://issues.apache.org/bugzilla/show_bug.cgi?id=48112

Yep. Need to look at that too.

Mark



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



Re: T&R Tomcat Native 1.1.19

2010-01-04 Thread Konstantin Kolinko
2010/1/4 Rainer Jung :
> On 04.01.2010 15:53, Mladen Turk wrote:
>>
>> On 01/04/2010 02:10 PM, Henri Gomez wrote:
>>>
>>> It's not the case in the OS/X version
>>>
>>
>> Nope. the windows .rc file wasn't updated
>> before 1.1.18 tag, so when you compile a .dll
>> and check it's resource version, it reports 1.1.16
>>
>> This can be a problem with some third party install
>> tools that depend on version number in .dll for
>> updating the file (might be even our nsis does the
>> same thing, so the .dll won't get overwritten if
>> installed over the exiting version).
>
> That's what Mladen means:
>
> http://svn.apache.org/viewvc?rev=893131&view=rev
>
> The version numbers are usually updated after a release is done, the
> TCN_IS_DEV_VERSION toggle is flipped before the release to "0" and after the
> release back to "1".
>
> Mladen fixed the rc file in the tag after tagging, so you won't find the bug
> in the tag any more.
>
> Regards,
>
> Rainer
>

The compiled "tcnative-.dll" DLLs on
http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries/win(32|64)

all show "1.1.18.0" on the Version tab in the File Properties dialog
in Windows Explorer.

The same with the ones in 6.0.22 RC binary bundles (the same files).

Am I missing something?  Do we really have a problem?


> Should we update the recommended version in AprLifecycleListener to 19?
> At the moment we have recommended=17 and required=17.

My understanding is that all .17 .. .19 are compatible. So the answer is "No".
We should update  "build.properties.default" files to pull the
up-to-date bundles when building.

BTW, TC 7 and TC 5.5 still reference 1.1.16 in their build.properties.
 Maybe that caused the confusion?

Best regards,
Konstantin Kolinko

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



Re: T&R Tomcat Native 1.1.19

2010-01-04 Thread Mladen Turk

On 01/04/2010 04:21 PM, Konstantin Kolinko wrote:


The compiled "tcnative-.dll" DLLs on
http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries/win(32|64)

all show "1.1.18.0" on the Version tab in the File Properties dialog
in Windows Explorer.

The same with the ones in 6.0.22 RC binary bundles (the same files).

Am I missing something?  Do we really have a problem?



The binaries were not produced from released 1.1.18 sources,
but rather from 1_1_18 TAG which I modified
(I know, we usually don't do that)

The problem would occur if someone wishes to build from
the 1.1.18 source release in which case he would get the
explained differenced.

Like said, it's a minor issue, but would be nice to solve
since we've post pone the 6.0.22 release anyhow.


Regards
--
^TM

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



Re: T&R Tomcat Native 1.1.19

2010-01-04 Thread Mladen Turk

On 01/04/2010 03:59 PM, Rainer Jung wrote:


Should we update the recommended version in AprLifecycleListener to 19?
At the moment we have recommended=17 and required=17.



This should be recommended=18 and required=17
since the .18 contains the SSL MITM fixes.
Required should stay at 17 cause it has required
binary compatibility.

Regards
--
^TM

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



svn commit: r895670 - in /tomcat/native/trunk/xdocs: index.xml miscellaneous/changelog.xml miscellaneous/project.xml news/2008.xml news/2009.xml news/2010.xml news/project.xml project.xml

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 15:57:23 2010
New Revision: 895670

URL: http://svn.apache.org/viewvc?rev=895670&view=rev
Log:
Clean up docs for tcnative 2.0 a bit.

Added:
tomcat/native/trunk/xdocs/news/2010.xml   (with props)
Removed:
tomcat/native/trunk/xdocs/news/2008.xml
tomcat/native/trunk/xdocs/news/2009.xml
Modified:
tomcat/native/trunk/xdocs/index.xml
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
tomcat/native/trunk/xdocs/miscellaneous/project.xml
tomcat/native/trunk/xdocs/news/project.xml
tomcat/native/trunk/xdocs/project.xml

Modified: tomcat/native/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=895670&r1=895669&r2=895670&view=diff
==
--- tomcat/native/trunk/xdocs/index.xml (original)
+++ tomcat/native/trunk/xdocs/index.xml Mon Jan  4 15:57:23 2010
@@ -45,55 +45,13 @@
 
 
 
-23 November 2009 - TC-Native-1.1.18 
released
-The Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.18 Stable.
+DD MMM  - TC-Native-2.0.0 
released
+The Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 2.0.0 Stable.
 
-Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/source/tomcat-native-1.1.18-src.tar.gz";>TC-native
 1.1.18 release sources
- | http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/source/tomcat-native-1.1.18-src.tar.gz.asc";>PGP
 signature
+Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/2.0.0/source/tomcat-native-2.0.0-src.tar.gz";>TC-native
 2.0.0 release sources
+ | http://www.apache.org/dist/tomcat/tomcat-connectors/native/2.0.0/source/tomcat-native-2.0.0-src.tar.gz.asc";>PGP
 signature
 
-Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries/";>binaries
 for selected platforms.
-
-
-
-18 November 2008 - TC-Native-1.1.16 
released
-The Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.16 Stable.
-
-Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-src.tar.gz";>TC-native
 1.1.16 release sources
- | http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-src.tar.gz.asc";>PGP
 signature
-
-Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/binaries/";>binaries
 for selected platforms.
-
-
-
-10 September 2008 - 
TC-Native-1.1.15 released
-The Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.15 Stable.
-
-Download the http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.15/source/tomcat-native-1.1.15-src.tar.gz";>TC-native
 1.1.15 release sources
- | http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.15/source/tomcat-native-1.1.15-src.tar.gz.asc";>PGP
 signature
-
-Download the http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.15/binaries/";>binaries
 for selected platforms.
-
-
-
-04 July 2008 - TC-Native-1.1.14 
released
-The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.14 Stable.
-
-Download the http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.14/source/tomcat-native-1.1.14-src.tar.gz";>TC-native
 1.1.14 release sources
- | http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.14/source/tomcat-native-1.1.14-src.tar.gz.asc";>PGP
 signature
-
-Download the http://tomcat.heanet.ie/native/";>binaries for 
selected platforms.
-
-
-
-15 February 2008 - TC-Native-1.1.13 
released
-The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.13 Stable.
-
-Download the TC-native
 1.1.13 release sources
- | PGP
 signature
-
-Download the http://tomcat.heanet.ie/native/";>binaries for 
selected platforms.
+Download the http://www.apache.org/dist/tomcat/tomcat-connectors/native/2.0.0/binaries/";>binaries
 for selected platforms.
 
 
 
@@ -181,7 +139,7 @@
   
 Use MS Visual Studio to open the workspace of the tc-native sources, 
adjust the OpenSSL includes and libraries location
 change the name of the libraries libeay32 and libssleay to libeay32MT and 
libssleayMT and build the tcn-native library.
-That should create a tcnative-1.dll.
+That should create a tcnative-2.dll.
   
 

@@ -198,11 +156,11 @@

Start tomcat and check for the messages like this ones:

-Feb 8, 2008 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
-INFO: Loaded APR based Apache Tomcat Native library 1.x.y.
-Feb 8, 2008 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
+Feb 8, 2010 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
+INFO: Loaded APR based Apache Tomcat Native library 2.x.y.
+Feb 8, 2010 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
 

svn commit: r895679 - in /tomcat/native/trunk/native: BUILDING build/rpm/tcnative.spec.in build/tcnative.m4 buildconf include/tcn_version.h libtcnative.dsp os/win32/libtcnative.rc srclib/VERSIONS tcna

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 16:18:23 2010
New Revision: 895679

URL: http://svn.apache.org/viewvc?rev=895679&view=rev
Log:
Update/fix some version numbers for tc native 2.0 (trunk).

Modified:
tomcat/native/trunk/native/BUILDING
tomcat/native/trunk/native/build/rpm/tcnative.spec.in
tomcat/native/trunk/native/build/tcnative.m4
tomcat/native/trunk/native/buildconf
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/libtcnative.dsp
tomcat/native/trunk/native/os/win32/libtcnative.rc
tomcat/native/trunk/native/srclib/VERSIONS
tomcat/native/trunk/native/tcnative.dsp

Modified: tomcat/native/trunk/native/BUILDING
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/BUILDING?rev=895679&r1=895678&r2=895679&view=diff
==
--- tomcat/native/trunk/native/BUILDING (original)
+++ tomcat/native/trunk/native/BUILDING Mon Jan  4 16:18:23 2010
@@ -44,8 +44,8 @@
   - configure --disable-openssl: Configure without ssl support.
   - To use it in Tomcat you may have to add in bin/setenv.sh:
 LD_LIBRARY_PATH=openssl_install_location/lib; export LD_LIBRARY_PATH
-(use ldd ./.libs/libtcnative-1.so to check it).
+(use ldd ./.libs/libtcnative-2.so to check it).
   - quick testing: openssl s_client -connect localhost:8443
   - For MAC OS X you must manually add a link
 cd ${tcnative installdir}
-ln -d libtcnative-1.dylib libtcnative-1.jnilib
+ln -d libtcnative-2.dylib libtcnative-2.jnilib

Modified: tomcat/native/trunk/native/build/rpm/tcnative.spec.in
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/rpm/tcnative.spec.in?rev=895679&r1=895678&r2=895679&view=diff
==
--- tomcat/native/trunk/native/build/rpm/tcnative.spec.in (original)
+++ tomcat/native/trunk/native/build/rpm/tcnative.spec.in Mon Jan  4 16:18:23 
2010
@@ -15,7 +15,8 @@
 # limitations under the License.
 #
 
-%define tcnver 1
+%define tcnver 2
+%define aprver 1
 
 Summary: Tomcat Native Java library
 Name: tcnative
@@ -26,7 +27,7 @@
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release}, 
openssl >= 0.9.7
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release}, 
openssl >= 0.9.8
 
 %description
 The mission of the Tomcat Native Library (TCN) is to provide a
@@ -36,7 +37,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Tomcat Native development kit
-Requires: tcnative = %{version}-%{release}, apr-devel >= 
0:{version}-{release}, openssl-devel >= 0.9.7
+Requires: tcnative = %{version}-%{release}, apr-devel >= 
0:{version}-{release}, openssl-devel >= 0.9.8
 
 %description devel
 The mission of the Tomcat Native Library (TCN) is to provide a
@@ -48,7 +49,7 @@
 
 %build
 %configure --with-apr=%{_prefix} \
---includedir=%{_includedir}/apr-%{tcnver}
+--includedir=%{_includedir}/apr-%{aprver}
 make %{?_smp_mflags} && make dox
 
 %check
@@ -85,10 +86,12 @@
 %{_libdir}/libtcnative-%{tcnver}.*a
 %{_libdir}/libtcnative-%{tcnver}.so
 %{_libdir}/pkgconfig/tcnative-%{tcnver}.pc
-%{_includedir}/apr-%{tcnver}/*.h
+%{_includedir}/apr-%{aprver}/*.h
 %doc --parents html
 
 %changelog
+* Mon Jan 04 2010 Rainer Jung  2.0.0-1
+- update for tcnative 2.0
 * Tue Jun 22 2004 Mladen Turk  1.0.0-1
 - update to support v1.0.2 of APR

 

Modified: tomcat/native/trunk/native/build/tcnative.m4
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=895679&r1=895678&r2=895679&view=diff
==
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Mon Jan  4 16:18:23 2010
@@ -33,10 +33,10 @@
   sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
   tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
   if test "${1}" -lt "1"; then
-AC_MSG_ERROR(You need APR version 1.2.1 or newer installed.)
+AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
   else
 if test "${2}" -lt "2"; then
-  AC_MSG_ERROR(You need APR version 1.2.1 or newer installed.)
+  AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
 fi
   fi
 
@@ -365,14 +365,11 @@
 #include 
 #include 
 int main() {
-if ((OPENSSL_VERSION_NUMBER >= 0x0090701fL &&
- OPENSSL_VERSION_NUMBER < 0x00908000L) ||
- OPENSSL_VERSION_NUMBER >= 0x0090801fL)
+if (OPENSSL_VERSION_NUMBER >= 0x009080bfL)
 return (0);
 printf("\n\nFound   OPENSSL_VERSION_NUMBER %#010x\n",
 OPENSSL_VERSION_NUMBER);
-printf("Require OPENSSL_VERSION_NUMBER 0x0090701f or greater (0.9.7a)\

svn commit: r895684 - /tomcat/native/branches/1.1.x/xdocs/index.xml

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 16:35:00 2010
New Revision: 895684

URL: http://svn.apache.org/viewvc?rev=895684&view=rev
Log:
BZ46291: Backport r728030 form tcnative trunk.
Clarification in tcnative docs.

Modified:
tomcat/native/branches/1.1.x/xdocs/index.xml

Modified: tomcat/native/branches/1.1.x/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=895684&r1=895683&r2=895684&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/index.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/index.xml Mon Jan  4 16:35:00 2010
@@ -170,8 +170,8 @@
 
 
   
-   Edit the $CATALINA_HOME/bin/setenv.sh and add the path to the tc-native 
libraries to LD_LIBRARY_PATH.
-   Something like:
+   Edit $CATALINA_HOME/bin/setenv.sh (creating the file if necessary) and add
+   the path to the tc-native libraries to LD_LIBRARY_PATH. Something like:

 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CATALINA_HOME/lib
 export LD_LIBRARY_PATH
@@ -193,8 +193,8 @@
 
 
   
-Edit the $CATALINA_BASE\bin\setenv.bat and add the path to the tc-native 
libraries, apr and OpenSSL to PATH.
-For example:
+Edit $CATALINA_BASE\bin\setenv.bat (creating the file if necessary) and add
+the path to the tc-native libraries, apr and OpenSSL to PATH. For example:
   
 set 
PATH=%PATH;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\native\Debug;C:\cygwin\home\support\tomcat-native-current-win32-src\jni\apr\Debug;C:\OpenSSL\lib\VC
   



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



svn commit: r895685 - in /tomcat/native/branches/1.1.x/xdocs: news/project.xml project.xml

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 16:36:02 2010
New Revision: 895685

URL: http://svn.apache.org/viewvc?rev=895685&view=rev
Log:
Fix whitespace, no functional change.

Modified:
tomcat/native/branches/1.1.x/xdocs/news/project.xml
tomcat/native/branches/1.1.x/xdocs/project.xml

Modified: tomcat/native/branches/1.1.x/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/project.xml?rev=895685&r1=895684&r2=895685&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/news/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/project.xml Mon Jan  4 16:36:02 2010
@@ -28,6 +28,7 @@
 
 
 
+
 
 
 
@@ -35,6 +36,6 @@
 
 
 
-
+
 
 

Modified: tomcat/native/branches/1.1.x/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/project.xml?rev=895685&r1=895684&r2=895685&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/project.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/project.xml Mon Jan  4 16:36:02 2010
@@ -29,7 +29,7 @@
 
 
 
-   
+
 
 
 



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



Re: T&R Tomcat Native 1.1.19

2010-01-04 Thread Filip Hanik - Dev Lists

On 01/04/2010 08:47 AM, Mladen Turk wrote:

On 01/04/2010 03:59 PM, Rainer Jung wrote:


Should we update the recommended version in AprLifecycleListener to 19?
At the moment we have recommended=17 and required=17.



This should be recommended=18 and required=17

but if the .18 tag is invalid, then that's kind of difficult :)

since the .18 contains the SSL MITM fixes.
Required should stay at 17 cause it has required
binary compatibility.

Regards



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



svn commit: r895689 - /tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 16:43:47 2010
New Revision: 895689

URL: http://svn.apache.org/viewvc?rev=895689&view=rev
Log:
Decouple apr major lib version form tcnative lib version
in tcnative rpm spec.

Modified:
tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in

Modified: tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in?rev=895689&r1=895688&r2=895689&view=diff
==
--- tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in (original)
+++ tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in Mon Jan  4 
16:43:47 2010
@@ -16,6 +16,7 @@
 #
 
 %define tcnver 1
+%define aprver 1
 
 Summary: Tomcat Native Java library
 Name: tcnative
@@ -48,7 +49,7 @@
 
 %build
 %configure --with-apr=%{_prefix} \
---includedir=%{_includedir}/apr-%{tcnver}
+--includedir=%{_includedir}/apr-%{aprver}
 make %{?_smp_mflags} && make dox
 
 %check
@@ -85,10 +86,12 @@
 %{_libdir}/libtcnative-%{tcnver}.*a
 %{_libdir}/libtcnative-%{tcnver}.so
 %{_libdir}/pkgconfig/tcnative-%{tcnver}.pc
-%{_includedir}/apr-%{tcnver}/*.h
+%{_includedir}/apr-%{aprver}/*.h
 %doc --parents html
 
 %changelog
+* Mon Jan 04 2010 Rainer Jung  1.0.0-2
+- Decouple apr major lib version form tcnative lib version
 * Tue Jun 22 2004 Mladen Turk  1.0.0-1
 - update to support v1.0.2 of APR

 



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



svn commit: r895697 - /tomcat/native/branches/1.1.x/native/build/tcnative.m4

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 16:50:42 2010
New Revision: 895697

URL: http://svn.apache.org/viewvc?rev=895697&view=rev
Log:
Add detection of the macosx jvm.
Backport of r803803 applied by jfclere.

Was anyone able to test that actually?

Modified:
tomcat/native/branches/1.1.x/native/build/tcnative.m4

Modified: tomcat/native/branches/1.1.x/native/build/tcnative.m4
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/tcnative.m4?rev=895697&r1=895696&r2=895697&view=diff
==
--- tomcat/native/branches/1.1.x/native/build/tcnative.m4 (original)
+++ tomcat/native/branches/1.1.x/native/build/tcnative.m4 Mon Jan  4 16:50:42 
2010
@@ -117,13 +117,13 @@
   # JAVA_PLATFORM
   AC_MSG_CHECKING([Try to guess JDK location])
 
-  for JAVA_PREFIX in /usr/local /usr/local/lib /usr /usr/lib /opt 
/usr/java ; do
+  for JAVA_PREFIX in /usr/local /usr/local/lib /usr /usr/lib /opt 
/usr/java /System/Library/Frameworks/JavaVM.framework/Versions/ ; do
 
 for JAVA_PLATFORM in 6 5 4 3 2 ; do
 
-  for subversion in .9 .8 .7 .6 .5 .4 .3 .2 .1 "" ; do
+  for subversion in .9 .8 .7 .6 .5 .4 .3 .2 .1 .0 "" ; do
 
-for VARIANT in IBMJava2- java java- jdk jdk-; do
+for VARIANT in IBMJava2- java java- jdk jdk- ""; do
   GUESS="${JAVA_PREFIX}/${VARIANT}1.${JAVA_PLATFORM}${subversion}"
 dnl   AC_MSG_CHECKING([${GUESS}])
   if test -d "${GUESS}/bin" & test -d "${GUESS}/include" ; then
@@ -131,6 +131,11 @@
 AC_MSG_RESULT([${GUESS}])
 break
   fi
+  if test -d "${GUESS}/Commands" & test -d "${GUESS}/Headers" ; 
then
+JAVA_HOME="${GUESS}"
+AC_MSG_RESULT([${GUESS}])
+break
+  fi
 done
 
 if test -n "${JAVA_HOME}" ; then



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



svn commit: r895700 - /tomcat/native/trunk/native/build/tcnative.m4

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 16:58:04 2010
New Revision: 895700

URL: http://svn.apache.org/viewvc?rev=895700&view=rev
Log:
Fix apr version test i tcnative trunk.

Modified:
tomcat/native/trunk/native/build/tcnative.m4

Modified: tomcat/native/trunk/native/build/tcnative.m4
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=895700&r1=895699&r2=895700&view=diff
==
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Mon Jan  4 16:58:04 2010
@@ -35,8 +35,12 @@
   if test "${1}" -lt "1"; then
 AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
   else
-if test "${2}" -lt "2"; then
+if test "${2}" -lt "3"; then
   AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
+else
+  if test "${2}" -lt "3"; then
+AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
+  fi
 fi
   fi
 



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



[tcnative] slight apr and openssl version confusion

2010-01-04 Thread Rainer Jung

What is the use of the file

   native/srclib/VERSIONS

in tcnative?

Ib the 1.1.x branch it contains the info:

=
Use the following version of the libraries

- APR 1.2.8, http://apr.apache.org
- OpenSSL 0.9.8e, http://www.openssl.org
=

But the build system checks for APR 1.2.1 and OpenSSL >= 0.9.7f in 
native/buildconf and native/build/tcnative.m4.


Regards,

Rainer


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



svn commit: r895703 - /tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 17:05:01 2010
New Revision: 895703

URL: http://svn.apache.org/viewvc?rev=895703&view=rev
Log:
Guess that's safe.

Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=895703&r1=895702&r2=895703&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Mon 
Jan  4 17:05:01 2010
@@ -60,7 +60,7 @@
 protected static final int TCN_REQUIRED_MINOR = 1;
 protected static final int TCN_REQUIRED_PATCH = 17;
 protected static final int TCN_RECOMMENDED_MIN = 1;
-protected static final int TCN_RECOMMENDED_PV = 17;
+protected static final int TCN_RECOMMENDED_PV = 19;
 
 
 // -- Properties



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



svn commit: r895725 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 17:49:22 2010
New Revision: 895725

URL: http://svn.apache.org/viewvc?rev=895725&view=rev
Log:
Vote, comment and add one proposal.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=895725&r1=895724&r2=895725&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan  4 17:49:22 2010
@@ -108,18 +108,23 @@
   This avoids "Bad file descriptor" errors. The period to wait is configurable.
   Based on a patch by Markus Grieder
   http://svn.apache.org/viewvc?rev=894580&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1: 
+  rjung: "process?" -> "process." in the howto.
+ In web.xml, the howto and the comments, there is sometimes
+ "stderr" and sometimes "stdErr". In order to avoid confusion
+ w.r.t. the correct name of the parameter "stderrTimeout" we
+ might use "stderr" instead of "stdErr" consistently?
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48417
   Correct French translations
   Patches provided by André Warnier
   http://svn.apache.org/viewvc?rev=894586&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1: 
   Additional patch:
   http://svn.apache.org/viewvc?rev=895013&view=rev
-  +1: kkolinko
+  +1: kkolinko, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48398
@@ -127,14 +132,14 @@
   https://issues.apache.org/bugzilla/attachment.cgi?id=24714
   https://issues.apache.org/bugzilla/attachment.cgi?id=24717
   Patches provided by sebb
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48345
   Sessions timed out too early when using PersistentManager
   Port of patch by Keiichi Fujino
   http://people.apache.org/~markt/patches/2009-12-30-bug48345.patch
-  +1: markt
+  +1: markt, rjung
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48006
@@ -144,7 +149,7 @@
   (Modify spec versions to align with Tomcat 6)
   +1: markt
   -1:
-  +1: kkolinko:
+  +1: kkolinko, rjung:
 With s/3.0/2.5/, s/2.2/2.1/, and move declaration below the '-- Constants' 
comment.
 I have doubts regarding "java.runtime.version", as that property is not 
listed in
   
http://java.sun.com/javase/6/docs/api/java/lang/System.html#getProperties%28%29
@@ -156,16 +161,17 @@
 
   Alternative patch:
   
http://people.apache.org/~kkolinko/patches/2010-01-03_bug48006_poweredBy_tc6.patch
-  +1: kkolinko
+  +1: kkolinko, rjung
   -1:
+  rjung: I'm fine with either version of the patch.
 
 * Add some missing deprecation markers
   http://svn.apache.org/viewvc?rev=895045&view=rev
-  +1: markt, kkolinko (with r895057)
+  +1: markt, kkolinko (with r895057), rjung
   -1: 
   Additional patch: (documentation, does not require voting)
   http://svn.apache.org/viewvc?rev=895057&view=rev
-  +1: kkolinko
+  +1: kkolinko, rjung
   -1:
 
 * Replace a few hard-coded copyright years with
@@ -189,8 +195,13 @@
   
http://people.apache.org/~kkolinko/patches/2010-01-03_bug48464-c4_ampersand_tc6.patch
   (a backport of revs. 895191, 895392)
   Tested on Windows XP.
-  +1: kkolinko
+  +1: kkolinko, rjung
   -1:
+  rjung: I would slightly prefer to apply after we finally managed to produce 
a working
+ release for 6.0.x, since changes in the Windows bat files are hard to 
test
+ for all possible cases, paths etc.
+ The 'set "a=%b%"' trick is nice, because if you only use the quotation
+ marks around the rhs, Windows actually adds them to the value of 'a'.
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464
   Provide an option to specify the command window title
@@ -198,3 +209,10 @@
   http://svn.apache.org/viewvc?rev=895600&view=rev
   +1: markt, kkolinko
   -1: 
+
+* Update recommended tcnative version to the forthcoming 1.1.19.
+  No update on the required version (17)
+  http://svn.apache.org/viewvc?rev=895703&view=rev
+  We should not vote before 1.1.19 is officially released.
+  +1: 
+  -1: 



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



svn commit: r895731 - /tomcat/native/trunk/native/src/sslutils.c

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 18:09:04 2010
New Revision: 895731

URL: http://svn.apache.org/viewvc?rev=895731&view=rev
Log:
Addition to r890720: Axe using STACK directly. The API uses STACK_OF.

r890720 plus this addition is identical to the fix
for BZ48129: Fix build with OpenSSL 1.0.0-beta3,
contributed by Ville Skytt.

Modified:
tomcat/native/trunk/native/src/sslutils.c

Modified: tomcat/native/trunk/native/src/sslutils.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=895731&r1=895730&r2=895731&view=diff
==
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/sslutils.c Mon Jan  4 18:09:04 2010
@@ -443,7 +443,7 @@
 /* free a perhaps already configured extra chain */
 extra_certs = SSL_CTX_get_extra_certs(ctx);
 if (extra_certs != NULL) {
-sk_X509_pop_free((STACK_OF(X509) *)extra_certs, X509_free);
+sk_X509_pop_free(extra_certs, X509_free);
 SSL_CTX_set_extra_certs(ctx,NULL);
 }
 /* create new extra chain by loading the certs */



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



svn commit: r895733 - /tomcat/native/branches/1.1.x/native/src/sslutils.c

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 18:10:44 2010
New Revision: 895733

URL: http://svn.apache.org/viewvc?rev=895733&view=rev
Log:
Addition to r890719: Axe using STACK directly. The API uses STACK_OF.

r890720 plus this addition is identical to the fix
for BZ48129: Fix build with OpenSSL 1.0.0-beta3,
contributed by Ville Skytt.

Backport of r895731.

Modified:
tomcat/native/branches/1.1.x/native/src/sslutils.c

Modified: tomcat/native/branches/1.1.x/native/src/sslutils.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslutils.c?rev=895733&r1=895732&r2=895733&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslutils.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslutils.c Mon Jan  4 18:10:44 2010
@@ -443,7 +443,7 @@
 /* free a perhaps already configured extra chain */
 extra_certs = SSL_CTX_get_extra_certs(ctx);
 if (extra_certs != NULL) {
-sk_X509_pop_free((STACK_OF(X509) *)extra_certs, X509_free);
+sk_X509_pop_free(extra_certs, X509_free);
 SSL_CTX_set_extra_certs(ctx,NULL);
 }
 /* create new extra chain by loading the certs */



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



DO NOT REPLY [Bug 48482] New: Error running two tomcats in same cluster on same Windows box

2010-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48482

   Summary: Error running two tomcats in same cluster on same
Windows box
   Product: Tomcat 6
   Version: 6.0.18
  Platform: PC
OS/Version: Windows Server 2008 (Longhorn)
Status: NEW
  Severity: major
  Priority: P2
 Component: Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: jo...@jdtangney.com


To summarize:
1) We are using 6.0.18.
2) A single Tomcat works fine and joins the cluster.
3) Two Tomcats on the SAME MACHINE (different ports - duh) but multicasting
to DIFFERENT multicast IPs each join their respective clusters. (yes, two
clusters.)
4) Two Tomcats on the SAME machine multicasting to the SAME multicast IP and
we get "An operation was attempted on something that is not a socket" when
we launch the second tomcat.
5) The exact setup works fine on RHEL and Mac OS X

* This is NOT the 6.0.20 regression
(https://issues.apache.org/bugzilla/show_bug.cgi?id=47308) – we're using
6.0.18.
* This is NOT an issue with Windows getting confused by the bind attribute – it
works fine in cases 2 & 3 above.

Could it be that windows won't allow two apps to multicast to the same address
at the same time?

Here is some log output:
INFO: Initializing Coyote HTTP/1.1 on http-8180
Dec 22, 2009 2:17:07 PM org.apache.catalina.startup.Catalina load
INFO: Initialization processed in 332 ms
Dec 22, 2009 2:17:07 PM org.apache.catalina.core.StandardService start
INFO: Starting service Catalina
Dec 22, 2009 2:17:07 PM org.apache.catalina.core.StandardEngine start
INFO: Starting Servlet Engine: Apache Tomcat/6.0.18
Dec 22, 2009 2:17:07 PM org.apache.catalina.ha.tcp.SimpleTcpCluster start
INFO: Cluster is about to start
Dec 22, 2009 2:17:07 PM org.apache.catalina.tribes.transport.ReceiverBase bind
INFO: Receiver Server Socket bound to:/10.5.1.102:4000
Dec 22, 2009 2:17:07 PM org.apache.catalina.tribes.membership.McastServiceImpl
setupSocket
INFO: Attempting to bind the multicast socket to /224.0.0.0:45564
Dec 22, 2009 2:17:07 PM org.apache.catalina.tribes.membership.McastServiceImpl
setupSocket
INFO: Setting multihome multicast interface to:/10.5.1.102
Dec 22, 2009 2:17:07 PM org.apache.catalina.ha.tcp.SimpleTcpCluster start
SEVERE: Unable to start cluster.
org.apache.catalina.tribes.ChannelException: java.net.SocketException: An
operation was attempted on something that is not a socket; No faulty members
identified.
...
Caused by: java.net.SocketException: An operation was attempted on something
that is not a socket

--
Reply from Konstantin Kolinko:
"An operation was tried on something that is not a socket." is the
message that corresponds to the WinSock error code WSAENOTSOCK
(10038), see here:
http://support.microsoft.com/kb/819124

>From TC 6.0.18 source bundle and from JDK sources it can be seen that
Line 206 in McastServiceImpl is
socket.setInterface(mcastBindAddress);
and that results in some setOption(SocketOptions.IP_MULTICAST_IF) call
that goes into native code.
see java.net.SocketOptions



Regarding the listening on the same address/port:

With some search I found the following blog entry by Anthony Wong:
http://blogs.msdn.com/anthonywong/archive/2005/09/30/475884.aspx
that says:

[cite]
Because multicasting is a one to many communication, there maybe some
occasions when you would like multiple UdpClient instances on the same
machine to receive data from the same multicast group and port. To do
this, you would need to set the SO_REUSEADDR socket option before
joining the multicast group.
[/cite]

The relevant option in java.net.SocketOptions is
SocketOption.SO_REUSEADDR and it is settable through
DatagramSocket.setReuseAddress().

The JavaDoc for SO_REUSEADDR says that "it is set by default for
MulticastSockets", and it is indeed so:  you can see in JDK sources
that java.net.MulticastSocket class constructor calls
setReuseAddress(true).
The JavaDoc for setReuseAddress() says that support for this option is
system-dependent, and also suggests you to check result of
getReuseAddress(), that "will be false if it is not supported".


In the list of errors there is WSAEADDRINUSE error (Address already in
use).  I wondered why it was not used, because it is directly relevant
to the SO_REUSEADDR, if that is actually the cause, but I see that
that WSAEADDRINUSE is not listed among the codes returned by the
setsockopt() socket API function:
http://www.sockets.com/winsock.htm#SetSockOpt
http://msdn.microsoft.com/en-us/library/ms740476%28VS.85%29.aspx

WSAEADDRINUSE error code is returned by the bind() operation.



Returning back to the java code of McastServiceImpl.java of tribes
TC 6.0.18:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?view=markup

Current code:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/Mcas

DO NOT REPLY [Bug 48129] [PATCH] Fix build with OpenSSL 1.0.0-beta3

2010-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48129

Rainer Jung  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Rainer Jung  2010-01-04 10:15:19 
UTC ---
Thanks for the patch

It has been applied to tcnative trunk in r895731 plus r890720 and to tcnative
branch 1.1.x in r895733 plus r890719.

The patch will be part of tcnative 1.1.19.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



svn commit: r895737 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

2010-01-04 Thread rjung
Author: rjung
Date: Mon Jan  4 18:16:02 2010
New Revision: 895737

URL: http://svn.apache.org/viewvc?rev=895737&view=rev
Log:
Update changelog.

Modified:
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=895737&r1=895736&r2=895737&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Jan  4 
18:16:02 2010
@@ -36,6 +36,17 @@
   new documentation project for Tomcat Native was started.
   
 
+
+  
+
+  48129: Fix build with OpenSSL 1.0.0-beta3.
+  Patch provided by Ville Skytt. (mturk, rjung)
+
+
+  Add detection of the Mac OS X JVM. (rjung)
+
+  
+
 
   
 



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



DO NOT REPLY [Bug 48129] [PATCH] Fix build with OpenSSL 1.0.0-beta3

2010-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48129

Ville Skyttä  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 CC||rainer.j...@kippdata.de
 Resolution|FIXED   |

--- Comment #2 from Ville Skyttä  2010-01-04 11:32:12 UTC 
---
Thank you for applying the patch, but it seems I have been kind of miscredited
for it - its original author is Tomas Mraz (tmraz at redhat.com) - see my
initial comment here.

Reopening, requesting correction of fix authorship in change log.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47679] Not all headers get passed to Tomcat server from isapi_redirect.dll

2010-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47679

--- Comment #1 from Tim Whittington  
2010-01-04 11:46:04 UTC ---
This is interesting - I seem to remember testing on Windows 2000 Server when
making changes to this area, and the AUTH_COMPLETE was firing.

Depending on whether your connector was built with automatic notification event
detection (mine are, but not sure about the ones available via Tomcat) you may
be able to force the use of SF_NOTIFY_PREPROC_HEADERS by setting
auth_complete=0 in your configuration.

I don't think your proposed patch will work - trapping the appropriate notify
event in HttpFilterProc is necessary for the redirector to work (all of the URI
-> worker mapping happens there).

The fix should be to make automatic flag detection work on Windows 2000
(reliably), or simply to use the manual override with an appropriately built
connector.

Perhaps some additional error checking in HttpExtensionProc to check if the
filter has executed correctly would also be in order.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



Re: svn commit: r895700 - /tomcat/native/trunk/native/build/tcnative.m4

2010-01-04 Thread Konstantin Kolinko
2010/1/4  :
> Author: rjung
> Date: Mon Jan  4 16:58:04 2010
> New Revision: 895700
>
> URL: http://svn.apache.org/viewvc?rev=895700&view=rev
> Log:
> Fix apr version test i tcnative trunk.
>
> Modified:
>    tomcat/native/trunk/native/build/tcnative.m4
>

> --- tomcat/native/trunk/native/build/tcnative.m4 (original)
> +++ tomcat/native/trunk/native/build/tcnative.m4 Mon Jan  4 16:58:04 2010
> @@ -35,8 +35,12 @@
>   if test "${1}" -lt "1"; then
>     AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
>   else
> -    if test "${2}" -lt "2"; then
> +    if test "${2}" -lt "3"; then
>       AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
> +    else
> +      if test "${2}" -lt "3"; then
> +        AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
> +      fi
>     fi
>   fi
>

I do not understand the above. What is the difference between these checks? :
> +if test "${2}" -lt "3"; then
> +  if test "${2}" -lt "3"; then

Best regards,
Konstantin Kolinko

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



DO NOT REPLY [Bug 48069] Log Files not getting updated while using isapi_redirect.properties

2010-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48069

--- Comment #4 from Tim Whittington  
2010-01-04 11:57:35 UTC ---
Process Monitor should also tell your if the log file is being created and/or
written to.

The code paths for the properties file and registry settings methods are
identical apart from the reading of the actual config values, and the log file
config definitely works for me in the properties file.

The obvious options appear to be:
- The configuration file is invalid in some way, so the redirector is not
initializing correctly. Is the filter showing up as correctly loaded in IIS?
Are redirections actually working?
- The value for the log file param being loaded via the properties file is
invalid in some way (i.e. invisible characters). Try creating the file from
scratch and/or checking in a text editor with a hex mode.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 48069] Log Files not getting updated while using isapi_redirect.properties

2010-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48069

--- Comment #5 from David Esposito  2010-01-04 12:39:31 UTC 
---
No, the redirector wasn't working. Unfortunately, it's been a little while
since I tried to get this working so the details are a bit foggy but I was
getting either a 500 or 503 server error and when I turned on detailed output,
it was due to a problem with loading the DLL .. an exit code of
0x80---something 

I tried both the 64 and 32 bit builds, and tried both the "-chunking" and
non-chunking builds. All yielded the same output.

I apologize for the poor detail. Attached is the config file I was trying to
use. There was no entry in Process Monitor for trying to create or open the log
file, I'm sure of that.

I scrolled back in EventViewer and I believe this is one of the events that was
being raised whenever I tried to restart IIS or the application pool:

- http://schemas.microsoft.com/win/2004/08/events/event";>
- 
   
  2214 
  0 
  2 
  0 
  0 
  0x80 
   
  814 
   
   
  Application 
  bnw1.cloud.bargainnews.com 
   
  
- 
  D:\jboss-4.2.3.GA\bin\isapi_redirect-1.2.28-chunking.dll
 
  0200 
  
  

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



DO NOT REPLY [Bug 48069] Log Files not getting updated while using isapi_redirect.properties

2010-01-04 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48069

--- Comment #6 from David Esposito  2010-01-04 12:40:40 UTC 
---
Created an attachment (id=24794)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24794)
properties file I was using when using the non-chunking build of the DLL

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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



svn commit: r895815 - /tomcat/trunk/build.properties.default

2010-01-04 Thread kkolinko
Author: kkolinko
Date: Mon Jan  4 22:48:58 2010
New Revision: 895815

URL: http://svn.apache.org/viewvc?rev=895815&view=rev
Log:
Update version of tomcat-native included in TC binary bundles and Windows 
installer to 1.1.18.

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=895815&r1=895814&r2=895815&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jan  4 22:48:58 2010
@@ -65,10 +65,10 @@
 
jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
 
 # - Tomcat native library -
-tomcat-native.version=1.1.16
+tomcat-native.version=1.1.18
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
 
tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
 
 # - Commons DBCP, version 1.1 or later -



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



Re: svn commit: r894577 - /tomcat/trunk/conf/web.xml

2010-01-04 Thread Konstantin Kolinko
2009/12/30  :
> Author: markt
> Date: Wed Dec 30 10:13:05 2009
> New Revision: 894577
>
> URL: http://svn.apache.org/viewvc?rev=894577&view=rev
> Log:
> Update to 3.0 schema
>
> Modified:
>    tomcat/trunk/conf/web.xml
>

> Modified: tomcat/trunk/conf/web.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=894577&r1=894576&r2=894577&view=diff
> ==
> --- tomcat/trunk/conf/web.xml (original)
> +++ tomcat/trunk/conf/web.xml Wed Dec 30 10:13:05 2009
> @@ -16,9 +16,9 @@
>   limitations under the License.
>  -->
>  http://java.sun.com/xml/ns/javaee";
> -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
> -    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
> http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
> -    version="2.5">
> +  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
> +  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
> +  version="3.0">
>

The xsi:schemaLocation attribute above is wrong. It should be a pair of URLs.

http://www.w3.org/TR/xmlschema-1/
-> ch.4.3.2 How schema definitions are located on the Web
"The first records the author's warrant with pairs of URI references
(one for the namespace name, and one for a hint as to the location of
a schema document defining names for that namespace name)"

Best regards,
Konstantin Kolinko

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



svn commit: r895840 - /tomcat/tc5.5.x/trunk/STATUS.txt

2010-01-04 Thread kkolinko
Author: kkolinko
Date: Tue Jan  5 00:47:02 2010
New Revision: 895840

URL: http://svn.apache.org/viewvc?rev=895840&view=rev
Log:
proposals

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=895840&r1=895839&r2=895840&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan  5 00:47:02 2010
@@ -150,7 +150,18 @@
   Based on a patch provided by sebb
   http://people.apache.org/~markt/patches/2009-12-31-bug47609.patch
   +1: markt
-  -1: 
+  -1: kkolinko: 1) extra comma in "*.java" pattern, 2) missing
+   extentionless names, 3) native sources are no more included, so *.c etc.
+   patterns are not needed.
+
+  Corrected patch:
+  I should add that this patch is required, because otherwise the *.keystore
+  files used in storeconfig[-ha] module tests become broken in the -src.tar.gz
+  bundle.
+  http://people.apache.org/~kkolinko/patches/2010-01-05_tc55_bug47609.patch
+  +1: kkolinko
+  -1:
+
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47718
   Correct file descriptor leak on context stop/reload
@@ -238,3 +249,17 @@
   http://svn.apache.org/viewvc?rev=892812&view=rev
   +1: kkolinko
   -1:
+
+* Update Tomcat-Native included in TC distributives to 1.1.18
+  (or 1.1.19 if that will be officially released at the time when this
+  patch is to be applied)
+  http://people.apache.org/~kkolinko/patches/2010-01-05_tc55_native-x18.patch
+  +1: kkolinko
+  -1:
+
+* Update recommended tcnative version to the forthcoming 1.1.19.
+  No update on the required version (17)
+  http://svn.apache.org/viewvc?rev=895703&view=rev
+  We should not vote before 1.1.19 is officially released.
+  +1: 
+  -1: 



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