hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject svn commit: r1695238 - in /httpcomponents/httpclient: branches/4.5.x/ branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/ branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/ branches/4.5.x/src/docbkx/ trunk/ trun...
Date Tue, 11 Aug 2015 10:00:42 GMT
Author: michaelo
Date: Tue Aug 11 10:00:42 2015
New Revision: 1695238

URL: http://svn.apache.org/r1695238
Log:
Correct spelling of user 'principal' in the documentation

Modified:
    httpcomponents/httpclient/branches/4.5.x/RELEASE_NOTES.txt
    httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
    httpcomponents/httpclient/branches/4.5.x/src/docbkx/advanced.xml
    httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
    httpcomponents/httpclient/trunk/src/docbkx/advanced.xml

Modified: httpcomponents/httpclient/branches/4.5.x/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/RELEASE_NOTES.txt?rev=1695238&r1=1695237&r2=1695238&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/branches/4.5.x/RELEASE_NOTES.txt Tue Aug 11 10:00:42 2015
@@ -174,7 +174,7 @@ Changelog:
 * [HTTPCLIENT-1547] HttpClient OSGi bundle doesn't import the package "javax.naming".
   Contributed by Willem Jiang <ningjiang at apache.org>
 
-* [HTTPCLIENT-1541] Use correct (HTTP/hostname) service principle name for Windows native
+* [HTTPCLIENT-1541] Use correct (HTTP/hostname) service principal name for Windows native
   Negotiate/NTLM auth schemes.
   Contributed by Ka-Lok Fung <ka-lok.fung at sap.com>
 

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java?rev=1695238&r1=1695237&r2=1695238&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java
(original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java
Tue Aug 11 10:00:42 2015
@@ -91,7 +91,7 @@ public class TestWindowsNegotiateScheme
         Assume.assumeTrue("Test can only be run on Windows", WinHttpClients.isWinAuthAvailable());
 
         // HTTPCLIENT-1545
-        // If a service principle name (SPN) from outside your Windows domain tree (e.g.,
HTTP/example.com) is used,
+        // If a service principal name (SPN) from outside your Windows domain tree (e.g.,
HTTP/example.com) is used,
         // InitializeSecurityContext will return SEC_E_DOWNGRADE_DETECTED (decimal: -2146892976,
hex: 0x80090350).
         // Because WindowsNegotiateScheme wasn't setting the completed state correctly when
authentication fails,
         // HttpClient goes into an infinite loop, constantly retrying the negotiate authentication
to kingdom

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java?rev=1695238&r1=1695237&r2=1695238&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
(original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
Tue Aug 11 10:00:42 2015
@@ -47,7 +47,7 @@ import org.apache.http.protocol.HttpCont
  * persistent connections created with a particular user identity within
  * a particular security context can be reused by the same user only.
  * <p>
- * DefaultUserTokenHandler will use the user principle of connection
+ * DefaultUserTokenHandler will use the user principal of connection
  * based authentication schemes such as NTLM or that of the SSL session
  * with the client authentication turned on. If both are unavailable,
  * {@code null} token will be returned.

Modified: httpcomponents/httpclient/branches/4.5.x/src/docbkx/advanced.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/src/docbkx/advanced.xml?rev=1695238&r1=1695237&r2=1695238&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/src/docbkx/advanced.xml (original)
+++ httpcomponents/httpclient/branches/4.5.x/src/docbkx/advanced.xml Tue Aug 11 10:00:42 2015
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- 
+<!--
     ====================================================================
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ -99,7 +99,7 @@ CloseableHttpClient httpclient = HttpCli
             <para>The default implementation of the <interfacename>UserTokenHandler</interfacename>
                 interface uses an instance of Principal class to represent a state object
for HTTP
                 connections, if it can be obtained from the given execution context.
-                    <classname>DefaultUserTokenHandler</classname> will use the
user principle of
+                    <classname>DefaultUserTokenHandler</classname> will use the
user principal of
                 connection based authentication schemes such as <literal>NTLM</literal>
or that of
                 the SSL session with client authentication turned on. If both are unavailable,
null
                 token will be returned.</para>

Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1695238&r1=1695237&r2=1695238&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Tue Aug 11 10:00:42 2015
@@ -174,7 +174,7 @@ Changelog:
 * [HTTPCLIENT-1547] HttpClient OSGi bundle doesn't import the package "javax.naming".
   Contributed by Willem Jiang <ningjiang at apache.org>
 
-* [HTTPCLIENT-1541] Use correct (HTTP/hostname) service principle name for Windows native
+* [HTTPCLIENT-1541] Use correct (HTTP/hostname) service principal name for Windows native
   Negotiate/NTLM auth schemes.
   Contributed by Ka-Lok Fung <ka-lok.fung at sap.com>
 

Modified: httpcomponents/httpclient/trunk/src/docbkx/advanced.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/src/docbkx/advanced.xml?rev=1695238&r1=1695237&r2=1695238&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/src/docbkx/advanced.xml (original)
+++ httpcomponents/httpclient/trunk/src/docbkx/advanced.xml Tue Aug 11 10:00:42 2015
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- 
+<!--
     ====================================================================
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ -99,7 +99,7 @@ CloseableHttpClient httpclient = HttpCli
             <para>The default implementation of the <interfacename>UserTokenHandler</interfacename>
                 interface uses an instance of Principal class to represent a state object
for HTTP
                 connections, if it can be obtained from the given execution context.
-                    <classname>DefaultUserTokenHandler</classname> will use the
user principle of
+                    <classname>DefaultUserTokenHandler</classname> will use the
user principal of
                 connection based authentication schemes such as <literal>NTLM</literal>
or that of
                 the SSL session with client authentication turned on. If both are unavailable,
null
                 token will be returned.</para>



Mime
View raw message