Merge branch 'master' into printerdriver

Conflicts:
	src/conf_defaults.lua

extra/api-stresstest.sh

@@ -14,12 +14,13 @@
 
 WIFIBOX_IP=192.168.5.1
 #WIFIBOX_IP=192.168.10.1
-API_BASE=$WIFIBOX_IP/d3dapi
+#API_BASE=$WIFIBOX_IP/d3dapi
+API_BASE=$WIFIBOX_IP/cgi-bin/d3dapi
 WGET=wget
 #REQUEST_PATH=network/status
 REQUEST_PATH=printer/print
 #POST_PARMS=--post-data=xyzzy
-POST_PARMS=--post-file=lorem.txt
+POST_PARMS=--post-file=200k.gcode
 
 RETRIES=1
 
@@ -30,14 +31,14 @@ while true; do
 	$WGET -q -O - $POST_PARMS -t $RETRIES $API_BASE/$REQUEST_PATH 2>&1 >/dev/null
 	#check $? (and time spent?)
 	#print line every 100 counts or when a timeout/error occurs?
-	
+
 	if [ $? -gt 0 ]; then
 		echo "response error at counter: $counter"
 	fi
-	
+
 	if [ `expr $counter % 25` -eq 0 ]; then
 		echo "counter: $counter"
 	fi
-	
+
 	counter=`expr $counter + 1`
 done