diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Framework/Communications/RestClient.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Framework/Communications/RestClient.cs')
-rw-r--r-- | OpenSim/Framework/Communications/RestClient.cs | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs index 4403f40..7c89e6b 100644 --- a/OpenSim/Framework/Communications/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient.cs | |||
@@ -395,26 +395,7 @@ namespace OpenSim.Framework.Communications | |||
395 | return null; | 395 | return null; |
396 | } | 396 | } |
397 | 397 | ||
398 | <<<<<<< HEAD | ||
399 | ======= | ||
400 | using (Stream src = _response.GetResponseStream()) | ||
401 | { | ||
402 | int length = src.Read(_readbuf, 0, BufferSize); | ||
403 | while (length > 0) | ||
404 | { | ||
405 | _resource.Write(_readbuf, 0, length); | ||
406 | length = src.Read(_readbuf, 0, BufferSize); | ||
407 | } | ||
408 | } | ||
409 | 398 | ||
410 | // TODO! Implement timeout, without killing the server | ||
411 | // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted | ||
412 | //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true); | ||
413 | |||
414 | // _allDone.WaitOne(); | ||
415 | if (_response != null) | ||
416 | _response.Close(); | ||
417 | >>>>>>> avn/ubitvar | ||
418 | if (_asyncException != null) | 399 | if (_asyncException != null) |
419 | throw _asyncException; | 400 | throw _asyncException; |
420 | 401 | ||
@@ -444,7 +425,6 @@ namespace OpenSim.Framework.Communications | |||
444 | auth.AddAuthorization(_request.Headers); | 425 | auth.AddAuthorization(_request.Headers); |
445 | 426 | ||
446 | src.Seek(0, SeekOrigin.Begin); | 427 | src.Seek(0, SeekOrigin.Begin); |
447 | <<<<<<< HEAD | ||
448 | 428 | ||
449 | int reqnum = WebUtil.RequestNumber++; | 429 | int reqnum = WebUtil.RequestNumber++; |
450 | if (WebUtil.DebugLevel >= 3) | 430 | if (WebUtil.DebugLevel >= 3) |
@@ -452,16 +432,7 @@ namespace OpenSim.Framework.Communications | |||
452 | if (WebUtil.DebugLevel >= 5) | 432 | if (WebUtil.DebugLevel >= 5) |
453 | WebUtil.LogOutgoingDetail(string.Format("SEND {0}: ", reqnum), src); | 433 | WebUtil.LogOutgoingDetail(string.Format("SEND {0}: ", reqnum), src); |
454 | 434 | ||
455 | Stream dst = _request.GetRequestStream(); | ||
456 | |||
457 | byte[] buf = new byte[1024]; | ||
458 | int length = src.Read(buf, 0, 1024); | ||
459 | while (length > 0) | ||
460 | ======= | ||
461 | m_log.Info("[REST]: Seek is ok"); | ||
462 | |||
463 | using (Stream dst = _request.GetRequestStream()) | 435 | using (Stream dst = _request.GetRequestStream()) |
464 | >>>>>>> avn/ubitvar | ||
465 | { | 436 | { |
466 | m_log.Info("[REST]: GetRequestStream is ok"); | 437 | m_log.Info("[REST]: GetRequestStream is ok"); |
467 | 438 | ||