You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2013/02/07 22:07:20 UTC
svn commit: r1443725 - in /cxf/branches/2.5.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
Author: cschneider
Date: Thu Feb 7 21:07:20 2013
New Revision: 1443725
URL: http://svn.apache.org/r1443725
Log:
CXF-4815 Do not return auth info for basic and disgest auth as we already support it through the HttpConduit
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1443654
Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java?rev=1443725&r1=1443724&r2=1443725&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java Thu Feb 7 21:07:20 2013
@@ -97,6 +97,11 @@ public class CXFAuthenticator extends Au
}
} else if (getRequestorType() == RequestorType.SERVER
&& httpConduit.getAuthorization() != null) {
+
+ if ("basic".equals(getRequestingScheme()) || "digest".equals(getRequestingScheme())) {
+ return null;
+ }
+
String un = httpConduit.getAuthorization().getUserName();
String pwd = httpConduit.getAuthorization().getPassword();
if (un != null && pwd != null) {