Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79315 ZipArchive::addFile doesn't honor start/length parameters

Author: remicollet

ext/zip/php_zip.c

@@ -1791,7 +1791,8 @@ static ZIPARCHIVE_METHOD(addFile)
 		entry_name_len = ZSTR_LEN(filename);
 	}
 
-	if (php_zip_add_file(intern, ZSTR_VAL(filename), ZSTR_LEN(filename), entry_name, entry_name_len, 0, 0) < 0) {
+	if (php_zip_add_file(intern, ZSTR_VAL(filename), ZSTR_LEN(filename),
+			entry_name, entry_name_len, offset_start, offset_len) < 0) {
 		RETURN_FALSE;
 	} else {
 		RETURN_TRUE;

ext/zip/tests/oo_addfile.phpt

@@ -20,13 +20,17 @@ if (!$zip->open($file)) {
 if (!$zip->addFile($dirname . 'utils.inc', 'test.php')) {
 	echo "failed\n";
 }
+if (!$zip->addFile($dirname . 'utils.inc', 'mini.txt', 12, 34)) {
+	echo "failed\n";
+}
 if ($zip->status == ZIPARCHIVE::ER_OK) {
 	if (!verify_entries($zip, [
 		"bar",
 		"foobar/",
 		"foobar/baz",
 		"entry1.txt",
-		"test.php"
+		"test.php",
+		"mini.txt"
 	])) {
 		echo "failed\n";
 	} else {
@@ -36,7 +40,14 @@ if ($zip->status == ZIPARCHIVE::ER_OK) {
 } else {
 	echo "failed\n";
 }
+if (!$zip->open($file)) {
+	exit('failed');
+}
+var_dump(strlen($zip->getFromName('test.php')) == filesize($dirname . 'utils.inc'));
+var_dump(strlen($zip->getFromName('mini.txt')) == 34);
 @unlink($file);
 ?>
 --EXPECT--
 OK
+bool(true)
+bool(true)