Merge remote-tracking branch 'origin/dev'

Former-commit-id: 412def30749a89c6d6686f830a218809c8271f38

src/ImageProcessor.Web/NET45/HttpModules/ImageProcessingModule.cs

@@ -167,7 +167,9 @@ namespace ImageProcessor.Web.HttpModules
         private async Task ProcessImageAsync(HttpContext context)
         {
             HttpRequest request = context.Request;
-            bool isRemote = request.Path.Equals(RemotePrefix, StringComparison.OrdinalIgnoreCase);
+
+            // Fixes issue 10.
+            bool isRemote = request.Path.EndsWith(RemotePrefix, StringComparison.OrdinalIgnoreCase);
             string requestPath = string.Empty;
             string queryString = string.Empty;
 
@@ -176,8 +178,14 @@ namespace ImageProcessor.Web.HttpModules
                 // We need to split the querystring to get the actual values we want.
                 string urlDecode = HttpUtility.UrlDecode(request.QueryString.ToString());
 
-                if (urlDecode != null)
+                if (!string.IsNullOrWhiteSpace(urlDecode))
+                {
+                    // UrlDecode seems to mess up in some circumstance.
+                    if (urlDecode.IndexOf("://", StringComparison.OrdinalIgnoreCase) == -1)
                     {
+                        urlDecode = urlDecode.Replace(":/", "://");
+                    }
+
                     string[] paths = urlDecode.Split('?');
 
                     requestPath = paths[0];

src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.3.0.0")]
-[assembly: AssemblyFileVersion("2.3.0.0")]
+[assembly: AssemblyVersion("2.3.0.1")]
+[assembly: AssemblyFileVersion("2.3.0.1")]

src/Nuget/ImageProcessor.Web.2.3.0.1.nupkg.REMOVED.git-id

@@ -0,0 +1 @@
+8a839fc32a168bcddd1bd9043d64e9502bab4e99

src/packages/sqlite-net.1.0.7/content/SQLite.cs.REMOVED.git-id

@@ -1 +1 @@
-86139d135bd91c43d8ffe8808f0f04975fd22a82
+d2856e3733eb6c7d85057c37ae415e54c8bf2386

src/packages/sqlite-net.1.0.7/content/SQLiteAsync.cs

@@ -86,14 +86,11 @@ namespace SQLite
 
 		public Task<CreateTablesResult> CreateTablesAsync (params Type[] types)
 		{
-            return Task.Factory.StartNew(() =>
-            {
+			return Task.Factory.StartNew (() => {
 				CreateTablesResult result = new CreateTablesResult ();
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
-                    foreach (Type type in types)
-                    {
+				using (conn.Lock ()) {
+					foreach (Type type in types) {
 						int aResult = conn.CreateTable (type);
 						result.Results[type] = aResult;
 					}
@@ -105,11 +102,9 @@ namespace SQLite
 		public Task<int> DropTableAsync<T> ()
 			where T : new ()
 		{
-            return Task.Factory.StartNew(() =>
-            {
+			return Task.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					return conn.DropTable<T> ();
 				}
 			});
@@ -117,11 +112,9 @@ namespace SQLite
 
 		public Task<int> InsertAsync (object item)
 		{
-            return Task.Factory.StartNew(() =>
-            {
+			return Task.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					return conn.Insert (item);
 				}
 			});
@@ -129,11 +122,9 @@ namespace SQLite
 
 		public Task<int> UpdateAsync (object item)
 		{
-            return Task.Factory.StartNew(() =>
-            {
+			return Task.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					return conn.Update (item);
 				}
 			});
@@ -141,11 +132,9 @@ namespace SQLite
 
 		public Task<int> DeleteAsync (object item)
 		{
-            return Task.Factory.StartNew(() =>
-            {
+			return Task.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					return conn.Delete (item);
 				}
 			});
@@ -167,11 +156,9 @@ namespace SQLite
 		public Task<T> FindAsync<T> (object pk)
 			where T : new ()
 		{
-            return Task.Factory.StartNew(() =>
-            {
+			return Task.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					return conn.Find<T> (pk);
 				}
 			});
@@ -193,11 +180,9 @@ namespace SQLite
 		public Task<T> FindAsync<T> (Expression<Func<T, bool>> predicate)
 			where T : new ()
 		{
-            return Task.Factory.StartNew(() =>
-            {
+			return Task.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					return conn.Find<T> (predicate);
 				}
 			});
@@ -205,11 +190,9 @@ namespace SQLite
 
 		public Task<int> ExecuteAsync (string query, params object[] args)
 		{
-            return Task<int>.Factory.StartNew(() =>
-            {
+			return Task<int>.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					return conn.Execute (query, args);
 				}
 			});
@@ -217,11 +200,9 @@ namespace SQLite
 
 		public Task<int> InsertAllAsync (IEnumerable items)
 		{
-            return Task.Factory.StartNew(() =>
-            {
+			return Task.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					return conn.InsertAll (items);
 				}
 			});
@@ -230,19 +211,15 @@ namespace SQLite
         [Obsolete("Will cause a deadlock if any call in action ends up in a different thread. Use RunInTransactionAsync(Action<SQLiteConnection>) instead.")]
 		public Task RunInTransactionAsync (Action<SQLiteAsyncConnection> action)
 		{
-            return Task.Factory.StartNew(() =>
-            {
+			return Task.Factory.StartNew (() => {
 				var conn = this.GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					conn.BeginTransaction ();
-                    try
-                    {
+					try {
 						action (this);
 						conn.Commit ();
 					}
-                    catch (Exception)
-                    {
+					catch (Exception) {
 						conn.Rollback ();
 						throw;
 					}
@@ -285,11 +262,9 @@ namespace SQLite
 
 		public Task<T> ExecuteScalarAsync<T> (string sql, params object[] args)
 		{
-            return Task<T>.Factory.StartNew(() =>
-            {
+			return Task<T>.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					var command = conn.CreateCommand (sql, args);
 					return command.ExecuteScalar<T> ();
 				}
@@ -299,11 +274,9 @@ namespace SQLite
 		public Task<List<T>> QueryAsync<T> (string sql, params object[] args)
 			where T : new ()
 		{
-            return Task<List<T>>.Factory.StartNew(() =>
-            {
+			return Task<List<T>>.Factory.StartNew (() => {
 				var conn = GetConnection ();
-                using (conn.Lock())
-                {
+				using (conn.Lock ()) {
 					return conn.Query<T> (sql, args);
 				}
 			});
@@ -351,10 +324,8 @@ namespace SQLite
 
 		public Task<List<T>> ToListAsync ()
 		{
-            return Task.Factory.StartNew(() =>
-            {
-                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
-                {
+			return Task.Factory.StartNew (() => {
+				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
 					return _innerQuery.ToList ();
 				}
 			});
@@ -362,10 +333,8 @@ namespace SQLite
 
 		public Task<int> CountAsync ()
 		{
-            return Task.Factory.StartNew(() =>
-            {
-                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
-                {
+			return Task.Factory.StartNew (() => {
+				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
 					return _innerQuery.Count ();
 				}
 			});
@@ -373,10 +342,8 @@ namespace SQLite
 
 		public Task<T> ElementAtAsync (int index)
 		{
-            return Task.Factory.StartNew(() =>
-            {
-                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
-                {
+			return Task.Factory.StartNew (() => {
+				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
 					return _innerQuery.ElementAt (index);
 				}
 			});
@@ -384,10 +351,8 @@ namespace SQLite
 
 		public Task<T> FirstAsync ()
 		{
-            return Task<T>.Factory.StartNew(() =>
-            {
-                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
-                {
+			return Task<T>.Factory.StartNew(() => {
+				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
 					return _innerQuery.First ();
 				}
 			});
@@ -395,10 +360,8 @@ namespace SQLite
 
 		public Task<T> FirstOrDefaultAsync ()
 		{
-            return Task<T>.Factory.StartNew(() =>
-            {
-                using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock())
-                {
+			return Task<T>.Factory.StartNew(() => {
+				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
 					return _innerQuery.FirstOrDefault ();
 				}
 			});
@@ -453,13 +416,11 @@ namespace SQLite
 
 		public SQLiteConnectionWithLock GetConnection (SQLiteConnectionString connectionString)
 		{
-            lock (_entriesLock)
-            {
+			lock (_entriesLock) {
 				Entry entry;
 				string key = connectionString.ConnectionString;
 
-                if (!_entries.TryGetValue(key, out entry))
-                {
+				if (!_entries.TryGetValue (key, out entry)) {
 					entry = new Entry (connectionString);
 					_entries[key] = entry;
 				}
@@ -473,10 +434,8 @@ namespace SQLite
 		/// </summary>
 		public void Reset ()
 		{
-            lock (_entriesLock)
-            {
-                foreach (var entry in _entries.Values)
-                {
+			lock (_entriesLock) {
+				foreach (var entry in _entries.Values) {
 					entry.OnApplicationSuspended ();
 				}
 				_entries.Clear ();