|
@@ -599,8 +599,7 @@ discard block |
|
|
block discarded – undo |
|
599
|
599
|
//Note: Response content type can be null for named stream |
|
600
|
600
|
if ($hasResponseBody && null !== $responseContentType && |
|
601
|
601
|
TargetKind::MEDIA_RESOURCE() != $request->getTargetKind() && |
|
602
|
|
- MimeTypes::MIME_APPLICATION_OCTETSTREAM != $responseContentType) |
|
603
|
|
- { |
|
|
602
|
+ MimeTypes::MIME_APPLICATION_OCTETSTREAM != $responseContentType) { |
|
604
|
603
|
//append charset for everything except: |
|
605
|
604
|
//stream resources as they have their own content type |
|
606
|
605
|
//binary properties (they content type will be App Octet for those...is this a good way? |
|
@@ -673,7 +672,7 @@ discard block |
|
|
block discarded – undo |
|
673
|
672
|
TargetKind::RESOURCE()->getValue() => array_merge([MimeTypes::MIME_APPLICATION_ATOM], $baseMimeTypes), |
|
674
|
673
|
]; |
|
675
|
674
|
|
|
676
|
|
- if($targetKind && array_key_exists($targetKind->getValue(),$availableMimeTypesByTarget)){ |
|
|
675
|
+ if($targetKind && array_key_exists($targetKind->getValue(),$availableMimeTypesByTarget)) { |
|
677
|
676
|
return HttpProcessUtility::selectMimeType($requestAcceptText, $availableMimeTypesByTarget[$targetKind->getValue()]); |
|
678
|
677
|
|
|
679
|
678
|
} |
Please login to merge, or discard this patch.