diff --git a/composer.json b/composer.json index b00d316..3cea102 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "ext-simplexml": "*", "drupal/search_api": "~1.12", "consolidation/annotated-command": "^2.12", - "maennchen/zipstream-php": "0.4.*", + "maennchen/zipstream-php": "^1.1.0", "solarium/solarium": "~5.0.2", "zendframework/zend-stdlib": "^3.0.1" }, diff --git a/ludwig.json b/ludwig.json index bd0ed4d..4bf98aa 100644 --- a/ludwig.json +++ b/ludwig.json @@ -5,8 +5,8 @@ "url": "https://github.com/solariumphp/solarium/archive/5.0.2.zip" }, "maennchen/zipstream-php": { - "version" : "0.4.1", - "url": "https://github.com/maennchen/ZipStream-PHP/archive/v0.4.1.zip" + "version" : "1.1.0", + "url": "https://github.com/maennchen/ZipStream-PHP/archive/1.1.0.zip" }, "consolidation/annotated-command": { "version" : "2.12.0", diff --git a/src/Controller/SolrFieldTypeListBuilder.php b/src/Controller/SolrFieldTypeListBuilder.php index 21e7d5f..7952794 100644 --- a/src/Controller/SolrFieldTypeListBuilder.php +++ b/src/Controller/SolrFieldTypeListBuilder.php @@ -10,6 +10,7 @@ use Drupal\search_api_solr\Plugin\search_api\backend\SearchApiSolrBackend; use Drupal\search_api_solr\SearchApiSolrException; use Drupal\search_api_solr\SolrBackendInterface; use Drupal\search_api_solr\Utility\Utility; +use ZipStream\Option\Archive; use ZipStream\ZipStream; /** @@ -460,7 +461,10 @@ class SolrFieldTypeListBuilder extends ConfigEntityListBuilder { $connector = $backend->getSolrConnector(); $solr_branch = $connector->getSolrBranch($this->assumed_minimum_version); - $zip = new ZipStream('solr_' . $solr_branch . '_config.zip'); + $archive_options = new Archive(); + $archive_options->setSendHttpHeaders(TRUE); + + $zip = new ZipStream('solr_' . $solr_branch . '_config.zip', $archive_options); $files = $this->getConfigFiles();