Http data server Fixed binary data retrieval

test/test_http_data.sh

@@ -116,6 +116,9 @@ EOF
 # remove read access
 chmod 660 $dir/www/data/noread.html
 
+# bitmap
+cp ./clixon.png  $dir/www/data/
+
 # Http test routine with arguments:
 # 1. proto:http/https
 function testrun()
@@ -221,6 +224,15 @@ EOF
 	new "WWW options"
 	expectpart "$(curl $CURLOPTS -X OPTIONS $proto://localhost/data/index.html)" 0 "HTTP/$HVER 200" "allow: OPTIONS,HEAD,GET" 
 
+	# Remove -i option for binary transfer
+	CURLOPTS2=$(echo $CURLOPTS | sed 's/i//')
+	new "WWW binary bitmap"
+	curl $CURLOPTS2 -X GET $proto://localhost/data/clixon.png -o $dir/foo.png
+	cmp $dir/foo.png $dir/www/data/clixon.png
+	if [ $? -ne 0 ]; then
+	    err1 "$dir/foo.png $dir/www/data/example.css should be equal" "Not equal"
+	fi
+
 	# negative errors
 	new "WWW get http not found"
 	expectpart "$(curl $CURLOPTS -X GET -H 'Accept: text/html' $proto://localhost/data/notfound.html)" 0 "HTTP/$HVER 404" "Content-Type: text/html" "<title>404 Not Found</title>"
@@ -254,7 +266,7 @@ EOF
 	expectpart "$(curl $CURLOPTS -X POST -H 'Accept: text/html' -H "Content-Type: application/yang-data+json" -d '{"ietf-interfaces:interfaces":{"interface":{"name":"eth/0/0","type":"clixon-example:eth","enabled":true}}}' $proto://localhost/data/notfound.html)" 0 "HTTP/$HVER 405" "Content-Type: text/html" "<title>405 Method Not Allowed</title>"
 
     fi 
-    
+
     if [ $RC -ne 0 ]; then
 	new "Kill restconf daemon"
 	stop_restconf

test/test_perf_restconf.sh

@@ -144,11 +144,12 @@ if [ $r -ne 0 ]; then
     err1 "retval 0" $r
 fi
 
+# XXX ftest har \n
 # Only compare relevant data line
 echo -n "<data>">> $ftest
 cat $fdataxml >> $ftest
-echo "</data>
" >> $ftest
-# -i dont always work properly
+echo -n "</data>" >> $ftest
+# -i (ignore case) dont always work properly
 sed '/<data>/!d' $foutput > $foutput2
 mv $foutput2 $foutput
 

test/test_perf_restconf_ssl.sh

@@ -163,7 +163,8 @@ fi
 # Only compare relevant data line
 echo -n "<data>">> $ftest
 cat $fdataxml >> $ftest
-echo "</data>
" >> $ftest
+#echo "</data>
" >> $ftest
+echo -n "</data>" >> $ftest
 sed '/<data>/!d' $foutput > $foutput2
 mv $foutput2 $foutput