From 7bb636ef4d6ec9abf829451fc8844460bd0e7b41 Mon Sep 17 00:00:00 2001 From: "bg.chun" Date: Fri, 8 Jul 2016 10:55:19 +0900 Subject: [PATCH] Change as do not set CONTENT_FORMAT OPT when server response without payload. On current impl server add CONTENT_FORMAT OPT when response to client, if CONTENT_FORMAT setted on client request. even payload is not exist on server response. So, change it as check payload is exist on response before put CONTENT_FORMAT. Reported-by: byonggon chun Change-Id: Iced9952adb55304440089c32d658359a67f1dcd5 Signed-off-by: bg.chun Reviewed-on: https://gerrit.iotivity.org/gerrit/9233 Tested-by: jenkins-iotivity Reviewed-by: Jaewook Jung Reviewed-by: Jaehong Jo Reviewed-by: Jon A. Cruz --- resource/csdk/stack/src/ocserverrequest.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resource/csdk/stack/src/ocserverrequest.c b/resource/csdk/stack/src/ocserverrequest.c index 2b4d1b3..d46f889 100644 --- a/resource/csdk/stack/src/ocserverrequest.c +++ b/resource/csdk/stack/src/ocserverrequest.c @@ -642,7 +642,11 @@ OCStackResult HandleSingleResponse(OCEntityHandlerResponse * ehResponse) OICFree(responseInfo.info.options); return result; } - responseInfo.info.payloadFormat = CA_FORMAT_APPLICATION_CBOR; + //Add CONTENT_FORMAT OPT if payload exist + if (responseInfo.info.payloadSize > 0) + { + responseInfo.info.payloadFormat = CA_FORMAT_APPLICATION_CBOR; + } break; default: responseInfo.result = CA_NOT_ACCEPTABLE; -- 2.7.4