August 2014 - jbossweb-commits - Jboss List Archives

JBossWeb SVN: r2496 - in branches/7.5.x/src/main/java/org/apache: tomcat/util/net/jsse/openssl and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-08-26 10:30:34 -0400 (Tue, 26 Aug 2014) New Revision: 2496 Modified: branches/7.5.x/src/main/java/org/apache/catalina/connector/Connector.java branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java Log: BZ961257: Full sync of the protocol handler init, to avoid SSL init issues. Remove now useless sync for OpenSSL syntax parsing. Modified: branches/7.5.x/src/main/java/org/apache/catalina/connector/Connector.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/catalina/connector/Connector.java 2014-08-26 14:05:30 UTC (rev 2495) +++ branches/7.5.x/src/main/java/org/apache/catalina/connector/Connector.java 2014-08-26 14:30:34 UTC (rev 2496) @@ -982,7 +982,9 @@ System.getProperty("catalina.base")); try { - protocolHandler.init(); + synchronized (Connector.class) { + protocolHandler.init(); + } } catch (Exception e) { throw new LifecycleException(MESSAGES.protocolHandlerInitFailed(e)); } Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-08-26 14:05:30 UTC (rev 2495) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-08-26 14:30:34 UTC (rev 2496) @@ -599,10 +599,8 @@ } static LinkedHashSet<Ciphers> parse(String expression) { - synchronized (OpenSSLCipherConfigurationParser.class) { - if (!initialized) { - init(); - } + if (!initialized) { + init(); } String[] elements = expression.split(SEPARATOR); LinkedHashSet<Ciphers> ciphers = new LinkedHashSet<Ciphers>();

9 years, 7 months

1
0
0 / 0

JBossWeb SVN: r2495 - branches/7.5.x/src/main/java/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-08-26 10:05:30 -0400 (Tue, 26 Aug 2014) New Revision: 2495 Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Constants.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java Log: BZ1059511: Add a DEFAULT_DISABLE_UPLOAD_TIMEOUT system property to go along with the others. Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Constants.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Constants.java 2014-08-26 11:57:43 UTC (rev 2494) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Constants.java 2014-08-26 14:05:30 UTC (rev 2495) @@ -44,8 +44,11 @@ public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 300000; public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0; public static final boolean DEFAULT_TCP_NO_DELAY = true; + public static final boolean DEFAULT_DISABLE_UPLOAD_TIMEOUT = Boolean.valueOf( + System.getProperty("org.apache.coyote.http11.DEFAULT_DISABLE_UPLOAD_TIMEOUT", "false")) + .booleanValue(); + - /** * CRLF. */ Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java 2014-08-26 11:57:43 UTC (rev 2494) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java 2014-08-26 14:05:30 UTC (rev 2495) @@ -152,7 +152,7 @@ /** * Flag to disable setting a different time-out on uploads. */ - protected boolean disableUploadTimeout = false; + protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; /** * Allowed compression level. Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2014-08-26 11:57:43 UTC (rev 2494) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2014-08-26 14:05:30 UTC (rev 2495) @@ -253,7 +253,7 @@ /** * Flag to disable setting a different time-out on uploads. */ - protected boolean disableUploadTimeout = false; + protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; /** Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2014-08-26 11:57:43 UTC (rev 2494) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/Http11Processor.java 2014-08-26 14:05:30 UTC (rev 2495) @@ -235,7 +235,7 @@ /** * Flag to disable setting a different time-out on uploads. */ - protected boolean disableUploadTimeout = false; + protected boolean disableUploadTimeout = Constants.DEFAULT_DISABLE_UPLOAD_TIMEOUT; /**

9 years, 7 months

1
0
0 / 0

JBossWeb SVN: r2494 - branches/7.5.x/src/main/java/org/apache/catalina/authenticator.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-08-26 07:57:43 -0400 (Tue, 26 Aug 2014) New Revision: 2494 Modified: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java Log: Related to EAP6-257: default httponly for sso to true since it probably doesn't hurt. Modified: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2014-08-26 06:56:30 UTC (rev 2493) +++ branches/7.5.x/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java 2014-08-26 11:57:43 UTC (rev 2494) @@ -124,7 +124,7 @@ /** * Optional SSO HTTP only. */ - protected boolean cookieHttpOnly = false; + protected boolean cookieHttpOnly = true; // ------------------------------------------------------------- Properties

9 years, 7 months

1
0
0 / 0

JBossWeb SVN: r2493 - branches/7.5.x/src/main/java/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2014-08-26 02:56:30 -0400 (Tue, 26 Aug 2014) New Revision: 2493 Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Log: JBWEB-302: Make sure buffer state is right after sending an ack (and also add a loop to make sure everything is always written). Submitted by Aaron Ogburn. Modified: branches/7.5.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 2014-08-20 12:58:33 UTC (rev 2492) +++ branches/7.5.x/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 2014-08-26 06:56:30 UTC (rev 2493) @@ -345,11 +345,14 @@ public void sendAck() throws Exception { if (!committed) { - this.bbuf.clear(); - this.bbuf.put(Constants.ACK_BYTES).flip(); - if (this.write(writeTimeout, TimeUnit.MILLISECONDS) < 0) { - throw new IOException(MESSAGES.failedWrite()); - } + bbuf.clear(); + bbuf.put(Constants.ACK_BYTES).flip(); + while (bbuf.hasRemaining()) { + if (blockingWrite(writeTimeout, TimeUnit.MILLISECONDS) < 0) { + throw new IOException(MESSAGES.failedWrite()); + } + } + bbuf.clear(); } }

9 years, 7 months

1
0
0 / 0

JBossWeb SVN: r2492 - branches/7.5.x/src/main/java/org/apache/catalina/authenticator.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2014-08-20 08:58:33 -0400 (Wed, 20 Aug 2014) New Revision: 2492 Modified: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java Log: [BZ-1126490] create session prior to Digest 401 so loadbalancers can maintain stickiness Modified: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2014-08-20 12:38:31 UTC (rev 2491) +++ branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2014-08-20 12:58:33 UTC (rev 2492) @@ -255,6 +255,9 @@ // to be unique). String nonce = generateNonce(request); + // Ensure a session is created to have stickiness through loadbalancers + request.getSessionInternal(true); + setAuthenticateHeader(request, response, config, nonce, principal != null && digestInfo.isNonceStale()); response.sendError(HttpServletResponse.SC_UNAUTHORIZED); Property changes on: branches/7.5.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java:2485

9 years, 8 months

1
0
0 / 0

JBossWeb SVN: r2491 - tags.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-20 08:38:31 -0400 (Wed, 20 Aug 2014) New Revision: 2491 Added: tags/JBOSSWEB_7_4_9_FINAL/ Log: New 7.4.9 web build.

9 years, 8 months

1
0
0 / 0

JBossWeb SVN: r2490 - branches/7.4.x.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-20 08:33:14 -0400 (Wed, 20 Aug 2014) New Revision: 2490 Modified: branches/7.4.x/pom.xml Log: New 7.4.9 web build. Modified: branches/7.4.x/pom.xml =================================================================== --- branches/7.4.x/pom.xml 2014-08-20 12:17:29 UTC (rev 2489) +++ branches/7.4.x/pom.xml 2014-08-20 12:33:14 UTC (rev 2490) @@ -33,7 +33,7 @@ <groupId>org.jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>7.4.8.Final</version> + <version>7.4.9.Final</version> <name>JBoss Web</name> <description>Servlet 3.0 container</description>

9 years, 8 months

1
0
0 / 0

JBossWeb SVN: r2489 - branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-20 08:17:29 -0400 (Wed, 20 Aug 2014) New Revision: 2489 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java Log: BZ-1108307] Improve the ability to use MS Windows keystore for the web servers ssl connector Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-08-19 14:20:29 UTC (rev 2488) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-08-20 12:17:29 UTC (rev 2489) @@ -239,7 +239,9 @@ throws IOException { String keystoreFile = (String)attributes.get("keystore"); - if (keystoreFile == null) + if ("Windows-MY".equalsIgnoreCase(type)) + keystoreFile = ""; + else if (keystoreFile == null) keystoreFile = defaultKeystoreFile; return getStore(type, provider, keystoreFile, pass); @@ -273,6 +275,9 @@ if(truststoreType == null) { truststoreType = keystoreType; } + if ("Windows-ROOT".equalsIgnoreCase(truststoreType)) + truststoreFile = ""; + if(CoyoteLogger.UTIL_LOGGER.isDebugEnabled()) { CoyoteLogger.UTIL_LOGGER.debug("trustType = " + truststoreType); } Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-08-19 14:20:29 UTC (rev 2488) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-08-20 12:17:29 UTC (rev 2489) @@ -372,7 +372,9 @@ protected KeyStore getKeystore(String type, String provider, String pass) throws IOException { String keystoreFile = (String) attributes.get("keystore"); - if (keystoreFile == null) + if ("Windows-MY".equalsIgnoreCase(type)) + keystoreFile = ""; + else if (keystoreFile == null) keystoreFile = defaultKeystoreFile; return getStore(type, provider, keystoreFile, pass); @@ -555,6 +557,9 @@ if (truststoreType == null) { truststoreType = keystoreType; } + if ("Windows-ROOT".equalsIgnoreCase(truststoreType)) + truststoreFile = ""; + if (CoyoteLogger.UTIL_LOGGER.isDebugEnabled()) { CoyoteLogger.UTIL_LOGGER.debug("trustType = " + truststoreType); }

9 years, 8 months

1
0
0 / 0

JBossWeb SVN: r2488 - branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-19 10:20:29 -0400 (Tue, 19 Aug 2014) New Revision: 2488 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java Log: [BZ-1108307] Improve the ability to use MS Windows keystore for the web servers ssl connector Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-08-18 13:17:22 UTC (rev 2487) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-08-19 14:20:29 UTC (rev 2488) @@ -239,7 +239,9 @@ throws IOException { String keystoreFile = (String)attributes.get("keystore"); - if (keystoreFile == null) + if ("Windows-MY".equalsIgnoreCase(type)) + keystoreFile = ""; + else if (keystoreFile == null) keystoreFile = defaultKeystoreFile; return getStore(type, provider, keystoreFile, pass); @@ -273,6 +275,9 @@ if(truststoreType == null) { truststoreType = keystoreType; } + if ("Windows-ROOT".equalsIgnoreCase(truststoreType)) + truststoreFile = ""; + if(CoyoteLogger.UTIL_LOGGER.isDebugEnabled()) { CoyoteLogger.UTIL_LOGGER.debug("trustType = " + truststoreType); } Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-08-18 13:17:22 UTC (rev 2487) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java 2014-08-19 14:20:29 UTC (rev 2488) @@ -372,7 +372,9 @@ protected KeyStore getKeystore(String type, String provider, String pass) throws IOException { String keystoreFile = (String) attributes.get("keystore"); - if (keystoreFile == null) + if ("Windows-MY".equalsIgnoreCase(type)) + keystoreFile = ""; + else if (keystoreFile == null) keystoreFile = defaultKeystoreFile; return getStore(type, provider, keystoreFile, pass); @@ -555,6 +557,9 @@ if (truststoreType == null) { truststoreType = keystoreType; } + if ("Windows-ROOT".equalsIgnoreCase(truststoreType)) + truststoreFile = ""; + if (CoyoteLogger.UTIL_LOGGER.isDebugEnabled()) { CoyoteLogger.UTIL_LOGGER.debug("trustType = " + truststoreType); }

9 years, 8 months

1
0
0 / 0

JBossWeb SVN: r2487 - branches/JBOSSWEB_7_2_2_FINAL_BZ-1130564/src/main/java/org/apache/catalina/authenticator.

by jbossweb-commits＠lists.jboss.org

Author: aogburn Date: 2014-08-18 09:17:22 -0400 (Mon, 18 Aug 2014) New Revision: 2487 Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1130564/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java Log: [BZ-1130564] merge one-off fix Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1130564/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java =================================================================== --- branches/JBOSSWEB_7_2_2_FINAL_BZ-1130564/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2014-08-15 14:36:41 UTC (rev 2486) +++ branches/JBOSSWEB_7_2_2_FINAL_BZ-1130564/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2014-08-18 13:17:22 UTC (rev 2487) @@ -255,6 +255,9 @@ // to be unique). String nonce = generateNonce(request); + // Ensure a session is created to have stickiness through loadbalancers + request.getSessionInternal(true); + setAuthenticateHeader(request, response, config, nonce, principal != null && digestInfo.isNonceStale()); response.sendError(HttpServletResponse.SC_UNAUTHORIZED); Property changes on: branches/JBOSSWEB_7_2_2_FINAL_BZ-1130564/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java:2485

9 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits August 2014