calabash-android 0.4.7.pre4 → 0.4.7.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ea0a7d4c70d2f1e51351ce4cd390af26710880
-  data.tar.gz: 715c679a7e4cd6dc255ca1f5028c11b60f808151
+  metadata.gz: f28eb28ec866b329c88e7c787ac91551410ea33b
+  data.tar.gz: 2b85d6336c441215ba145e963b3352229b0dab44
 SHA512:
-  metadata.gz: 1ae14e2aec7bb5685c387a5a48ab73eadb0f86ac1d2c64b95bcba962bc5037720585b2cec0538958d0799be4cd6303422a4f72fb2f999c7955d2f8817ce0182a
-  data.tar.gz: 40b134d72e179604291e76e15274cc81966cb03c95b1f1d8a4f99a71c15d6a83668425baa147f060665717f31a913579d0dcefa435be6aa755925d33de913b68
+  metadata.gz: ac8852103ceea8b6fd8fed633d9b36956360c34eda2066173c51cb6b49ae005bc2fb829f6327998a67138ddb5556f182248d024112808ff223e395a7837f9f9e
+  data.tar.gz: c509f28838e69cec4b4e94e633b42eebfe6cbc7b73c04881fe5d9ff26c7a658594e8cad6122eac785e17455f640c4d5cdbc126fb9a86ec8cdec9e33920ac9c42

data/lib/calabash-android/helpers.rb

@@ -26,7 +26,24 @@ def main_activity(app)
 end
 
 def manifest(app)
-  `java -jar "#{File.dirname(__FILE__)}/lib/manifest_extractor.jar" "#{app}"`
+  out_path = manifest_path(app)
+  manifest_file = File.join(out_path, 'AndroidManifest.xml')
+
+  if File.exist?(manifest_file)
+    return File.read(manifest_file)
+  end
+
+  manifest_extractor = File.join(File.expand_path(File.dirname(__FILE__)),'lib', 'apktool-cli-1.5.3-SNAPSHOT.jar')
+  output = `java -jar "#{manifest_extractor}" d -s "#{app}" #{out_path} &> .calabash.extract.out`
+  unless File.size?(manifest_file)
+    f =  File.size?('.calabash.extract.out') ? File.read('.calabash.extract.out') : ''
+    raise ("Unable to extract manifest: #{output}\n#{f}")
+  else
+    output = File.read(manifest_file)
+  end
+
+  output
+
 end
 
 def checksum(file_path)
@@ -38,6 +55,10 @@ def test_server_path(apk_file_path)
   "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.apk"
 end
 
+def manifest_path(apk_file_path)
+  "test_servers/#{checksum(apk_file_path)}_#{Calabash::Android::VERSION}.res"
+end
+
 
 def build_test_server_if_needed(app_path)
   unless File.exist?(test_server_path(app_path))

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.7.pre4"
+    VERSION = "0.4.7.pre6"
   end
 end

data/test-server/instrumentation-backend/.classpath

@@ -5,7 +5,10 @@
 	<classpathentry kind="src" path="assets"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="lib" path="libs/robotium-solo-3.6.jar"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="lib" path="libs/robotium-solo-4.1.jar"/>
+	<classpathentry kind="lib" path="libs/jackson-core-2.2.0-rc2-20130420.041001-2.jar"/>
+	<classpathentry kind="lib" path="libs/jackson-databind-2.2.0-rc2-20130422.041053-3.jar"/>
+	<classpathentry kind="lib" path="libs/jackson-annotations-2.2.0-rc2-20130418.042013-1.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

data/test-server/instrumentation-backend/src/org/antlr/runtime/LegacyCommonTokenStream.java

@@ -27,7 +27,12 @@
  */
 package org.antlr.runtime;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /** The most common stream of tokens is one where every token is buffered up
  *  and tokens are prefiltered for a certain channel (the parser will only

data/test-server/instrumentation-backend/src/org/antlr/runtime/debug/DebugTokenStream.java

@@ -27,9 +27,9 @@
  */
 package org.antlr.runtime.debug;
 
-import org.antlr.runtime.*;
-
-import java.util.List;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenSource;
+import org.antlr.runtime.TokenStream;
 
 public class DebugTokenStream implements TokenStream {
 	protected DebugEventListener dbg;

data/test-server/instrumentation-backend/src/org/antlr/runtime/misc/FastQueue.java

@@ -27,8 +27,8 @@
  */
 package org.antlr.runtime.misc;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.NoSuchElementException;
 
 /** A queue that can dequeue and get(i) in O(1) and grow arbitrarily large.

data/test-server/instrumentation-backend/src/org/antlr/runtime/tree/BaseTreeAdaptor.java

@@ -27,13 +27,13 @@
  */
 package org.antlr.runtime.tree;
 
-import org.antlr.runtime.Token;
-import org.antlr.runtime.TokenStream;
-import org.antlr.runtime.RecognitionException;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+
 /** A TreeAdaptor that works with any Tree implementation. */
 public abstract class BaseTreeAdaptor implements TreeAdaptor {
 	/** System.identityHashCode() is not always unique; we have to

data/test-server/instrumentation-backend/src/org/antlr/runtime/tree/CommonErrorNode.java

@@ -27,7 +27,14 @@
  */
 package org.antlr.runtime.tree;
 
-import org.antlr.runtime.*;
+import org.antlr.runtime.IntStream;
+import org.antlr.runtime.MismatchedTokenException;
+import org.antlr.runtime.MissingTokenException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.UnwantedTokenException;
 
 /** A node representing erroneous token range in token stream */
 public class CommonErrorNode extends CommonTree {

data/test-server/instrumentation-backend/src/org/antlr/runtime/tree/TreeIterator.java

@@ -27,12 +27,11 @@
  */
 package org.antlr.runtime.tree;
 
+import java.util.Iterator;
+
 import org.antlr.runtime.Token;
-import org.antlr.runtime.CommonToken;
 import org.antlr.runtime.misc.FastQueue;
 
-import java.util.Iterator;
-
 /** Return a node stream from a doubly-linked tree whose nodes
  *  know what child index they are.  No remove() is supported.
  *

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/CalabashInstrumentationTestRunner.java

@@ -2,10 +2,10 @@ package sh.calaba.instrumentationbackend;
 
 import java.lang.reflect.Method;
 
+import sh.calaba.instrumentationbackend.actions.HttpServer;
 import android.content.Context;
 import android.os.Bundle;
 import android.test.InstrumentationTestRunner;
-import sh.calaba.instrumentationbackend.actions.HttpServer;
 
 public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner {
 	@Override

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java

@@ -1,15 +1,15 @@
 package sh.calaba.instrumentationbackend;
 
-import android.content.Intent;
-import android.os.Bundle;
 import sh.calaba.instrumentationbackend.actions.Actions;
 import sh.calaba.instrumentationbackend.actions.HttpServer;
 import android.Manifest;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.location.LocationManager;
+import android.os.Bundle;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/HttpServer.java

@@ -3,8 +3,10 @@ package sh.calaba.instrumentationbackend.actions;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -18,12 +20,12 @@ import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.json.JSONUtils;
 import sh.calaba.instrumentationbackend.query.Query;
-import sh.calaba.org.codehaus.jackson.map.DeserializationConfig.Feature;
-import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 import android.graphics.Bitmap;
 import android.util.Log;
 import android.view.View;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 public class HttpServer extends NanoHTTPD {
 	private static final String TAG = "InstrumentationBackend";
 	private boolean running = true;
@@ -32,9 +34,8 @@ public class HttpServer extends NanoHTTPD {
 	private final Lock lock = new ReentrantLock();
 	private final Condition shutdownCondition = lock.newCondition();
 
-	private final ObjectMapper mapper = createJsonMapper();
-
 	private static HttpServer instance;
+	
 
 	/**
 	 * Creates and returns the singleton instance for HttpServer.
@@ -45,7 +46,11 @@ public class HttpServer extends NanoHTTPD {
 		if (instance != null) {
 			throw new IllegalStateException("Can only instantiate once!");
 		}
-		instance = new HttpServer(testServerPort);
+		try {
+			instance = new HttpServer(testServerPort);
+		} catch (IOException e) {
+			new RuntimeException(e);
+		}
 		return instance;
 	}
 
@@ -56,7 +61,7 @@ public class HttpServer extends NanoHTTPD {
 		return instance;
 	}
 
-	private HttpServer(int testServerPort) {
+	private HttpServer(int testServerPort) throws IOException {
 		super(testServerPort, new File("/"));
 	}
 
@@ -64,6 +69,8 @@ public class HttpServer extends NanoHTTPD {
 	public Response serve(String uri, String method, Properties header,
 			Properties params, Properties files) {
 		System.out.println("URI: " + uri);
+		System.out.println("params: " + params);
+		
 		if (uri.endsWith("/ping")) {
 			return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, "pong");
 
@@ -179,6 +186,12 @@ public class HttpServer extends NanoHTTPD {
 
 		System.out.println("header: " + header);
 		System.out.println("params: " + params);
+		Enumeration<String> propertyNames = (Enumeration<String>) params.propertyNames();
+		while (propertyNames.hasMoreElements())
+		{
+			String s = propertyNames.nextElement();
+			System.out.println("ProP "+s+" = "+params.getProperty(s));
+		}
 		System.out.println("files: " + files);
 
 		String commandString = params.getProperty("json");
@@ -211,14 +224,10 @@ public class HttpServer extends NanoHTTPD {
 		throw new RuntimeException("Could not find any views");
 	}
 
-	private ObjectMapper createJsonMapper() {
-		ObjectMapper mapper = new ObjectMapper();
-		mapper.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES, true);
-		return mapper;
-	}
 
 	private String toJson(Result result) {
 		try {
+			ObjectMapper mapper = new ObjectMapper();
 			return mapper.writeValueAsString(result);
 		} catch (Exception e) {
 			throw new RuntimeException(e);
@@ -227,6 +236,7 @@ public class HttpServer extends NanoHTTPD {
 
 	private Result runCommand(String commandString) {
 		try {
+			ObjectMapper mapper = new ObjectMapper();
 			Command command = mapper.readValue(commandString, Command.class);
 			log("Got command:'" + command);
 			return command.execute();

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NanoHTTPD.java

@@ -2,35 +2,33 @@ package sh.calaba.instrumentationbackend.actions;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URLEncoder;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.Vector;
 import java.util.Hashtable;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
+import java.util.Vector;
 
 /**
  * A simple, tiny, nicely embeddable HTTP 1.0 (partially 1.1) server in Java
  *
- * <p> NanoHTTPD version 1.25,
- * Copyright &copy; 2001,2005-2012 Jarno Elonen (elonen@iki.fi, http://iki.fi/elonen/)
+ * <p> NanoHTTPD version 1.27,
+ * Copyright &copy; 2001,2005-2013 Jarno Elonen (elonen@iki.fi, http://iki.fi/elonen/)
  * and Copyright &copy; 2010 Konstantinos Togias (info@ktogias.gr, http://ktogias.gr)
  *
  * <p><b>Features + limitations: </b><ul>
@@ -217,31 +215,28 @@ public class NanoHTTPD
 
 	/**
 	 * Starts a HTTP server to given port.<p>
+	 * Throws an IOException if the socket is already in use
 	 */
-	public NanoHTTPD( int port, File wwwroot )
+	public NanoHTTPD( int port, File wwwroot ) throws IOException
 	{
-		try {
-			myTcpPort = port;
-			this.myRootDir = wwwroot;
-			myServerSocket = new ServerSocket( myTcpPort );
-			myThread = new Thread( new Runnable()
+		myTcpPort = port;
+		this.myRootDir = wwwroot;
+		myServerSocket = new ServerSocket( myTcpPort );
+		myThread = new Thread( new Runnable()
+			{
+				public void run()
 				{
-					public void run()
+					try
 					{
-						try
-						{
-							while( true )
-								new HTTPSession( myServerSocket.accept());
-						}
-						catch ( IOException ioe )
-						{}
+						while( true )
+							new HTTPSession( myServerSocket.accept());
 					}
-				});
-			myThread.setDaemon( true );
-			myThread.start();
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
+					catch ( IOException ioe )
+					{}
+				}
+			});
+		myThread.setDaemon( true );
+		myThread.start();
 	}
 
 	/**
@@ -258,6 +253,47 @@ public class NanoHTTPD
 		catch ( InterruptedException e ) {}
 	}
 
+
+	/**
+	 * Starts as a standalone file server and waits for Enter.
+	 */
+	public static void main( String[] args )
+	{
+		myOut.println( "NanoHTTPD 1.27 (C) 2001,2005-2013 Jarno Elonen and (C) 2010 Konstantinos Togias\n" +
+				"(Command line options: [-p port] [-d root-dir] [--licence])\n" );
+
+		// Defaults
+		int port = 80;
+		File wwwroot = new File(".").getAbsoluteFile();
+
+		// Show licence if requested
+		for ( int i=0; i<args.length; ++i )
+		if(args[i].equalsIgnoreCase("-p"))
+			port = Integer.parseInt( args[i+1] );
+		else if(args[i].equalsIgnoreCase("-d"))
+			wwwroot = new File( args[i+1] ).getAbsoluteFile();
+		else if ( args[i].toLowerCase().endsWith( "licence" ))
+		{
+			myOut.println( LICENCE + "\n" );
+			break;
+		}
+
+		try
+		{
+			new NanoHTTPD( port, wwwroot );
+		}
+		catch( IOException ioe )
+		{
+			myErr.println( "Couldn't start server:\n" + ioe );
+			System.exit( -1 );
+		}
+
+		myOut.println( "Now serving files in port " + port + " from \"" + wwwroot + "\"" );
+		myOut.println( "Hit Enter to stop.\n" );
+
+		try { System.in.read(); } catch( Throwable t ) {}
+	}
+
 	/**
 	 * Handles one session, i.e. parses the HTTP request
 	 * and returns the response.
@@ -282,10 +318,22 @@ public class NanoHTTPD
 				// Read the first 8192 bytes.
 				// The full header should fit in here.
 				// Apache's default header limit is 8KB.
-				int bufsize = 8192;
+				// Do NOT assume that a single read will get the entire header at once!
+				final int bufsize = 8192;
 				byte[] buf = new byte[bufsize];
-				int rlen = is.read(buf, 0, bufsize);
-				if (rlen <= 0) return;
+				int splitbyte = 0;
+				int rlen = 0;
+				{
+					int read = is.read(buf, 0, bufsize);
+					while (read > 0)
+					{
+						rlen += read;
+						splitbyte = findHeaderEnd(buf, rlen);
+						if (splitbyte > 0)
+							break;
+						read = is.read(buf, rlen, bufsize - rlen);
+					}
+				}
 
 				// Create a BufferedReader for parsing the header.
 				ByteArrayInputStream hbis = new ByteArrayInputStream(buf, 0, rlen);
@@ -308,33 +356,20 @@ public class NanoHTTPD
 					catch (NumberFormatException ex) {}
 				}
 
-				// We are looking for the byte separating header from body.
-				// It must be the last byte of the first two sequential new lines.
-				int splitbyte = 0;
-				boolean sbfound = false;
-				while (splitbyte < rlen)
-				{
-					if (buf[splitbyte] == '\r' && buf[++splitbyte] == '\n' && buf[++splitbyte] == '\r' && buf[++splitbyte] == '\n') {
-						sbfound = true;
-						break;
-					}
-					splitbyte++;
-				}
-				splitbyte++;
-
 				// Write the part of body already read to ByteArrayOutputStream f
 				ByteArrayOutputStream f = new ByteArrayOutputStream();
-				if (splitbyte < rlen) f.write(buf, splitbyte, rlen-splitbyte);
+				if (splitbyte < rlen)
+					f.write(buf, splitbyte, rlen-splitbyte);
 
 				// While Firefox sends on the first read all the data fitting
-				// our buffer, Chrome and Opera sends only the headers even if
-				// there is data for the body. So we do some magic here to find
+				// our buffer, Chrome and Opera send only the headers even if
+				// there is data for the body. We do some magic here to find
 				// out whether we have already consumed part of body, if we
 				// have reached the end of the data to be sent or we should
 				// expect the first byte of the body at the next read.
 				if (splitbyte < rlen)
-					size -= rlen - splitbyte +1;
-				else if (!sbfound || size == 0x7FFFFFFFFFFFFFFFl)
+					size -= rlen-splitbyte;
+				else if (splitbyte==0 || size == 0x7FFFFFFFFFFFFFFFl)
 					size = 0;
 
 				// Now read all the body and write it to f
@@ -352,7 +387,7 @@ public class NanoHTTPD
 
 				// Create a BufferedReader for easily reading it as string.
 				ByteArrayInputStream bin = new ByteArrayInputStream(fbuf);
-				BufferedReader in = new BufferedReader( new InputStreamReader(bin, "UTF-8"));
+				BufferedReader in = new BufferedReader( new InputStreamReader(bin));
 
 				// If the method is POST, there may be parameters
 				// in data section, too, read it:
@@ -360,13 +395,12 @@ public class NanoHTTPD
 				{
 					String contentType = "";
 					String contentTypeHeader = header.getProperty("content-type");
-					
 					StringTokenizer st = null;
-					if (contentTypeHeader != null) {
-					    st = new StringTokenizer(contentTypeHeader, ",; ");
-					    if (st.hasMoreTokens()) {
-					        contentType = st.nextToken();
-					    }
+					if( contentTypeHeader != null) {
+						st = new StringTokenizer( contentTypeHeader , "; " );
+						if ( st.hasMoreTokens()) {
+							contentType = st.nextToken();
+						}
 					}
 
 					if (contentType.equalsIgnoreCase("multipart/form-data"))
@@ -383,13 +417,13 @@ public class NanoHTTPD
 
 						decodeMultipartData(boundary, fbuf, in, parms, files);
 					}
-					else if (contentType.toLowerCase().startsWith("application/json")) 
+					else if (contentType.toLowerCase().startsWith("application/json"))
 					{
 						StringBuffer sb = new StringBuffer();
 						String line = null;
-						while ((line = in.readLine()) != null) 
+						while ((line = in.readLine()) != null)
 						{
-							sb.append(line + "\n");
+						sb.append(line + "\n");
 						}
 						parms.put("json", sb.toString());
 					}
@@ -525,11 +559,11 @@ public class NanoHTTPD
 						{
 							sendError( HTTP_BADREQUEST, "BAD REQUEST: Content type is multipart/form-data but no content-disposition info found. Usage: GET /example/file.html" );
 						}
-						StringTokenizer st = new StringTokenizer( contentDisposition , "; " );
+						StringTokenizer st = new StringTokenizer( contentDisposition , ";" );
 						Properties disposition = new Properties();
 						while ( st.hasMoreTokens())
 						{
-							String token = st.nextToken();
+							String token = st.nextToken().trim();
 							int p = token.indexOf( '=' );
 							if (p!=-1)
 								disposition.put( token.substring(0,p).trim().toLowerCase(), token.substring(p+1).trim());
@@ -575,6 +609,22 @@ public class NanoHTTPD
 			}
 		}
 
+		/**
+		 * Find byte index separating header from body.
+		 * It must be the last byte of the first two sequential new lines.
+		**/
+		private int findHeaderEnd(final byte[] buf, int rlen)
+		{
+			int splitbyte = 0;
+			while (splitbyte + 3 < rlen)
+			{
+				if (buf[splitbyte] == '\r' && buf[splitbyte + 1] == '\n' && buf[splitbyte + 2] == '\r' && buf[splitbyte + 3] == '\n')
+					return splitbyte + 4;
+				splitbyte++;
+			}
+			return 0;
+		}
+
 		/**
 		 * Find the byte positions where multipart boundaries start.
 		**/
@@ -660,25 +710,26 @@ public class NanoHTTPD
 		{
 			try
 			{
-				StringBuffer sb = new StringBuffer();
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
 				for( int i=0; i<str.length(); i++ )
 				{
 					char c = str.charAt( i );
 					switch ( c )
 					{
 						case '+':
-							sb.append( ' ' );
+							baos.write( (int)' ' );
 							break;
 						case '%':
-							sb.append((char)Integer.parseInt( str.substring(i+1,i+3), 16 ));
+							baos.write(Integer.parseInt( str.substring(i+1,i+3), 16 ));
 							i += 2;
 							break;
 						default:
-							sb.append( c );
+							baos.write( (int)c );
 							break;
 					}
 				}
-				return sb.toString();
+
+				return new String( baos.toByteArray(), "UTF-8");
 			}
 			catch( Exception e )
 			{
@@ -708,6 +759,8 @@ public class NanoHTTPD
 				if ( sep >= 0 )
 					p.put( decodePercent( e.substring( 0, sep )).trim(),
 						   decodePercent( e.substring( sep+1 )));
+				else
+					p.put( decodePercent( e ).trim(), "" );
 			}
 		}
 
@@ -971,6 +1024,8 @@ public class NanoHTTPD
 					{
 						res = new Response( HTTP_RANGE_NOT_SATISFIABLE, MIME_PLAINTEXT, "" );
 						res.addHeader( "Content-Range", "bytes 0-0/" + fileLen);
+						if ( mime.startsWith( "application/" ))
+						  res.addHeader( "Content-Disposition", "attachment; filename=\"" + f.getName() + "\"");
 						res.addHeader( "ETag", etag);
 					}
 					else
@@ -989,6 +1044,8 @@ public class NanoHTTPD
 						res = new Response( HTTP_PARTIALCONTENT, mime, fis );
 						res.addHeader( "Content-Length", "" + dataLen);
 						res.addHeader( "Content-Range", "bytes " + startFrom + "-" + endAt + "/" + fileLen);
+						if ( mime.startsWith( "application/" ))
+							res.addHeader( "Content-Disposition", "attachment; filename=\"" + f.getName() + "\"");
 						res.addHeader( "ETag", etag);
 					}
 				}
@@ -1000,6 +1057,8 @@ public class NanoHTTPD
 					{
 						res = new Response( HTTP_OK, mime, new FileInputStream( f ));
 						res.addHeader( "Content-Length", "" + fileLen);
+						if ( mime.startsWith( "application/" ))
+							res.addHeader( "Content-Disposition", "attachment; filename=\"" + f.getName() + "\"");
 						res.addHeader( "ETag", etag);
 					}
 				}
@@ -1038,7 +1097,7 @@ public class NanoHTTPD
 			"flv		video/x-flv " +
 			"mov		video/quicktime " +
 			"swf		application/x-shockwave-flash " +
-			"js			application/javascript "+
+			"js		application/javascript "+
 			"pdf		application/pdf "+
 			"doc		application/msword "+
 			"ogg		application/x-ogg "+
@@ -1069,7 +1128,7 @@ public class NanoHTTPD
 	 * The distribution licence
 	 */
 	private static final String LICENCE =
-		"Copyright (C) 2001,2005-2011 by Jarno Elonen <elonen@iki.fi>\n"+
+		"Copyright (C) 2001,2005-2013 by Jarno Elonen <elonen@iki.fi>\n"+
 		"and Copyright (C) 2010 by Konstantinos Togias <info@ktogias.gr>\n"+
 		"\n"+
 		"Redistribution and use in source and binary forms, with or without\n"+