diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 2b13a8b..5541063 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -412,7 +412,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
412 | //public bool HttpVerboseThrottle = true; // not implemented | 412 | //public bool HttpVerboseThrottle = true; // not implemented |
413 | public List<string> HttpCustomHeaders = null; | 413 | public List<string> HttpCustomHeaders = null; |
414 | public bool HttpPragmaNoCache = true; | 414 | public bool HttpPragmaNoCache = true; |
415 | private Thread httpThread; | ||
416 | 415 | ||
417 | // Request info | 416 | // Request info |
418 | private UUID _itemID; | 417 | private UUID _itemID; |
@@ -501,9 +500,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
501 | Request.Headers.Add(HttpCustomHeaders[i], | 500 | Request.Headers.Add(HttpCustomHeaders[i], |
502 | HttpCustomHeaders[i+1]); | 501 | HttpCustomHeaders[i+1]); |
503 | } | 502 | } |
504 | if (proxyurl != null && proxyurl.Length > 0) | 503 | if (!string.IsNullOrEmpty(proxyurl)) |
505 | { | 504 | { |
506 | if (proxyexcepts != null && proxyexcepts.Length > 0) | 505 | if (!string.IsNullOrEmpty(proxyexcepts)) |
507 | { | 506 | { |
508 | string[] elist = proxyexcepts.Split(';'); | 507 | string[] elist = proxyexcepts.Split(';'); |
509 | Request.Proxy = new WebProxy(proxyurl, true, elist); | 508 | Request.Proxy = new WebProxy(proxyurl, true, elist); |
@@ -521,7 +520,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
521 | Request.Headers[entry.Key] = entry.Value; | 520 | Request.Headers[entry.Key] = entry.Value; |
522 | 521 | ||
523 | // Encode outbound data | 522 | // Encode outbound data |
524 | if (OutboundBody.Length > 0) | 523 | if (!string.IsNullOrEmpty(OutboundBody)) |
525 | { | 524 | { |
526 | byte[] data = Util.UTF8.GetBytes(OutboundBody); | 525 | byte[] data = Util.UTF8.GetBytes(OutboundBody); |
527 | 526 | ||
@@ -622,7 +621,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
622 | { | 621 | { |
623 | if (!WorkItem.Cancel()) | 622 | if (!WorkItem.Cancel()) |
624 | { | 623 | { |
625 | WorkItem.Abort(); | 624 | WorkItem.Cancel(true); |
626 | } | 625 | } |
627 | } | 626 | } |
628 | catch (Exception) | 627 | catch (Exception) |