diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-04-11 17:32:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-11 17:32:47 -0700 |
| commit | 3ff4b4d623bfb41ec47eea0c87c9aa9bbb9843db (patch) | |
| tree | 6801343a8962a5df732a0ef2b8857c7c4d0d894c | |
| parent | db531d33d5fbac8e02d3b7b9568a64da393fe806 (diff) | |
| parent | 7a8671bc57b163ae8950a1876a4707c33790904b (diff) | |
| download | nist-sip-3ff4b4d623bfb41ec47eea0c87c9aa9bbb9843db.tar.gz | |
am 7a8671bc: Merge from gingerbreadandroid-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-release
* commit '7a8671bc57b163ae8950a1876a4707c33790904b':
Fix the maddr issue for proxy authentication.
| -rw-r--r-- | java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java b/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java index aa29616..4dc39ef 100644 --- a/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java +++ b/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java @@ -212,7 +212,8 @@ public class AuthenticationHelperImpl implements AuthenticationHelper { Hop hop = ((SIPClientTransaction) challengedTransaction).getNextHop(); SipURI sipUri = (SipURI) reoriginatedRequest.getRequestURI(); // BEGIN android-added - if ( !hop.getHost().equalsIgnoreCase(sipUri.getHost()) ) + if ( !hop.getHost().equalsIgnoreCase(sipUri.getHost()) + && !hop.equals(sipStack.getRouter(challengedRequest).getOutboundProxy()) ) // END android-added sipUri.setMAddrParam(hop.getHost()); if ( hop.getPort() != -1 ) sipUri.setPort(hop.getPort()); |