You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2019/04/02 10:06:32 UTC

[httpcomponents-client] 01/01: HTTPCLIENT-1976: Unsafe deserialization in DefaultHttpCacheEntrySerializer

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

olegk pushed a commit to branch HTTPCLIENT-1976
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git

commit 3aa9b353fea679b7a9d17411c0c9b4e593afafe6
Author: Artem Smotrakov <ar...@gmail.com>
AuthorDate: Tue Apr 2 12:03:27 2019 +0200

    HTTPCLIENT-1976: Unsafe deserialization in DefaultHttpCacheEntrySerializer
---
 .../java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
index 3d8e944..1ed007d 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
@@ -65,7 +65,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+<<<<<<< Updated upstream
  * Utility class that implements commons aspects of the client side HTTP authentication.
+=======
+ * HTTP authenticato
+>>>>>>> Stashed changes
  *
  * @since 4.3
  */