You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2015/06/30 18:50:26 UTC
svn commit: r1688483 -
/tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Author: remm
Date: Tue Jun 30 16:50:26 2015
New Revision: 1688483
URL: http://svn.apache.org/r1688483
Log:
Fix protocol when using APR but the NIO connector (to be able to use OpenSSL), which fixes storeconfig attribute handling.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1688483&r1=1688482&r2=1688483&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Tue Jun 30 16:50:26 2015
@@ -539,13 +539,13 @@ public class Connector extends Lifecycle
*/
public String getProtocol() {
- if ("org.apache.coyote.http11.Http11NioProtocol".equals
- (getProtocolHandlerClassName())
+ if (("org.apache.coyote.http11.Http11NioProtocol".equals
+ (getProtocolHandlerClassName()) && !AprLifecycleListener.isAprAvailable())
|| "org.apache.coyote.http11.Http11AprProtocol".equals
(getProtocolHandlerClassName())) {
return "HTTP/1.1";
- } else if ("org.apache.coyote.ajp.AjpNioProtocol".equals
- (getProtocolHandlerClassName())
+ } else if (("org.apache.coyote.ajp.AjpNioProtocol".equals
+ (getProtocolHandlerClassName()) && !AprLifecycleListener.isAprAvailable())
|| "org.apache.coyote.ajp.AjpAprProtocol".equals
(getProtocolHandlerClassName())) {
return "AJP/1.3";
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1688483 -
/tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Posted by Christopher Schultz <ch...@christopherschultz.net>.
Rémy,
On 6/30/15 12:50 PM, remm@apache.org wrote:
> Author: remm
> Date: Tue Jun 30 16:50:26 2015
> New Revision: 1688483
>
> URL: http://svn.apache.org/r1688483
> Log:
> Fix protocol when using APR but the NIO connector (to be able to use OpenSSL), which fixes storeconfig attribute handling.
Something smells funny about this patch.
> Modified:
> tomcat/trunk/java/org/apache/catalina/connector/Connector.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1688483&r1=1688482&r2=1688483&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Tue Jun 30 16:50:26 2015
> @@ -539,13 +539,13 @@ public class Connector extends Lifecycle
> */
> public String getProtocol() {
>
> - if ("org.apache.coyote.http11.Http11NioProtocol".equals
> - (getProtocolHandlerClassName())
> + if (("org.apache.coyote.http11.Http11NioProtocol".equals
> + (getProtocolHandlerClassName()) && !AprLifecycleListener.isAprAvailable())
> || "org.apache.coyote.http11.Http11AprProtocol".equals
> (getProtocolHandlerClassName())) {
> return "HTTP/1.1";
This checks to see if APR is /unavailable/, right?
Why can we not return "HTTP/1.1" if APR is available?
-chris