Skip to content

Fixed issue Unable to open URL for downloadable product #19996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Feb 15, 2019
Merged

Fixed issue Unable to open URL for downloadable product #19996

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
76040cc
Updated Download.php
Dec 27, 2018
d5b7745
Updated Http.php
Dec 27, 2018
3285908
Update Download.php
milindsingh Dec 29, 2018
116c4a7
Updated to reduce overall complexity of function
df2k2 Dec 31, 2018
5ecf410
Merged logic and reduced overall complexity of function
df2k2 Dec 31, 2018
01a5fce
Updated Http.php
Jan 2, 2019
f1867c9
updated Download.php
Jan 21, 2019
2072100
Update Download.php
mageprince Jan 23, 2019
1bb672c
updated Download.php
Jan 28, 2019
5ba9c1b
Updated Download.php
Jan 28, 2019
420a06d
Merge remote-tracking branch 'mainline/2.3-develop' into 2.3devlopPR1…
nmalevanec Feb 11, 2019
c020b2c
Fix static test.
nmalevanec Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions app/code/Magento/Downloadable/Helper/Download.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,22 +183,23 @@ public function getFileSize()
*
* @return string
*/
public function getContentType()
public function getContentType()
{
$this->_getHandle();
if ($this->_linkType == self::LINK_TYPE_FILE) {
if (function_exists(
'mime_content_type'
) && ($contentType = mime_content_type(
$this->_workingDirectory->getAbsolutePath($this->_resourceFile)
))
if ($this->_linkType === self::LINK_TYPE_FILE) {
if (function_exists('mime_content_type')
&& ($contentType = mime_content_type(
$this->_workingDirectory->getAbsolutePath($this->_resourceFile)
))
) {
return $contentType;
} else {
return $this->_downloadableFile->getFileType($this->_resourceFile);
}
} elseif ($this->_linkType == self::LINK_TYPE_URL) {
return $this->_handle->stat($this->_resourceFile)['type'];
return $this->_downloadableFile->getFileType($this->_resourceFile);
}
if ($this->_linkType === self::LINK_TYPE_URL) {
return (is_array($this->_handle->stat($this->_resourceFile)['type'])
? end($this->_handle->stat($this->_resourceFile)['type'])
: $this->_handle->stat($this->_resourceFile)['type']);
}
return $this->_contentType;
}
Expand Down
14 changes: 3 additions & 11 deletions lib/internal/Magento/Framework/Filesystem/Driver/Http.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,18 @@ class Http extends File
*
* @param string $path
* @return bool
* @throws FileSystemException
*/
public function isExists($path)
{
$headers = array_change_key_case(get_headers($this->getScheme() . $path, 1), CASE_LOWER);

$status = $headers[0];

/* Handling 302 redirection */
if (strpos($status, '302 Found') !== false && isset($headers[1])) {
/* Handling 301 or 302 redirection */
if (isset($headers[1]) && preg_match('/30[12]/', $status)) {
$status = $headers[1];
}

if (strpos($status, '200 OK') === false) {
$result = false;
} else {
$result = true;
}

return $result;
return !(strpos($status, '200 OK') === false);
}

/**
Expand Down