From ab0716ed1ea2957396054730afbb80c1825f9786 Mon Sep 17 00:00:00 2001
From: Francisco Facioni <fran6co@gmail.com>
Date: Wed, 29 May 2019 00:15:11 +0100
Subject: [PATCH] bpo-22102: Fixes zip files with disks set to 0 (GH-5985)

---
 Lib/zipfile.py                                                  | 2 +-
 .../next/Library/2018-03-08-16-15-00.bpo-22102.th33uD.rst       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 Misc/NEWS.d/next/Library/2018-03-08-16-15-00.bpo-22102.th33uD.rst

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 8f8cb863b00..5496f6eb186 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -226,7 +226,7 @@ def _EndRecData64(fpin, offset, endrec):
     if sig != stringEndArchive64Locator:
         return endrec
 
-    if diskno != 0 or disks != 1:
+    if diskno != 0 or disks > 1:
         raise BadZipFile("zipfiles that span multiple disks are not supported")
 
     # Assume no 'zip64 extensible data'
diff --git a/Misc/NEWS.d/next/Library/2018-03-08-16-15-00.bpo-22102.th33uD.rst b/Misc/NEWS.d/next/Library/2018-03-08-16-15-00.bpo-22102.th33uD.rst
new file mode 100644
index 00000000000..ad690f57c52
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-03-08-16-15-00.bpo-22102.th33uD.rst
@@ -0,0 +1,2 @@
+Added support for ZIP files with disks set to 0. Such files are commonly created by builtin tools on Windows when use ZIP64 extension.
+Patch by Francisco Facioni.