Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Changing the function performHttpRequest to make downloading of files possible. #1482

Merged
merged 2 commits into from Jun 12, 2012

Conversation

fchambos
Copy link
Contributor

This correct allow to use upload function which required a content type.

Signed-off-by: fchambos fabien.chambosse@groupe-regards.com

This correct allow to use upload function which required a content type.

Signed-off-by: fchambos <fabien.chambosse@groupe-regards.com>
//$headers['Content-Type'] = $contentType;
if ($contentType != null){
$headers['Content-Type'] = $contentType;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lines 610 and 611 -- please change tabs to 4 spaces.

This correct allow to use upload function which required a content type.

Signed-off-by: fchambos <Fabien@PC-FCHAMB.(none)>
@EvanDotPro EvanDotPro merged commit 5e4b68c into zendframework:master Jun 12, 2012
@EvanDotPro
Copy link
Member

Thanks. Please commit to a topic branch instead of master next time. Your master branch has now diverged from the canonical master branch. To fix this run:

git checkout master
git reset --hard 093e4996
git push -f origin master

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants