From 91d349daa7ca90711d17d134acd658b346d3b890 Mon Sep 17 00:00:00 2001
From: iroqueta <iroqueta@genexus.com>
Date: Thu, 28 Dec 2023 08:50:29 -0300
Subject: [PATCH] Do not send cookies in HttpClient if IncludeCookies is false
 Issue:106162

---
 .../java/com/genexus/internet/HttpClientJavaLib.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
index 62008c4ee..09945f764 100644
--- a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
+++ b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
@@ -300,11 +300,11 @@ private static SSLConnectionSocketFactory getSSLSecureInstance() {
 	private CookieStore setAllStoredCookies() {
 		CookieStore cookiesToSend = new BasicCookieStore();
 		if (!ModelContext.getModelContext().isNullHttpContext()) { 	// Caso de ejecucion de varias instancia de HttpClientJavaLib, por lo que se obtienen cookies desde sesion web del browser
-
-			String selfWebCookie = ((HttpContextWeb) ModelContext.getModelContext().getHttpContext()).getCookie(SET_COOKIE);
-			if (!selfWebCookie.isEmpty())
-				this.addHeader(COOKIE, selfWebCookie.replace("+",";"));
-
+			if (getIncludeCookies()) {
+				String selfWebCookie = ((HttpContextWeb) ModelContext.getModelContext().getHttpContext()).getCookie(SET_COOKIE);
+				if (!selfWebCookie.isEmpty())
+					this.addHeader(COOKIE, selfWebCookie.replace("+", ";"));
+			}
 		} else {	// Caso se ejecucion de una misma instancia HttpClientJavaLib mediante command line
 			if (!getIncludeCookies())
 				cookies.clear();