Mercurial > hg > ucis.core

changeset 101:04c56f31db37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ivo Smits <Ivo@UCIS.nl>
date Mon, 29 Sep 2014 01:36:27 +0200
parents 2b5e7bb9b979 (current diff) be17dd3f6927 (diff)
children 1474f92cf7e7
files Net/HTTP.cs
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Net/HTTP.cs	Wed Sep 03 21:44:26 2014 +0200
+++ b/Net/HTTP.cs	Mon Sep 29 01:36:27 2014 +0200
@@ -732,8 +732,14 @@
 		}
 
 		private void SendErrorAndClose(int code) {
-			SendErrorResponse(code);
-			Close();
+			try {
+				SendErrorResponse(code);
+			} catch (IOException) {
+			} catch (SocketException) {
+			} catch (ObjectDisposedException) {
+			} finally {
+				Close();
+			}
 		}
 		private void Close() {
 			if (State == HTTPConnectionState.Closed) return;
--- a/USBLib/Communication/LibUsb1/libusb1.cs	Wed Sep 03 21:44:26 2014 +0200
+++ b/USBLib/Communication/LibUsb1/libusb1.cs	Mon Sep 29 01:36:27 2014 +0200
@@ -29,7 +29,7 @@
 	}
 	unsafe static class libusb1 {
 		const CallingConvention LIBUSB1_CC = CallingConvention.Winapi;
-		const String LIBUSB1_DLL = "libusb-1.0.dll";
+		const String LIBUSB1_DLL = "libusb-1.0";
 
 		[StructLayout(LayoutKind.Sequential, Pack = 1)]
 		public struct libusb_device_descriptor {