[Git][java-team/httpcomponents-client][upstream] 2 commits: New upstream version 4.5.13
Markus Koschany
gitlab at salsa.debian.org
Fri Oct 9 21:53:10 BST 2020
Markus Koschany pushed to branch upstream at Debian Java Maintainers / httpcomponents-client
Commits:
c2adc76b by Markus Koschany at 2020-10-09T22:38:24+02:00
New upstream version 4.5.13
- - - - -
6b2a453b by Markus Koschany at 2020-10-09T22:45:19+02:00
New upstream version 4.5.13
- - - - -
17 changed files:
- RELEASE_NOTES.txt
- fluent-hc/pom.xml
- httpclient-cache/pom.xml
- httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
- httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryUpdater.java
- httpclient-osgi/pom.xml
- httpclient-win/pom.xml
- httpclient/pom.xml
- httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
- httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
- httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
- httpclient/src/main/java/org/apache/http/impl/cookie/LaxExpiresHandler.java
- httpclient/src/main/resources/mozilla/public-suffix-list.txt
- httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java
- httpclient/src/test/java/org/apache/http/impl/cookie/TestLaxCookieAttribHandlers.java
- httpmime/pom.xml
- pom.xml
Changes:
=====================================
RELEASE_NOTES.txt
=====================================
@@ -1,13 +1,36 @@
+Release 4.5.13
+-------------------
+
+This is a maintenance release that fixes incorrect handling of malformed authority component
+in request URIs.
+
+
+Changelog:
+-------------------
+
+* Incorrect handling of malformed authority component by URIUtils#extractHost.
+ Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Avoid updating Content-Length header in a 304 response.
+ Contributed by Dirk Henselin <dirk.henselin at vwgis.de>
+
+* Bug fix: BasicExpiresHandler is annotated as immutable but is not (#239)
+ Contributed by Gary Gregory <ggregory at apache.org>
+
+* HTTPCLIENT-2076: Fixed NPE in LaxExpiresHandler (#222).
+ Contributed by heejeongkim <aprilhjk at gmail.com>
+
+
Release 4.5.12
-------------------
This is a maintenance release that fixes a regression introduced by the previous release
-that caused rejection of ceritificates with non-standard domains.
+that caused rejection of certificates with non-standard domains.
Changelog:
-------------------
-* HTTPCLIENT-2053: Add SC_PERMANENT_REDIRECT (408) to DefaultRedirectStrategy
+* HTTPCLIENT-2053: Add SC_PERMANENT_REDIRECT (308) to DefaultRedirectStrategy
Contributed by Michael Osipov <michaelo at apache.org>
* HTTPCLIENT-2052: Fixed redirection of entity enclosing requests with non-repeatable entities
@@ -21,7 +44,6 @@ Changelog:
Contributed by Oleg Kalnichevski <olegk at apache.org>
-
Release 4.5.11
-------------------
=====================================
fluent-hc/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.12</version>
+ <version>4.5.13</version>
</parent>
<artifactId>fluent-hc</artifactId>
<name>Apache HttpClient Fluent API</name>
=====================================
httpclient-cache/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.12</version>
+ <version>4.5.13</version>
</parent>
<artifactId>httpclient-cache</artifactId>
<name>Apache HttpClient Cache</name>
=====================================
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
=====================================
@@ -111,8 +111,9 @@ class CacheEntryUpdater {
// Remove cache headers that match response
for (final HeaderIterator it = response.headerIterator(); it.hasNext(); ) {
final Header responseHeader = it.nextHeader();
- // Since we do not expect a content in a 304 response, should retain the original Content-Encoding header
- if (HTTP.CONTENT_ENCODING.equals(responseHeader.getName())) {
+ // Since we do not expect a content in a 304 response, should retain the original Content-Encoding and Content-Length header
+ if (HTTP.CONTENT_ENCODING.equals(responseHeader.getName())
+ || HTTP.CONTENT_LEN.equals(responseHeader.getName())) {
continue;
}
final Header[] matchingHeaders = headerGroup.getHeaders(responseHeader.getName());
@@ -133,8 +134,9 @@ class CacheEntryUpdater {
}
for (final HeaderIterator it = response.headerIterator(); it.hasNext(); ) {
final Header responseHeader = it.nextHeader();
- // Since we do not expect a content in a 304 response, should avoid updating Content-Encoding header
- if (HTTP.CONTENT_ENCODING.equals(responseHeader.getName())) {
+ // Since we do not expect a content in a 304 response, should avoid updating Content-Encoding and Content-Length header
+ if (HTTP.CONTENT_ENCODING.equals(responseHeader.getName())
+ || HTTP.CONTENT_LEN.equals(responseHeader.getName())) {
continue;
}
headerGroup.addHeader(responseHeader);
=====================================
httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryUpdater.java
=====================================
@@ -260,6 +260,27 @@ public class TestCacheEntryUpdater {
headersNotContain(updatedHeaders, "Content-Encoding", "gzip");
}
+ @Test
+ public void testContentLengthIsNotAddedWhenTransferEncodingIsPresent() throws IOException {
+ final Header[] headers = {
+ new BasicHeader("Date", DateUtils.formatDate(requestDate)),
+ new BasicHeader("ETag", "\"etag\""),
+ new BasicHeader("Transfer-Encoding", "chunked")};
+
+ entry = HttpTestUtils.makeCacheEntry(headers);
+ response.setHeaders(new Header[]{
+ new BasicHeader("Last-Modified", DateUtils.formatDate(responseDate)),
+ new BasicHeader("Cache-Control", "public"),
+ new BasicHeader("Content-Length", "0")});
+
+ final HttpCacheEntry updatedEntry = impl.updateCacheEntry(null, entry,
+ new Date(), new Date(), response);
+
+ final Header[] updatedHeaders = updatedEntry.getAllHeaders();
+ headersContain(updatedHeaders, "Transfer-Encoding", "chunked");
+ headersNotContain(updatedHeaders, "Content-Length", "0");
+ }
+
private void headersContain(final Header[] headers, final String name, final String value) {
for (final Header header : headers) {
if (header.getName().equals(name)) {
=====================================
httpclient-osgi/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.12</version>
+ <version>4.5.13</version>
</parent>
<artifactId>httpclient-osgi</artifactId>
<name>Apache HttpClient OSGi bundle</name>
=====================================
httpclient-win/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.12</version>
+ <version>4.5.13</version>
</parent>
<artifactId>httpclient-win</artifactId>
<name>Apache HttpClient Windows features</name>
=====================================
httpclient/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.12</version>
+ <version>4.5.13</version>
</parent>
<artifactId>httpclient</artifactId>
<name>Apache HttpClient</name>
=====================================
httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
=====================================
@@ -419,56 +419,43 @@ public class URIUtils {
if (uri == null) {
return null;
}
- HttpHost target = null;
if (uri.isAbsolute()) {
- int port = uri.getPort(); // may be overridden later
- String host = uri.getHost();
- if (host == null) { // normal parse failed; let's do it ourselves
+ if (uri.getHost() == null) { // normal parse failed; let's do it ourselves
// authority does not seem to care about the valid character-set for host names
- host = uri.getAuthority();
- if (host != null) {
+ if (uri.getAuthority() != null) {
+ String content = uri.getAuthority();
// Strip off any leading user credentials
- final int at = host.indexOf('@');
- if (at >= 0) {
- if (host.length() > at+1 ) {
- host = host.substring(at+1);
- } else {
- host = null; // @ on its own
- }
+ int at = content.indexOf('@');
+ if (at != -1) {
+ content = content.substring(at + 1);
}
- // Extract the port suffix, if present
- if (host != null) {
- final int colon = host.indexOf(':');
- if (colon >= 0) {
- final int pos = colon + 1;
- int len = 0;
- for (int i = pos; i < host.length(); i++) {
- if (Character.isDigit(host.charAt(i))) {
- len++;
- } else {
- break;
- }
- }
- if (len > 0) {
- try {
- port = Integer.parseInt(host.substring(pos, pos + len));
- } catch (final NumberFormatException ex) {
- }
- }
- host = host.substring(0, colon);
+ final String scheme = uri.getScheme();
+ final String hostname;
+ final int port;
+ at = content.indexOf(":");
+ if (at != -1) {
+ hostname = content.substring(0, at);
+ try {
+ final String portText = content.substring(at + 1);
+ port = !TextUtils.isEmpty(portText) ? Integer.parseInt(portText) : -1;
+ } catch (final NumberFormatException ex) {
+ return null;
}
+ } else {
+ hostname = content;
+ port = -1;
+ }
+ try {
+ return new HttpHost(hostname, port, scheme);
+ } catch (final IllegalArgumentException ex) {
+ return null;
}
}
- }
- final String scheme = uri.getScheme();
- if (!TextUtils.isBlank(host)) {
- try {
- target = new HttpHost(host, port, scheme);
- } catch (final IllegalArgumentException ignore) {
- }
+ } else {
+ return new HttpHost(uri.getHost(), uri.getPort(), uri.getScheme());
}
}
- return target;
+ return null;
}
/**
=====================================
httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
=====================================
@@ -172,7 +172,8 @@ final class NTLMEngineImpl implements NTLMEngine {
* the 8 byte array the server sent.
* @return The type 3 message.
* @throws NTLMEngineException
- * If {@encrypt(byte[],byte[])} fails.
+ * If {@link #Type3Message
+ * (String, String, String, String, byte[], int, String, byte[])} fails.
*/
static String getType3Message(final String user, final String password, final String host, final String domain,
final byte[] nonce, final int type2Flags, final String target, final byte[] targetInformation)
@@ -199,7 +200,8 @@ final class NTLMEngineImpl implements NTLMEngine {
* the 8 byte array the server sent.
* @return The type 3 message.
* @throws NTLMEngineException
- * If {@encrypt(byte[],byte[])} fails.
+ * If {@link #Type3Message
+ * (String, String, String, String, byte[], int, String, byte[], Certificate, byte[], byte[])} fails.
*/
static String getType3Message(final String user, final String password, final String host, final String domain,
final byte[] nonce, final int type2Flags, final String target, final byte[] targetInformation,
=====================================
httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
=====================================
@@ -45,11 +45,11 @@ import org.apache.http.util.Args;
public class BasicExpiresHandler extends AbstractCookieAttributeHandler implements CommonCookieAttributeHandler {
/** Valid date patterns */
- private final String[] datepatterns;
+ private final String[] datePatterns;
- public BasicExpiresHandler(final String[] datepatterns) {
- Args.notNull(datepatterns, "Array of date patterns");
- this.datepatterns = datepatterns;
+ public BasicExpiresHandler(final String[] datePatterns) {
+ Args.notNull(datePatterns, "Array of date patterns");
+ this.datePatterns = datePatterns.clone();
}
@Override
@@ -59,7 +59,7 @@ public class BasicExpiresHandler extends AbstractCookieAttributeHandler implemen
if (value == null) {
throw new MalformedCookieException("Missing value for 'expires' attribute");
}
- final Date expiry = DateUtils.parseDate(value, this.datepatterns);
+ final Date expiry = DateUtils.parseDate(value, this.datePatterns);
if (expiry == null) {
throw new MalformedCookieException("Invalid 'expires' attribute: "
+ value);
=====================================
httpclient/src/main/java/org/apache/http/impl/cookie/LaxExpiresHandler.java
=====================================
@@ -43,6 +43,7 @@ import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.cookie.SetCookie;
import org.apache.http.message.ParserCursor;
import org.apache.http.util.Args;
+import org.apache.http.util.TextUtils;
/**
*
@@ -105,6 +106,9 @@ public class LaxExpiresHandler extends AbstractCookieAttributeHandler implements
@Override
public void parse(final SetCookie cookie, final String value) throws MalformedCookieException {
Args.notNull(cookie, "Cookie");
+ if (TextUtils.isBlank(value)) {
+ return;
+ }
final ParserCursor cursor = new ParserCursor(0, value.length());
final StringBuilder content = new StringBuilder();
=====================================
httpclient/src/main/resources/mozilla/public-suffix-list.txt
=====================================
@@ -907,16 +907,18 @@ org.do
sld.do
web.do
-// dz : https://en.wikipedia.org/wiki/.dz
+// dz : http://www.nic.dz/images/pdf_nic/charte.pdf
dz
+art.dz
+asso.dz
com.dz
+edu.dz
+gov.dz
org.dz
net.dz
-gov.dz
-edu.dz
-asso.dz
pol.dz
-art.dz
+soc.dz
+tm.dz
// ec : http://www.nic.ec/reg/paso1.asp
// Submitted by registry <vabboud at nic.ec>
@@ -4697,13 +4699,12 @@ web.ni
// ccTLD for the Netherlands
nl
-// no : http://www.norid.no/regelverk/index.en.html
-// The Norwegian registry has declined to notify us of updates. The web pages
-// referenced below are the official source of the data. There is also an
-// announce mailing list:
-// https://postlister.uninett.no/sympa/info/norid-diskusjon
+// no : https://www.norid.no/en/om-domenenavn/regelverk-for-no/
+// Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
+// Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
+// Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
no
-// Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
+// Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
fhs.no
vgs.no
fylkesbibl.no
@@ -4711,13 +4712,13 @@ folkebibl.no
museum.no
idrett.no
priv.no
-// Non-Norid generic domains : http://www.norid.no/regelverk/vedlegg-d.en.html
+// Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
mil.no
stat.no
dep.no
kommune.no
herad.no
-// no geographical names : http://www.norid.no/regelverk/vedlegg-b.en.html
+// Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
// counties
aa.no
ah.no
@@ -7109,7 +7110,7 @@ org.zw
// newGTLDs
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-08-07T17:16:50Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-10-08T17:45:32Z
// This list is auto-generated, don't edit it manually.
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
@@ -8608,9 +8609,6 @@ insurance
// insure : 2014-03-20 Binky Moon, LLC
insure
-// intel : 2015-08-06 Intel Corporation
-intel
-
// international : 2013-11-07 Binky Moon, LLC
international
@@ -9016,9 +9014,6 @@ menu
// merckmsd : 2016-07-14 MSD Registry Holdings, Inc.
merckmsd
-// metlife : 2015-05-07 MetLife Services and Solutions, LLC
-metlife
-
// miami : 2013-12-19 Minds + Machines Group Limited
miami
@@ -9187,7 +9182,7 @@ nokia
// northwesternmutual : 2015-06-18 Northwestern Mutual Registry, LLC
northwesternmutual
-// norton : 2014-12-04 Symantec Corporation
+// norton : 2014-12-04 NortonLifeLock Inc.
norton
// now : 2015-06-25 Amazon Registry Services, Inc.
@@ -10243,9 +10238,6 @@ weber
// website : 2014-04-03 DotWebsite Inc.
website
-// wed : 2013-10-01 Atgron, Inc.
-wed
-
// wedding : 2014-04-24 Minds + Machines Group Limited
wedding
@@ -10456,7 +10448,7 @@ xin
// xn--fzys8d69uvgm : 2015-05-14 PCCW Enterprises Limited
電訊盈科
-// xn--g2xx48c : 2015-01-30 Minds + Machines Group Limited
+// xn--g2xx48c : 2015-01-30 Nawang Heli(Xiamen) Network Service Co., LTD..
购物
// xn--gckr3f0f : 2015-02-26 Amazon Registry Services, Inc.
@@ -11039,7 +11031,8 @@ cloudcontrolapp.com
cloudera.site
// Cloudflare, Inc. : https://www.cloudflare.com/
-// Submitted by Jake Riesterer <publicsuffixlist at cloudflare.com>
+// Submitted by Cloudflare Team <publicsuffixlist at cloudflare.com>
+pages.dev
trycloudflare.com
workers.dev
@@ -11234,6 +11227,10 @@ drud.us
// Submitted by Richard Harper <richard at duckdns.org>
duckdns.org
+// Bip : https://bip.sh
+// Submitted by Joel Kennedy <joel at bip.sh>
+bip.sh
+
// bitbridge.net : Submitted by Craig Welch, abeliidev at gmail.com
bitbridge.net
@@ -11585,6 +11582,10 @@ mytuleap.com
onred.one
staging.onred.one
+// One.com: https://www.one.com/
+// Submitted by Jacob Bunk Nielsen <jbn at one.com>
+service.one
+
// Enonic : http://enonic.com/
// Submitted by Erik Kaareng-Sunde <esu at enonic.com>
enonic.io
@@ -11883,6 +11884,7 @@ gitlab.io
// Gitplac.si - https://gitplac.si
// Submitted by Aljaž Starc <me at aljaxus.eu>
+gitapp.si
gitpage.si
// Glitch, Inc : https://glitch.com
@@ -11922,6 +11924,17 @@ web.app
*.0emm.com
appspot.com
*.r.appspot.com
+codespot.com
+googleapis.com
+googlecode.com
+pagespeedmobilizer.com
+publishproxy.com
+withgoogle.com
+withyoutube.com
+cloudfunctions.net
+cloud.goog
+translate.goog
+
blogspot.ae
blogspot.al
blogspot.am
@@ -11996,15 +12009,6 @@ blogspot.td
blogspot.tw
blogspot.ug
blogspot.vn
-cloudfunctions.net
-cloud.goog
-codespot.com
-googleapis.com
-googlecode.com
-pagespeedmobilizer.com
-publishproxy.com
-withgoogle.com
-withyoutube.com
// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
// Submitted by Aaron Marais <its_me at aaronleem.co.za>
@@ -12142,6 +12146,10 @@ pixolino.com
// Submited by Vasiliy Sheredeko <piphon at gmail.com>
na4u.ru
+// iopsys software solutions AB : https://iopsys.eu/
+// Submitted by Roman Azarenko <roman.azarenko at iopsys.eu>
+iopsys.se
+
// IPiFony Systems, Inc. : https://www.ipifony.com/
// Submitted by Matthew Hardeman <mhardeman at ipifony.com>
ipifony.net
@@ -12159,29 +12167,92 @@ iobb.net
//Jelastic, Inc. : https://jelastic.com/
// Submited by Ihor Kolodyuk <ik at jelastic.com>
+mel.cloudlets.com.au
+cloud.interhostsolutions.be
+users.scale.virtualcloud.com.br
+mycloud.by
+alp1.ae.flow.ch
appengine.flow.ch
+es-1.axarnet.cloud
+diadem.cloud
vip.jelastic.cloud
jele.cloud
+it1.eur.aruba.jenv-aruba.cloud
+it1.jenv-aruba.cloud
+it1-eur.jenv-arubabiz.cloud
+primetel.cloud
+uk.primetel.cloud
+ca.reclaim.cloud
+uk.reclaim.cloud
+us.reclaim.cloud
+ch.trendhosting.cloud
+de.trendhosting.cloud
jele.club
+clicketcloud.com
+ams.cloudswitches.com
+au.cloudswitches.com
+sg.cloudswitches.com
dopaas.com
+elastyco.com
+nv.elastyco.com
hidora.com
+paas.hosted-by-previder.com
+rag-cloud.hosteur.com
+rag-cloud-ch.hosteur.com
jcloud.ik-server.com
+jcloud-ver-jpc.ik-server.com
demo.jelastic.com
+kilatiron.com
paas.massivegrid.com
+jed.wafaicloud.com
+lon.wafaicloud.com
+ryd.wafaicloud.com
j.scaleforce.com.cy
jelastic.dogado.eu
+paas.leviracloud.eu
fi.cloudplatform.fi
+demo.datacenter.fi
paas.datacenter.fi
jele.host
mircloud.host
jele.io
+ocs.opusinteractive.io
+cloud.unispace.io
+cloud-de.unispace.io
+cloud-fr1.unispace.io
+jc.neen.it
+cloud.jelastic.open.tim.it
+jcloud.kz
+upaas.kazteleport.kz
+jl.serv.net.mx
cloudjiffy.net
+fra1-de.cloudjiffy.net
+west1-us.cloudjiffy.net
+ams1.jls.docktera.net
jls-sto1.elastx.net
+jls-sto2.elastx.net
+jls-sto3.elastx.net
+fr-1.paas.massivegrid.net
+lon-1.paas.massivegrid.net
+lon-2.paas.massivegrid.net
+ny-1.paas.massivegrid.net
+ny-2.paas.massivegrid.net
+sg-1.paas.massivegrid.net
jelastic.saveincloud.net
+nordeste-idc.saveincloud.net
+j.scaleforce.net
+jelastic.tsukaeru.net
+atl.jelastic.vps-host.net
+njs.jelastic.vps-host.net
+unicloud.pl
+mircloud.ru
jelastic.regruhosting.ru
+enscaled.sg
jele.site
jelastic.team
j.layershift.co.uk
+phx.enscaled.us
+mircloud.us
// Jino : https://www.jino.ru
// Submitted by Sergey Ulyashin <ulyashin at jino.ru>
@@ -12275,6 +12346,10 @@ members.linode.com
// Submitted by Victor Velchev <admin at liquidnetlimited.com>
we.bs
+// localzone.xyz
+// Submitted by Kenny Niehage <hello at yahe.sh>
+localzone.xyz
+
// Log'in Line : https://www.loginline.com/
// Submitted by Rémi Mach <remi.mach at loginline.com>
loginline.app
@@ -13111,6 +13186,7 @@ cust.testing.thingdust.io
// Submitted by Mark Staarink <mark at tlon.io>
arvo.network
azimuth.network
+tlon.network
// TownNews.com : http://www.townnews.com
// Submitted by Dustin Ward <dward at townnews.com>
@@ -13264,6 +13340,15 @@ v.ua
// Submitted by Masayuki Note <masa at blade.wafflecell.com>
wafflecell.com
+// WapBlog.ID : https://www.wapblog.id
+// Submitted by Fajar Sodik <official at wapblog.id>
+idnblogger.com
+indowapblog.com
+bloghp.id
+wblog.id
+wbq.me
+fastblog.net
+
// WebHare bv: https://www.webhare.com/
// Submitted by Arnold Hendriks <info at webhare.com>
*.webhare.dev
@@ -13369,12 +13454,22 @@ enterprisecloud.nu
// Submitted by Ben Aubin <security at mintere.com>
mintere.site
+// Cityhost LLC : https://cityhost.ua
+// Submitted by Maksym Rivtin <support at cityhost.net.ua>
+cx.ua
+
// WP Engine : https://wpengine.com/
// Submitted by Michael Smith <michael.smith at wpengine.com>
+// Submitted by Brandon DuRette <brandon.durette at wpengine.com>
wpenginepowered.com
+js.wpenginepowered.com
// Impertrix Solutions : <https://impertrixcdn.com>
// Submitted by Zhixiang Zhao <csuite at impertrix.com>
impertrixcdn.com
impertrix.com
+
+// GignoSystemJapan: http://gsj.bz
+// Submitted by GignoSystemJapan <kakutou-ec at gsj.bz>
+gsj.bz
// ===END PRIVATE DOMAINS===
=====================================
httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java
=====================================
@@ -273,14 +273,16 @@ public class TestURIUtils {
Assert.assertEquals(new HttpHost("localhost",8080),
URIUtils.extractHost(new URI("http://localhost:8080/;sessionid=stuff/abcd")));
- Assert.assertEquals(new HttpHost("localhost",8080),
+ Assert.assertEquals(null,
URIUtils.extractHost(new URI("http://localhost:8080;sessionid=stuff/abcd")));
- Assert.assertEquals(new HttpHost("localhost",-1),
+ Assert.assertEquals(null,
URIUtils.extractHost(new URI("http://localhost:;sessionid=stuff/abcd")));
Assert.assertEquals(null,
URIUtils.extractHost(new URI("http://:80/robots.txt")));
Assert.assertEquals(null,
URIUtils.extractHost(new URI("http://some%20domain:80/robots.txt")));
+ Assert.assertEquals(null,
+ URIUtils.extractHost(new URI("http://blah@goggle.com:80@google.com/")));
}
@Test
=====================================
httpclient/src/test/java/org/apache/http/impl/cookie/TestLaxCookieAttribHandlers.java
=====================================
@@ -115,6 +115,14 @@ public class TestLaxCookieAttribHandlers {
Assert.assertEquals(0, c.get(Calendar.MILLISECOND));
}
+ @Test
+ public void testParseExpiryInvalidTime0() throws Exception {
+ final BasicClientCookie cookie = new BasicClientCookie("name", "value");
+ final CookieAttributeHandler h = new LaxExpiresHandler();
+ h.parse(cookie, null);
+ Assert.assertNull(cookie.getExpiryDate());
+ }
+
@Test(expected = MalformedCookieException.class)
public void testParseExpiryInvalidTime1() throws Exception {
final BasicClientCookie cookie = new BasicClientCookie("name", "value");
=====================================
httpmime/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.12</version>
+ <version>4.5.13</version>
</parent>
<artifactId>httpmime</artifactId>
<name>Apache HttpClient Mime</name>
=====================================
pom.xml
=====================================
@@ -32,7 +32,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>httpcomponents-client</artifactId>
<name>Apache HttpComponents Client</name>
- <version>4.5.12</version>
+ <version>4.5.13</version>
<description>Apache HttpComponents Client is a library of components for building client side HTTP services</description>
<url>http://hc.apache.org/httpcomponents-client-ga/</url>
<inceptionYear>1999</inceptionYear>
@@ -60,7 +60,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/httpcomponents-client.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/httpcomponents-client.git</developerConnection>
<url>https://github.com/apache/httpcomponents-client/tree/${project.scm.tag}</url>
- <tag>4.5.12</tag>
+ <tag>4.5.13</tag>
</scm>
<properties>
View it on GitLab: https://salsa.debian.org/java-team/httpcomponents-client/-/compare/95770a427c5966ec7981ea5ff01982c4f68d0192...6b2a453bff5713f68c7d11e798c8ac06ee7ff578
--
View it on GitLab: https://salsa.debian.org/java-team/httpcomponents-client/-/compare/95770a427c5966ec7981ea5ff01982c4f68d0192...6b2a453bff5713f68c7d11e798c8ac06ee7ff578
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201009/d3ac1a71/attachment.html>
More information about the pkg-java-commits
mailing list