You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/11/09 15:43:12 UTC

[cxf] branch 3.1.x-fixes updated (1940200 -> cc20aea)

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from 1940200  [CXF-7545] Making sure a custom method id always gets the priority, modified patch is applied on behalf of Evaristo Wychoski Benfatti
     new 5a9f94e  Fix probable bug
     new cc20aea  Recording .gitmergeinfo Changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo                                                           | 2 ++
 .../main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].

[cxf] 02/02: Recording .gitmergeinfo Changes

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit cc20aea5162b402614e9ae52da0deb237e1ee7d3
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Nov 9 15:42:57 2017 +0000

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 10f3b04..fb1b40b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -40,6 +40,7 @@ B 0e1d4826cab2975b437219f740381574536d4ff3
 B 0e844a78eaad43ad5f24c01bea9cc016339c7821
 B 0f3e3468906d9a4b55a7aa30276ddf7367687ebb
 B 0f74af5ed7561838e1950c758a7a05e588badd10
+B 10110bcb6f49bcad1cf239926168783f9bfca3b5
 B 101e9a0a43f2d819057d995adbb6e6776d5c7f40
 B 1050ec5cc0cd2996c58e3bc611bc6ced3afcc489
 B 108dcd6099e86cd2070b5f9bae2b0feb7d5a7524
@@ -514,6 +515,7 @@ B db11547c955d42be5dfa74463fa3d313123e6ffb
 B dbaf44f3ed9c72d31f5083a4a6e3f92af48d7b26
 B dbe536f782701cab466c850b3c24bef564b2f9d1
 B dc072a6768932dfd64c8f52f3b297f296e1134e7
+B dc2d22e374cb6adaabe0a963b73ca3d5c119f185
 B dd2ef496df36ef8967b5274c0a5928f5594469be
 B dd723f846949d66e24ab103c2efde426ea9fb141
 B dd81c1eb76d853f735b2265a18653ab862298468

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.

[cxf] 01/02: Fix probable bug

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 5a9f94e8a570cce04b13257e1686f03992190947
Author: Art O Cathain <ar...@bjss.com>
AuthorDate: Thu Nov 9 14:43:28 2017 +0000

    Fix probable bug
    
    (cherry picked from commit dacfa884196e2098cbc590fd907d1001b5c3494a)
---
 .../main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
index fef7d12..f72b1dd 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
@@ -157,7 +157,7 @@ public final class HttpAuthHeader {
     }
     
     public boolean authTypeIsNegotiate() {
-        return AUTH_TYPE_DIGEST.equals(this.authType);
+        return AUTH_TYPE_NEGOTIATE.equals(this.authType);
     }
     
     public String getAuthType() {

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.