[Tomcat Wiki] Update of "PoweredBy" by RonAnderson

2011-06-29 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "PoweredBy" page has been changed by RonAnderson:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=346&rev2=347

  [[http://www.service-repository.com/|Service-Repository]] - Registry of 
public SOAP Web Services and dynamic client UI
  
  === Shoppingkaiser.de ===
- {{http://static.shoppingkaiser.de/images/Logo.jpg}} 
[[http://www.shoppingkaiser.de/|Shoppingkaiser]] - Global Searchsite for 
currently expiring eBay Auctions. Based on a nosql lucene database.
+ {{http://static.shoppingkaiser.de/images/Logo.jpg}} 
[[http://www.shoppingkaiser.de/|Shoppingkaiser]] - Global Searchsite for 
currently expiring eBay Auctions. Based on a nosql lucene database 
[[http://cheapestoemsoftware.com/|oem software]].
  
  === Sparus Software ===
  
[[http://www.sparus-software.com|{{http://www.sparus-software.com/style/images/a_logosparusint.gif|http://www.sparus-software.com}}]]
 
[[http://www.sparus-software.com/Device-Management/Products/EveryWAN-Mobility-Manager,42/The-Next-Generation-Solution-for.html|EveryWAN
 Mobility Manager, Windows Mobile device management and security solution]], 
includes Tomcat.

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



DO NOT REPLY [Bug 51437] JVM crash when SSL connector is enabled

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51437

--- Comment #5 from oscar  2011-06-29 07:31:42 UTC ---
Hi Mark, 

I have tried without the SSLCACertificateFile key but system raises the same
error at startup.

presidencia.key does not require password.

Note that the certificate I'm using (crt + key + pem) is correctly working on
another apache we have in our infraestructure.

Thanks a lot.

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

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



DO NOT REPLY [Bug 51437] JVM crash when SSL connector is enabled

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51437

--- Comment #6 from Mladen Turk  2011-06-29 07:51:14 UTC ---
By "another Apache" are you thinking of Apache Tomcat or Apache Http?
And yes, the crash happens before CA file.
If not sensitive can you send me privately those certs, since I newer saw this
kind of error.

-- 
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 51437] JVM crash when SSL connector is enabled

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51437

--- Comment #7 from oscar  2011-06-29 08:00:54 UTC ---
Hi,

I meant another apache web server (httpd).

Where can I send to you the certs ?

Thanks a lot.

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

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



DO NOT REPLY [Bug 51437] JVM crash when SSL connector is enabled

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51437

--- Comment #8 from oscar  2011-06-29 08:03:16 UTC ---
I have found your email and I have sent to you the certificates.

-- 
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 42554] mod_ssl + mod_jk with status_worker does not work on a single node cluster.

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=42554

oscar  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WONTFIX

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



[Tomcat Wiki] Update of "LocalBadContent" by KonstantinKolinko

2011-06-29 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "LocalBadContent" page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=20&rev2=21

Comment:
Add recent spam addresses

  buyyourall\.com
  casinolehrer
  chatsky\.cn
+ cheapestoemsoftware
  dreamstation\.com
  dunky\.info
  easyday\.cn

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



DO NOT REPLY [Bug 51443] Cluster manager documentation gives invalid attribute name

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51443

--- Comment #3 from Dmitry Mikhaylov  2011-06-29 
10:11:33 UTC ---
Thanks a lot!

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

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



Re: svn commit: r1140801 - in /tomcat/trunk: java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml

2011-06-29 Thread Keiichi Fujino
2011/6/29  :
> Author: markt
> Date: Tue Jun 28 19:32:39 2011
> New Revision: 1140801
>
> URL: http://svn.apache.org/viewvc?rev=1140801&view=rev
> Log:
> Notifications of changes in session ID to other nodes in the cluster should 
> be controlled by notifySessionListenersOnReplication rather than 
> notifyListenersOnReplication.
>
> Modified:
>    tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
>    tomcat/trunk/webapps/docs/changelog.xml
>
> Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1140801&r1=1140800&r2=1140801&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue 
> Jun 28 19:32:39 2011
> @@ -1463,7 +1463,7 @@ public CatalinaCluster getCluster() {
>         if (session != null) {
>             String newSessionID = deserializeSessionId(msg.getSession());
>             session.setPrimarySession(false);
> -            session.setId(newSessionID, notifyListenersOnReplication);
> +            session.setId(newSessionID, notifySessionListenersOnReplication);
>         }
>     }
>
>

A primary node never trigger a notification to any session listeners.
It notifies container event listener now.
Should non-primary node be same behavior as a primary node?

If it notifies not session listener but container event listener,
I will add some changes below.

Comments?

===
Index: java/org/apache/catalina/ha/session/DeltaManager.java
===
--- java/org/apache/catalina/ha/session/DeltaManager.java   (revision 
1140984)
+++ java/org/apache/catalina/ha/session/DeltaManager.java   (working copy)
@@ -97,6 +97,7 @@
 private boolean expireSessionsOnShutdown = false;
 private boolean notifyListenersOnReplication = true;
 private boolean notifySessionListenersOnReplication = true;
+private boolean notifyChangeSessionIDEventOnReplication = true;
 private volatile boolean stateTransfered = false ;
 private int stateTransferTimeout = 60;
 private boolean sendAllSessions = true;
@@ -420,6 +421,14 @@
 this.notifyListenersOnReplication = notifyListenersOnReplication;
 }

+public boolean isNotifyChangeSessionIDEventOnReplication() {
+return notifyChangeSessionIDEventOnReplication;
+}
+
+public void setNotifyChangeSessionIDEventOnReplication(
+boolean notifyChangeSessionIDEventOnReplication) {
+this.notifyChangeSessionIDEventOnReplication =
notifyChangeSessionIDEventOnReplication;
+}

@Override
 public CatalinaCluster getCluster() {
@@ -1463,7 +1472,11 @@
 if (session != null) {
 String newSessionID = deserializeSessionId(msg.getSession());
 session.setPrimarySession(false);
-session.setId(newSessionID, notifySessionListenersOnReplication);
+session.setId(newSessionID, false);
+if (notifyChangeSessionIDEventOnReplication) {
+
getContainer().fireContainerEvent(Context.CHANGE_SESSION_ID_EVENT,
+new String[] {msg.getSessionID(), newSessionID});
+}
 }
 }


===


-- 
Keiichi.Fujino

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



DO NOT REPLY [Bug 50646] Tribes ByteMessage will get corrupted if message size exceeds the underlying buffer size

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50646

--- Comment #3 from Ronald Klop  2011-06-29 10:53:45 UTC ---
Oliver, Mark,
Is it possible that this is an issue on Tomcat 6 also?

This is suggested in this mail:
http://marc.info/?l=tomcat-user&m=130924994205157&w=2

-- 
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 50646] Tribes ByteMessage will get corrupted if message size exceeds the underlying buffer size

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50646

Mark Thomas  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
  Component|Cluster |Cluster
Version|7.0.6   |6.0.32
 Resolution|FIXED   |
Product|Tomcat 7|Tomcat 6
   Target Milestone|--- |default

--- Comment #4 from Mark Thomas  2011-06-29 10:56:07 UTC ---
Quite possibly.

-- 
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: r1140801 - in /tomcat/trunk: java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml

2011-06-29 Thread Mark Thomas
On 29/06/2011 11:36, Keiichi Fujino wrote:
> 2011/6/29  :
>> Author: markt
>> Date: Tue Jun 28 19:32:39 2011
>> New Revision: 1140801
>>
>> URL: http://svn.apache.org/viewvc?rev=1140801&view=rev
>> Log:
>> Notifications of changes in session ID to other nodes in the cluster should 
>> be controlled by notifySessionListenersOnReplication rather than 
>> notifyListenersOnReplication.



> A primary node never trigger a notification to any session listeners.
> It notifies container event listener now.
> Should non-primary node be same behavior as a primary node?

I think you are right. The session event should not be fired on primary
or backup nodes but the container event should be fired on the primary
and optionally on the backup.

> If it notifies not session listener but container event listener,
> I will add some changes below.
> 
> Comments?
> 
> ===
> Index: java/org/apache/catalina/ha/session/DeltaManager.java
> ===
> --- java/org/apache/catalina/ha/session/DeltaManager.java (revision 
> 1140984)
> +++ java/org/apache/catalina/ha/session/DeltaManager.java (working copy)
> @@ -97,6 +97,7 @@
>  private boolean expireSessionsOnShutdown = false;
>  private boolean notifyListenersOnReplication = true;
>  private boolean notifySessionListenersOnReplication = true;
> +private boolean notifyChangeSessionIDEventOnReplication = true;

Maybe call this notifyContainerListenersOnReplication to allow for
possible re-use for other events (not that I can think of any right now).

Mark

>  private volatile boolean stateTransfered = false ;
>  private int stateTransferTimeout = 60;
>  private boolean sendAllSessions = true;
> @@ -420,6 +421,14 @@
>  this.notifyListenersOnReplication = notifyListenersOnReplication;
>  }
> 
> +public boolean isNotifyChangeSessionIDEventOnReplication() {
> +return notifyChangeSessionIDEventOnReplication;
> +}
> +
> +public void setNotifyChangeSessionIDEventOnReplication(
> +boolean notifyChangeSessionIDEventOnReplication) {
> +this.notifyChangeSessionIDEventOnReplication =
> notifyChangeSessionIDEventOnReplication;
> +}
> 
> @Override
>  public CatalinaCluster getCluster() {
> @@ -1463,7 +1472,11 @@
>  if (session != null) {
>  String newSessionID = deserializeSessionId(msg.getSession());
>  session.setPrimarySession(false);
> -session.setId(newSessionID, notifySessionListenersOnReplication);
> +session.setId(newSessionID, false);
> +if (notifyChangeSessionIDEventOnReplication) {
> +
> getContainer().fireContainerEvent(Context.CHANGE_SESSION_ID_EVENT,
> +new String[] {msg.getSessionID(), newSessionID});
> +}
>  }
>  }
> 
> 
> ===
> 
> 




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



response.encodeURL("http://localhost:8080") produces an invalid URL?

2011-06-29 Thread Rainer Jung
Motivated by

https://issues.apache.org/jira/browse/WICKET-3841

I tested response.encodeURL("http://localhost:8080";) and I get
http://localhost:8080;jsessionid=... (cookies off).

Note that there is no slash between the port and the sessionid path info.

According to my reading of RFC3986 (URIs), the input URI is a correct
URI, the resulting URI is not: because it has an authority, the rest
must be zero or more path-abempty, which always start with a slash.

Did anyone stumble over this yet? If there's no objections, I'll write a
patch and check, what the TCK has to say.

The spec does not see to contain any specification of encodeURL apart
from the JavaDoc.

Regards,

Rainer


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



DO NOT REPLY [Bug 50646] Tribes ByteMessage will get corrupted if message size exceeds the underlying buffer size

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50646

Ronald Klop  changed:

   What|Removed |Added

 CC||ron...@echteman.nl

-- 
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: r1141048 - in /tomcat/trunk/java/org/apache/coyote: ajp/AjpAprProtocol.java ajp/AjpNioProtocol.java ajp/AjpProtocol.java http11/Http11AprProtocol.java http11/Http11NioProtocol.java http11/

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 11:19:55 2011
New Revision: 1141048

URL: http://svn.apache.org/viewvc?rev=1141048&view=rev
Log:
If the socket is closed (i.e. due to an error) no need to postProcess

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Jun 29 
11:19:55 2011
@@ -152,7 +152,7 @@ public class AjpAprProtocol extends Abst
 state = processor.process(socket);
 }
 
-if (processor.isAsync()) {
+if (state == SocketState.CLOSED && processor.isAsync()) {
 state = processor.asyncPostProcess();
 }
 } while (state == SocketState.ASYNC_END);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Wed Jun 29 
11:19:55 2011
@@ -190,7 +190,7 @@ public class AjpNioProtocol extends Abst
 state = processor.process(socket);
 }
 
-if (processor.isAsync()) {
+if (state == SocketState.CLOSED && processor.isAsync()) {
 state = processor.asyncPostProcess();
 }
 } while (state == SocketState.ASYNC_END);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Wed Jun 29 
11:19:55 2011
@@ -143,7 +143,7 @@ public class AjpProtocol extends Abstrac
 state = processor.process(socket);
 }
 
-if (processor.isAsync()) {
+if (state == SocketState.CLOSED && processor.isAsync()) {
 state = processor.asyncPostProcess();
 }
 } while (state == SocketState.ASYNC_END);

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Wed Jun 
29 11:19:55 2011
@@ -237,7 +237,7 @@ public class Http11AprProtocol extends A
 state = processor.process(socket);
 }
 
-if (processor.isAsync()) {
+if (state != SocketState.CLOSED && processor.isAsync()) {
 state = processor.asyncPostProcess();
 }
 } while (state == SocketState.ASYNC_END);

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1141048&r1=1141047&r2=1141048&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Jun 
29 11:19:55 2011
@@ -266,7 +266,7 @@ public class Http11NioProtocol extends A
 state = processor.process(socket);
 }
 
-if (processor.isAsync()) {
+if (state != SocketState.CLOSED && processor.isAsync()) {
 state = processor.asyncPostProcess();
 }
 } while (state == SocketState.ASYNC_

Re: response.encodeURL("http://localhost:8080") produces an invalid URL?

2011-06-29 Thread Konstantin Kolinko
2011/6/29 Rainer Jung :
> Motivated by
>
> https://issues.apache.org/jira/browse/WICKET-3841
>
> I tested response.encodeURL("http://localhost:8080";) and I get
> http://localhost:8080;jsessionid=... (cookies off).
>
> Note that there is no slash between the port and the sessionid path info.
>
> According to my reading of RFC3986 (URIs), the input URI is a correct
> URI, the resulting URI is not: because it has an authority, the rest
> must be zero or more path-abempty, which always start with a slash.
>
> Did anyone stumble over this yet? If there's no objections, I'll write a
> patch and check, what the TCK has to say.
>
> The spec does not see to contain any specification of encodeURL apart
> from the JavaDoc.
>

>From RFC3986 alone I agree that
1) http://localhost:8080
looks like a valid URL by RFC3986.
(like any other URL without a trailing slash, e.g. mailto:)

>From HTTP standpoint it should be http://localhost:8080/ and in my
experience browsers add the trailing slash automatically. I have not
looked whether the actual HTTP spec is more strict regarding such
URLs.

2) http://localhost:8080;jsessionid=...
is an invalid URL.

I am +1 to use "/" as the path if it is an absolute URL, scheme is
http or https and the path is empty. (I guess that there is a check
for the scheme name already?).

So that it becomes
http://localhost:8080/;jsessionid=...

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 51436] ServletRequestListener fails to access request parameters when an Expect-Header is sent

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51436

--- Comment #2 from Simon Olofsson  2011-06-29 11:57:44 UTC 
---
Great, thanks Mark.

-- 
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 51450] New: Spanish translation "_es.properties" files

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51450

 Bug #: 51450
   Summary: Spanish translation "_es.properties" files
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Integration
AssignedTo: dev@tomcat.apache.org
ReportedBy: je...@aplsoftware.com
Classification: Unclassified


Spanish translations for recent changed/added properties

-- 
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: r1141066 - in /tomcat/trunk: java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ webapps/docs/

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 12:12:48 2011
New Revision: 1141066

URL: http://svn.apache.org/viewvc?rev=1141066&view=rev
Log:
Ensure an access log entry is made if an error occurs during asynchronous 
request processing and the socket is immediately closed.

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1141066&r1=1141065&r2=1141066&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Wed Jun 
29 12:12:48 2011
@@ -465,10 +465,13 @@ public abstract class AbstractAjpProcess
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
getLog().error(sm.getString("http11processor.request.process"), t);
-   // 500 - Internal Server Error
-   response.setStatus(500);
-   adapter.log(request, response, 0);
error = true;
+   } finally {
+   if (error) {
+   // 500 - Internal Server Error
+   response.setStatus(500);
+   adapter.log(request, response, 0);
+   }
}
 
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1141066&r1=1141065&r2=1141066&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Wed Jun 
29 12:12:48 2011
@@ -355,10 +355,13 @@ public class Http11AprProcessor extends 
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
 log.error(sm.getString("http11processor.request.process"), t);
-// 500 - Internal Server Error
-response.setStatus(500);
-adapter.log(request, response, 0);
 error = true;
+} finally {
+if (error) {
+// 500 - Internal Server Error
+response.setStatus(500);
+adapter.log(request, response, 0);
+}
 }
 
 rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1141066&r1=1141065&r2=1141066&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed Jun 
29 12:12:48 2011
@@ -219,10 +219,13 @@ public class Http11NioProcessor extends 
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
 log.error(sm.getString("http11processor.request.process"), t);
-// 500 - Internal Server Error
-response.setStatus(500);
-adapter.log(request, response, 0);
 error = true;
+} finally {
+if (error) {
+// 500 - Internal Server Error
+response.setStatus(500);
+adapter.log(request, response, 0);
+}
 }
 
 rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1141066&r1=1141065&r2=1141066&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Jun 29 
12:12:48 2011
@@ -396,10 +396,13 @@ public class Http11Processor extends Abs
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
 log.error(sm.getString("http11processor.request.process"), t);
-// 500 - Internal Server Error
-response.setStatus(500);
-adapter.log(request, response, 0);
 error = true;
+} finally {
+if (error) {
+// 500 - Internal Server Error
+response.setStatus(500);
+  

svn commit: r1141079 - in /tomcat/trunk: java/org/apache/catalina/core/AsyncContextImpl.java test/org/apache/catalina/core/TestAsyncContextImpl.java webapps/docs/changelog.xml

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 12:57:50 2011
New Revision: 1141079

URL: http://svn.apache.org/viewvc?rev=1141079&view=rev
Log:
Ensure that if asyncDispatch() is called during an onTimeout event and the 
target Servlet does not call startAsync() or complete() that Tomcat calls 
complete() (or does the equivalent) once the target Servlet exits.

Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1141079&r1=1141078&r2=1141079&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Wed Jun 29 
12:57:50 2011
@@ -312,6 +312,9 @@ public class AsyncContextImpl implements
 }
 try {
 dispatch.run();
+if (!request.isAsync()) {
+fireOnComplete();
+}
 } catch (RuntimeException x) {
 // doInternalComplete(true);
 if (x.getCause() instanceof ServletException) {

Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1141079&r1=1141078&r2=1141079&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Wed 
Jun 29 12:57:50 2011
@@ -365,18 +365,26 @@ public class TestAsyncContextImpl extend
 }
 }
 
-public void testTimeoutListenerComplete() throws Exception {
+public void testTimeoutListenerCompleteNoDispatch() throws Exception {
+// Should work
 doTestTimeout(true, null);
 }
 
-public void testTimeoutListenerNoComplete() throws Exception {
+public void testTimeoutListenerNoCompleteNoDispatch() throws Exception {
+// Should trigger an error - must do one or other
 doTestTimeout(false, null);
 }
 
-public void testTimeoutListenerDispatch() throws Exception {
+public void testTimeoutListenerCompleteDispatch() throws Exception {
+// Should trigger an error - can't do both
 doTestTimeout(true, "/nonasync");
 }
-
+
+public void testTimeoutListenerNoCompleteDispatch() throws Exception {
+// Should work
+doTestTimeout(false, "/nonasync");
+}
+
 
 private void doTestTimeout(boolean completeOnTimeout, String dispatchUrl)
 throws Exception {
@@ -413,23 +421,44 @@ public class TestAsyncContextImpl extend
 ctx.getPipeline().addValve(alv);
 
 tomcat.start();
-ByteChunk res = getUrl("http://localhost:"; + getPort() + "/async");
+ByteChunk res = new ByteChunk();
+try {
+getUrl("http://localhost:"; + getPort() + "/async", res, null);
+} catch (IOException ioe) {
+// Ignore - expected for some error conditions
+}
 StringBuilder expected = new StringBuilder("requestInitialized-");
 expected.append("TimeoutServletGet-onTimeout-");
-if (!completeOnTimeout) {
-expected.append("onError-");
-}
-if (dispatchUrl == null) {
-expected.append("onComplete-");
+if (completeOnTimeout) {
+if (dispatchUrl == null) {
+expected.append("onComplete-");
+expected.append("requestDestroyed");
+} else {
+// Error - no further output
+// There is no onComplete- since the complete event would be
+// fired during post processing but since there is an error 
that
+// never happens.
+}
 } else {
-expected.append("NonAsyncServletGet-");
+if (dispatchUrl == null) {
+expected.append("onError-");
+} else {
+expected.append("NonAsyncServletGet-");
+}
+expected.append("onComplete-");
+expected.append("requestDestroyed");
 }
-expected.append("requestDestroyed");
 assertEquals(expected.toString(), res.toString());
 
 // Check the access log
-validateAccessLog(alv, 1, 200, TimeoutServlet.ASYNC_TIMEOUT,
-TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN + REQUEST_TIME);
+if (completeOnTimeout && dispatchUrl != null) {
+validateAccessLog(alv, 1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT +
+TIMEOUT_MARGIN + REQUEST_TIME);
+} else {
+

DO NOT REPLY [Bug 51450] Spanish translation "_es.properties" files

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51450

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2011-06-29 12:59:35 UTC ---
There is no attachment here.

-- 
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 51450] Spanish translation "_es.properties" files

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51450

--- Comment #2 from Jesus Marin  2011-06-29 13:24:43 UTC 
---
Created attachment 27227
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27227
new translations

-- 
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 51450] Spanish translation "_es.properties" files

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51450

Jesus Marin  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |

-- 
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: r1141095 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 13:30:49 2011
New Revision: 1141095

URL: http://svn.apache.org/viewvc?rev=1141095&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=1141095&r1=1141094&r2=1141095&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 29 13:30:49 2011
@@ -182,3 +182,10 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt
   -1:
 
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49929
+  No definitive information that this is the fix but back-porting Mladen's fix
+  from 7.0.x can't hurt and may help
+  http://svn.apache.org/viewvc?view=revision&revision=1066772
+  +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 49929] AJP APR connector to mod_jk can result in SEND_BODY_CHUNK message after END_RESPONSE message

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49929

--- Comment #15 from Mark Thomas  2011-06-29 13:31:48 UTC ---
I've proposed r1066772 for 6.0.x since it is the right thing to do and it may
help fix this issue. Confirmation that it does fix it would still be helpful.

-- 
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: r1141097 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 13:33:38 2011
New Revision: 1141097

URL: http://svn.apache.org/viewvc?rev=1141097&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=1141097&r1=1141096&r2=1141097&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 29 13:33:38 2011
@@ -189,3 +189,10 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt
   -1:
 
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50646
+  Tribes ByteMessage will get corrupted if message size exceeds the underlying
+  buffer size
+  Patch provided by Olivier Costet
+  https://issues.apache.org/bugzilla/attachment.cgi?id=26544
+  +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 50646] Tribes ByteMessage will get corrupted if message size exceeds the underlying buffer size

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50646

--- Comment #5 from Mark Thomas  2011-06-29 13:33:42 UTC ---
Patch proposed for 6.0.x

-- 
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: r1141104 - in /tomcat/trunk: java/org/apache/el/Messages.properties java/org/apache/el/lang/ExpressionBuilder.java webapps/docs/changelog.xml

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 13:56:28 2011
New Revision: 1141104

URL: http://svn.apache.org/viewvc?rev=1141104&view=rev
Log:
Better error handling that may help track down the cause of 
https://issues.apache.org/bugzilla/show_bug.cgi?id=51088

Modified:
tomcat/trunk/java/org/apache/el/Messages.properties
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/el/Messages.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages.properties?rev=1141104&r1=1141103&r2=1141104&view=diff
==
--- tomcat/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages.properties Wed Jun 29 13:56:28 2011
@@ -32,6 +32,9 @@ error.method=Not a valid MethodExpressio
 error.method.nullParms=Parameter types cannot be null
 error.value.expectedType=Expected type cannot be null
 
+# ExpressionBuilder
+error.parseFail=Failed to parse the expression [{0}]
+
 # ExpressionMediator
 error.eval=Error Evaluating {0} : {1}
 

Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=1141104&r1=1141103&r2=1141104&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java Wed Jun 29 
13:56:28 2011
@@ -41,7 +41,6 @@ import org.apache.el.parser.AstValue;
 import org.apache.el.parser.ELParser;
 import org.apache.el.parser.Node;
 import org.apache.el.parser.NodeVisitor;
-import org.apache.el.parser.ParseException;
 import org.apache.el.util.ConcurrentCache;
 import org.apache.el.util.MessageFactory;
 
@@ -143,8 +142,9 @@ public final class ExpressionBuilder imp
 n = n.jjtGetChild(0);
 }
 cache.put(expr, n);
-} catch (ParseException pe) {
-throw new ELException("Error Parsing: " + expr, pe);
+} catch (Exception e) {
+throw new ELException(
+MessageFactory.get("error.parseFail", expr), e);
 }
 }
 return n;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1141104&r1=1141103&r2=1141104&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 29 13:56:28 2011
@@ -219,6 +219,12 @@
 use any valid XML name) have a name which is not a Java identifier.
 (markt)
   
+  
+Broaden the exception handling in the EL Parser so that more failures 
to
+parse an expression include the failed expression in the exception
+message. Hopefully, this will help track down the cause of
+51088. (markt)
+  
 
   
   



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



DO NOT REPLY [Bug 51088] ArrayIndexOutOfBoundsException from org.apache.el.parser.JJTELParserState

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51088

--- Comment #5 from Mark Thomas  2011-06-29 13:57:47 UTC ---
I think Konstantin is along the right lines here.

The more I look at the generated code, the more there is I don't like (like the
exception handling) but I like the idea of writing it myself from scratch even
less.

Since this issue can't be reproduced, the best we can do is include the
expression that triggered the issue in the exception message. I have made this
change to 7.0.x and will propose the same change for 6.0.x.

-- 
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: r1141105 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 13:58:59 2011
New Revision: 1141105

URL: http://svn.apache.org/viewvc?rev=1141105&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=1141105&r1=1141104&r2=1141105&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 29 13:58:59 2011
@@ -196,3 +196,9 @@ PATCHES PROPOSED TO BACKPORT:
   https://issues.apache.org/bugzilla/attachment.cgi?id=26544
   +1: markt
   -1:
+
+* Better exception messages for expression parsing failures that may help track
+  down https://issues.apache.org/bugzilla/show_bug.cgi?id=51088
+  http://svn.apache.org/viewvc?rev=1141104&view=rev
+  +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 51445] Tomcat 7 SingleThreadModel Problem

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51445

--- Comment #4 from Christopher Schultz  
2011-06-29 14:04:44 UTC ---
Please provide a test case that fails on a current version of Tomcat downloaded
directly from the Apache site.

Mark's analysis is that the test case you provided works in his environment.
It's up to you to prove that it doesn't work by reproducing the circumstances.

-- 
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 51437] JVM crash when SSL connector is enabled

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51437

--- Comment #9 from Mladen Turk  2011-06-29 14:09:12 UTC ---
You have a wrong certificate format.
It should be PEM not DER like in your case

Convert it to .pem
C:\> openssl x509 -trustout -inform DER -in presidencia.crt -outform PEM -out
presidencia.pem


Then use
 SSLCertificateFile="${catalina.base}/conf/ssl/presidencia.pem" 
In your server.xml

However I'll leave this issue open, cause we have some problem in reporting
that error.
Eg. it should throw something something like openssl.exe prints out:
c:\>openssl.exe s_server -cert presidencia.crt -key presidencia.key
unable to load certificate
1448:error:0906D06C:PEM routines:PEM_read_bio:no start
line:.\crypto\pem\pem_lib.c:650:Expecting: TRUSTED CERTIFICATE

Instead crashing the JVM

-- 
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 51162] NPE at org.apache.catalina.core.ContainerBase.removeChild()

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51162

--- Comment #6 from Mark Thomas  2011-06-29 14:18:42 UTC ---
Created attachment 27228
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27228
Additional patch for Tomcat 6

This patch addresses the additional NPE identified by Konstantin.

-- 
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: r1141111 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 14:19:49 2011
New Revision: 114

URL: http://svn.apache.org/viewvc?rev=114&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=114&r1=1141110&r2=114&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 29 14:19:49 2011
@@ -202,3 +202,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1141104&view=rev
   +1: markt
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51162
+  Prevent possible NPE when removing a web application
+  https://issues.apache.org/bugzilla/attachment.cgi?id=27228&action=edit
+  +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 51206] CATALINA_BASE is not visible to setenv.sh

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51206

--- Comment #3 from Mark Thomas  2011-06-29 14:23:32 UTC ---
Proposed for 6.0.x

-- 
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: r1141112 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 14:23:28 2011
New Revision: 1141112

URL: http://svn.apache.org/viewvc?rev=1141112&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=1141112&r1=114&r2=1141112&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 29 14:23:28 2011
@@ -208,3 +208,10 @@ PATCHES PROPOSED TO BACKPORT:
   https://issues.apache.org/bugzilla/attachment.cgi?id=27228&action=edit
   +1: markt
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51206
+  Make CATALINA_BASE visible to setenv.[sh|bat]
+  http://svn.apache.org/viewvc?rev=1137862&view=rev
+  Patch by rjung
+  +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 51437] JVM crash when SSL connector is enabled

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51437

--- Comment #10 from oscar  2011-06-29 15:12:18 UTC ---
Hi, 

Transforming certificate into .PEM format makes system work perfectly.

Thanks a lot for your quick response.

-- 
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: r1141130 - in /tomcat/trunk: java/org/apache/catalina/core/LocalStrings_es.properties java/org/apache/tomcat/util/buf/LocalStrings_es.properties webapps/docs/changelog.xml

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 15:16:02 2011
New Revision: 1141130

URL: http://svn.apache.org/viewvc?rev=1141130&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51450
More Spanish translations.
Based on a patch by Jesus Marin.

Added:
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_es.properties   
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1141130&r1=1141129&r2=1141130&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Wed 
Jun 29 15:16:02 2011
@@ -58,6 +58,7 @@ aprListener.aprDestroy = No pude apagar 
 aprListener.sslInit = No pude inicializar el SSLEngine (Motor SSL)
 aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache Tomcat {0}
 aprListener.flags = Capacidades APR\: IPv6 [{0}], enviar fichero [{1}], 
aceptar filtros [{2}], aleatorio [{3}].
+asyncContextImpl.requestEnded = El requerimiento asociado con AsyncContext ya 
ha completado su procesamiento.
 containerBase.alreadyStarted = Ya ha sido arrancado el Contenedor {0}
 containerBase.notConfigured = No se ha configurado V\u00E1lvula b\u00E1sica
 containerBase.notStarted = No se ha arrancado el Contenedor {0}
@@ -154,6 +155,7 @@ standardContext.urlValidate = No puedo v
 standardContext.workPath = Excepci\u00F3n obteniendo ruta de trabajo para el 
contexto [{0}]
 standardContext.workCreateException = No pude determinar directorio absoluto 
de trabajo a partir del directorio [{0}] y  CATALINA_HOME [{1}] para el 
contexto [{2}]
 standardContext.workCreateFail = No pude crear el directorio de trabajo [{0}] 
para el contexto [{1}]
+standardContextValve.acknowledgeException = No pude reconocer el requerimiento 
con una respuesta 100 (Continuar)
 standardEngine.alreadyStarted = Ya ha sido arrancado el Motor
 standardEngine.jvmRouteFail = No pude poner el atributo jvmRoute del Motor 
para la propiedad del sistema
 standardEngine.mappingError = Error de configuraci\u00F3n de MAPEO para nombre 
de servidor {0}

Added: tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_es.properties?rev=1141130&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_es.properties 
(added)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_es.properties Wed 
Jun 29 15:16:02 2011
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+b2cConvertor.unknownEncoding = La codificaci\u00F3n de car\u00E1cter [{0}] no 
est\u00E1 soportada

Propchange: 
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
--
svn:eol-style = native

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1141130&r1=1141129&r2=1141130&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 29 15:16:02 2011
@@ -294,8 +294,8 @@
 Remove unnecessary variable BASEDIR from scripts. (rjung)
   
   
-51425: Update Spanish translations. Based on a patch 
provided
-by Jesus Marin. (markt) 
+51425, 51450: Update Spanish translations. Based
+on patches provided by Jesus Marin. (markt) 
   
 
   



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



DO NOT REPLY [Bug 51450] Spanish translation "_es.properties" files

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51450

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2011-06-29 15:16:05 UTC ---
Patch applied to 7.0.x and will be in 7.0.17 onwards. Many thanks.

-- 
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: r1141132 - /tomcat/tc6.0.x/trunk/STATUS.txt

2011-06-29 Thread kkolinko
Author: kkolinko
Date: Wed Jun 29 15:18:23 2011
New Revision: 1141132

URL: http://svn.apache.org/viewvc?rev=1141132&view=rev
Log:
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=1141132&r1=1141131&r2=1141132&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 29 15:18:23 2011
@@ -186,7 +186,7 @@ PATCHES PROPOSED TO BACKPORT:
   No definitive information that this is the fix but back-porting Mladen's fix
   from 7.0.x can't hurt and may help
   http://svn.apache.org/viewvc?view=revision&revision=1066772
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50646
@@ -194,24 +194,28 @@ PATCHES PROPOSED TO BACKPORT:
   buffer size
   Patch provided by Olivier Costet
   https://issues.apache.org/bugzilla/attachment.cgi?id=26544
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
 * Better exception messages for expression parsing failures that may help track
   down https://issues.apache.org/bugzilla/show_bug.cgi?id=51088
   http://svn.apache.org/viewvc?rev=1141104&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51162
   Prevent possible NPE when removing a web application
   https://issues.apache.org/bugzilla/attachment.cgi?id=27228&action=edit
-  +1: markt
+  +1: markt, kkolinko
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51206
   Make CATALINA_BASE visible to setenv.[sh|bat]
   http://svn.apache.org/viewvc?rev=1137862&view=rev
   Patch by rjung
-  +1: markt
+  +1: markt, kkolinko
   -1:
+
+   kkolinko: As a slight enhancement to the fix, the code that calls
+   setenv.bat|sh few lines later can be a bit simplified now, knowing
+   that CATALINA_BASE is already set.



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



Re: JK 1.2.32 release kick

2011-06-29 Thread Jim Jagielski
+1

On Jun 28, 2011, at 11:43 AM, Rainer Jung wrote:

> +1, great!
> 
> On 27.06.2011 20:03, Mladen Turk wrote:
>> Hi,
>> 
>> I have a time slot available so I volunteer as a 1.2.32 RM.
>> Think we are good for a new release.
>> 
>> Comments, objections?
> 
> -
> 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: response.encodeURL("http://localhost:8080") produces an invalid URL?

2011-06-29 Thread Erik Bertelsen
2011/6/29 Konstantin Kolinko :

>
> From HTTP standpoint it should be http://localhost:8080/ and in my
> experience browsers add the trailing slash automatically. I have not
> looked whether the actual HTTP spec is more strict regarding such
> URLs.
>

Actually my experience is slightly different, i.e. the HTTP servers
send a redirect which adds the trailing /.

In a tomcat context, this actually may make an important difference:
If you connect directly to an HTTP port on a tomcat with an URL like
http://server:8260/app where app is an webapp running in this tomcat's
webapps directory, the browser will be directed to
http://server:8260/app/

If you have a JkMount in an apache httpd server mapping
http://server/app/* to http://tomcat-server:someport/app/* then
suddenly the trailing / is necessary in the initial browser url to
reach the app's front page.

regards
- Erik

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



Re: Proposal for the system information displayed by the default error handling of Tomcat

2011-06-29 Thread Polina Genova
Hi all,



I'm curious if you find the idea below reasonable.

If so, I'll gladly provide patch for it.



Thank you for your attention,

Polina
On Wed, Jun 22, 2011 at 8:02 AM, Polina Genova wrote:

> Hi,
>
> Currently the Tomcat security documentation says that the server
> information displayed in the default error pages can be configured through
> the ‘CATALINA_HOME/lib/org/apache/catalina/util/ SystemInfo.properties’
> file.
>
> I think it makes sense, to use the server attribute value of HTTP connector
> configuration in the server.xml (if such attribute is set) instead reading
> the property from the ‘SystemInfo.properties’. Thus the system information
> returned in the server header and in the default error page would be
> consistent. Besides, I cannot think of any situation in which these two
> configurations may differ. That’s why such a change seems reasonable to me
> and would lighten a bit the steps of security configurations.
>
> If you like the idea, I can provide a patch for it?
>
> Thanks and regards,
>
> Polina
>


Re: response.encodeURL("http://localhost:8080") produces an invalid URL?

2011-06-29 Thread Konstantin Kolinko
2011/6/29 Erik Bertelsen :
> 2011/6/29 Konstantin Kolinko :
>
>>
>> From HTTP standpoint it should be http://localhost:8080/ and in my
>> experience browsers add the trailing slash automatically. I have not
>> looked whether the actual HTTP spec is more strict regarding such
>> URLs.
>>
>
> Actually my experience is slightly different, i.e. the HTTP servers
> send a redirect which adds the trailing /.

Redirect is sent for  folder -> folder/, but here we are talking about
server root ('/').

For the server root the request itself should contain "/". That is
taken care by the browser: in an HTTP request, e.g.
GET / HTTP/1.0
 - the requested path cannot be empty, because multiple spaces are
treated as single one.


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: r1141299 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProtocol.java AjpNioProtocol.java AjpProtocol.java

2011-06-29 Thread markt
Author: markt
Date: Wed Jun 29 22:34:37 2011
New Revision: 1141299

URL: http://svn.apache.org/viewvc?rev=1141299&view=rev
Log:
Fix bad logic. Need to postProcess if socket is *not* closed and it is an async 
request.

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1141299&r1=1141298&r2=1141299&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Jun 29 
22:34:37 2011
@@ -152,7 +152,7 @@ public class AjpAprProtocol extends Abst
 state = processor.process(socket);
 }
 
-if (state == SocketState.CLOSED && processor.isAsync()) {
+if (state != SocketState.CLOSED && processor.isAsync()) {
 state = processor.asyncPostProcess();
 }
 } while (state == SocketState.ASYNC_END);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1141299&r1=1141298&r2=1141299&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Wed Jun 29 
22:34:37 2011
@@ -190,7 +190,7 @@ public class AjpNioProtocol extends Abst
 state = processor.process(socket);
 }
 
-if (state == SocketState.CLOSED && processor.isAsync()) {
+if (state != SocketState.CLOSED && processor.isAsync()) {
 state = processor.asyncPostProcess();
 }
 } while (state == SocketState.ASYNC_END);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1141299&r1=1141298&r2=1141299&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Wed Jun 29 
22:34:37 2011
@@ -143,7 +143,7 @@ public class AjpProtocol extends Abstrac
 state = processor.process(socket);
 }
 
-if (state == SocketState.CLOSED && processor.isAsync()) {
+if (state != SocketState.CLOSED && processor.isAsync()) {
 state = processor.asyncPostProcess();
 }
 } while (state == SocketState.ASYNC_END);



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



DO NOT REPLY [Bug 51181] Add support for Web Sockets

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #12 from gootd...@gmail.com 2011-06-30 02:23:31 UTC ---
Please add Web Sockets to Tomcat.

The functionality provided is incredible and finally allows our applications to
provide real time communication.

Instead of resorting to running multiple servlet containers, we're switching
off tomcat completely since there does not seem to be any sign of sockets
coming any time soon.

I understand user demand drives the functionality, but I think we can agree
that web sockets are a dream for web applications.

-- 
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: r1141388 - /tomcat/native/trunk/native/src/sslcontext.c

2011-06-29 Thread mturk
Author: mturk
Date: Thu Jun 30 04:18:36 2011
New Revision: 1141388

URL: http://svn.apache.org/viewvc?rev=1141388&view=rev
Log:
Fix BZ51437 by trying to load the DER cerificate if pem load error was 
PEM_R_NO_START_LINE

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

Modified: tomcat/native/trunk/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1141388&r1=1141387&r2=1141388&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Thu Jun 30 04:18:36 2011
@@ -474,7 +474,6 @@ static X509 *load_pem_cert(tcn_ssl_ctxt_
 BIO *bio = NULL;
 X509 *cert = NULL;
 tcn_pass_cb_t *cb_data = c->cb_data;
-int i;
 
 if ((bio = BIO_new(BIO_s_file())) == NULL) {
 return NULL;
@@ -483,14 +482,14 @@ static X509 *load_pem_cert(tcn_ssl_ctxt_
 BIO_free(bio);
 return NULL;
 }
-for (i = 0; i < 3; i++) {
-cert = PEM_read_bio_X509_AUX(bio, NULL,
-(pem_password_cb *)SSL_password_callback,
-(void *)cb_data);
-if (cert)
-break;
-cb_data->password[0] = '\0';
+cert = PEM_read_bio_X509_AUX(bio, NULL,
+(pem_password_cb *)SSL_password_callback,
+(void *)cb_data);
+if (cert == NULL &&
+   (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE)) {
+ERR_clear_error();
 BIO_ctrl(bio, BIO_CTRL_RESET, 0, NULL);
+cert = d2i_X509_bio(bio, NULL);
 }
 BIO_free(bio);
 return cert;



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



svn commit: r1141392 - in /tomcat/native/branches/1.1.x: native/src/sslcontext.c xdocs/miscellaneous/changelog.xml

2011-06-29 Thread mturk
Author: mturk
Date: Thu Jun 30 04:26:36 2011
New Revision: 1141392

URL: http://svn.apache.org/viewvc?rev=1141392&view=rev
Log:
Fix BZ51437 by trying to load the DER cerificate if pem load error was 
PEM_R_NO_START_LINE

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

Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=1141392&r1=1141391&r2=1141392&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Thu Jun 30 04:26:36 
2011
@@ -447,7 +447,6 @@ static EVP_PKEY *load_pem_key(tcn_ssl_ct
 BIO *bio = NULL;
 EVP_PKEY *key = NULL;
 tcn_pass_cb_t *cb_data = c->cb_data;
-int i;
 
 if ((bio = BIO_new(BIO_s_file())) == NULL) {
 return NULL;
@@ -458,14 +457,14 @@ static EVP_PKEY *load_pem_key(tcn_ssl_ct
 }
 if (!cb_data)
 cb_data = &tcn_password_callback;
-for (i = 0; i < 3; i++) {
-key = PEM_read_bio_PrivateKey(bio, NULL,
-(pem_password_cb *)SSL_password_callback,
-(void *)cb_data);
-if (key)
-break;
-cb_data->password[0] = '\0';
+cert = PEM_read_bio_X509_AUX(bio, NULL,
+(pem_password_cb *)SSL_password_callback,
+(void *)cb_data);
+if (cert == NULL &&
+   (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE)) {
+ERR_clear_error();
 BIO_ctrl(bio, BIO_CTRL_RESET, 0, NULL);
+cert = d2i_X509_bio(bio, NULL);
 }
 BIO_free(bio);
 return key;

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=1141392&r1=1141391&r2=1141392&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Thu Jun 30 
04:26:36 2011
@@ -39,6 +39,9 @@
 
   
 
+  51437: Try loading certificate in DER format if PEM was 
invalid. (mturk)
+
+
   49557: index erro in the loop to get the env info in the 
proc.create function. (kkolinko, jfclere)
 
 



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



DO NOT REPLY [Bug 51437] JVM crash when SSL connector is enabled

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51437

Mladen Turk  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #11 from Mladen Turk  2011-06-30 04:29:09 UTC ---
Fix in the SVN.
Like Apache Httpd's mod_ssl, the certificate will be loaded in DER format if
PEM format indicates PEM_R_NO_START_LINE

-- 
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: r1141394 - /tomcat/jk/trunk/native/common/jk_version.h

2011-06-29 Thread mturk
Author: mturk
Date: Thu Jun 30 04:59:53 2011
New Revision: 1141394

URL: http://svn.apache.org/viewvc?rev=1141394&view=rev
Log:
Temporary promote trunk to a release version

Modified:
tomcat/jk/trunk/native/common/jk_version.h

Modified: tomcat/jk/trunk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1141394&r1=1141393&r2=1141394&view=diff
==
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Thu Jun 30 04:59:53 2011
@@ -29,7 +29,7 @@
 #define JK_VERFIX   32
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
+#define JK_VERISRELEASE 1
 /* Beta number */
 #define JK_VERBETA  0
 #define JK_BETASTRING   "0"



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



DO NOT REPLY [Bug 51445] Tomcat 7 SingleThreadModel Problem

2011-06-29 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51445

Mali  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |

--- Comment #5 from Mali  2011-06-30 05:50:57 UTC ---

What I hava to provide exactly in test case (as I am new here). All I can
provide is I have tested same in apache-tomcat-7.0.12, apache-tomcat-7.0.16
with JDK jdk1.6.0_13, jdk1.6.0_26 in PC Linux OS.

The servlet I have provided should print 10 rather than 0.

-- 
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: r1141388 - /tomcat/native/trunk/native/src/sslcontext.c

2011-06-29 Thread Konstantin Kolinko
2011/6/30  :
> Author: mturk
> Date: Thu Jun 30 04:18:36 2011
> New Revision: 1141388
>
> URL: http://svn.apache.org/viewvc?rev=1141388&view=rev
> Log:
> Fix BZ51437 by trying to load the DER cerificate if pem load error was 
> PEM_R_NO_START_LINE
>
> Modified:
>    tomcat/native/trunk/native/src/sslcontext.c
>

> -        cb_data->password[0] = '\0';

The above line inside the loop in the old code - I guess it was retrying
without a password. With your change that retry is gone.

Is that OK?

(Just guessing, I do not know much of that code).

Best regards,
Konstantin Kolinko

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