Merge pull request #1221 from nextcloud/proper_204_304_response

No body or content-length for 204 and 304 responses

1 files changed, 14 insertions, 5 deletions

diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php
index c7670953b4e..5a8099ec7d0 100644
--- a/lib/private/AppFramework/App.php
+++ b/lib/private/AppFramework/App.php
@@ -30,6 +30,7 @@ namespace OC\AppFramework;
 use OC\AppFramework\Http\Dispatcher;
 use OC_App;
 use OC\AppFramework\DependencyInjection\DIContainer;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\QueryException;
 use OCP\AppFramework\Http\ICallbackResponse;
 
@@ -142,11 +143,19 @@ class App {
 			);
 		}
 
-		if ($response instanceof ICallbackResponse) {
-			$response->callback($io);
-		} else if(!is_null($output)) {
-			$io->setHeader('Content-Length: ' . strlen($output));
-			$io->setOutput($output);
+		/*
+		 * Status 204 does not have a body and no Content Length
+		 * Status 304 does not have a body and does not need a Content Length
+		 * https://tools.ietf.org/html/rfc7230#section-3.3
+		 * https://tools.ietf.org/html/rfc7230#section-3.3.2
+		 */
+		if ($httpHeaders !== Http::STATUS_NO_CONTENT && $httpHeaders !== Http::STATUS_NOT_MODIFIED) {
+			if ($response instanceof ICallbackResponse) {
+				$response->callback($io);
+			} else if (!is_null($output)) {
+				$io->setHeader('Content-Length: ' . strlen($output));
+				$io->setOutput($output);
+			}
 		}
 
 	}