0006051: Once an http-in url has been released with llReleaseURL(), hitting that stale URL results in two exceptions

View Issue Details [ Jump to Notes ]

[ Issue History ] [ Print ]

Project

Tags

No tags attached.

Git Revision or version number

ed513fc

Run Mode

Grid (Multiple Regions per Sim)

Physics Engine

ODE

Environment

Mono / Linux64

Mono Version

2.10

Viewer

Dolphin, SL Viewer

Attached Files

UrlModule.cs.patch [^] (1,972 bytes) 2012-06-16 16:01 [Show Content] [Hide Content]

diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 77dfcc6..a4a8d4c 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -361,8 +361,13 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             UrlData url;
             lock (m_RequestMap)
             {
-                if (!m_RequestMap.ContainsKey(requestID))
+                if (!m_RequestMap.ContainsKey(requestID)) {
+                    response["int_response_code"] = 404;
+                    response["str_response_string"] = "";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
                     return response;
+                }
                 url = m_RequestMap[requestID];
             }
 
@@ -484,10 +489,15 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     pathInfo = uri.Substring(pos3);
 
                     UrlData url = null;
+                    string url_key;
                     if (!is_ssl)
-                        url = m_UrlMap["http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri_tmp];
+                        url_key = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri_tmp;
                     else
-                        url = m_UrlMap["https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + uri_tmp];
+                        url_key = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + uri_tmp;
+                    if (!m_UrlMap.ContainsKey(url_key)) return;
+
+                    url = m_UrlMap[url_key];
+
 
                     //for llGetHttpHeader support we need to store original URI here
                     //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers

Relationships

Notes
(0021667) justincc (administrator) 2012-06-18 21:42	Please do not apply this patch yet. I want to do some investigation work to see how we can cut down the 404 reply to immediate instead of 25 seconds. If anybody else wants to help with that too then that's more than welcome :)

(0021675) justincc (administrator) 2012-06-22 02:03	Tom, do you have a handy short script you could attach that will demonstrate the problem?

(0021681) justincc (administrator) 2012-06-22 22:55 edited on: 2012-06-22 22:55	Okay, should be resolved by commit dca04c7. This does the steps in your patch but also returns true instead of false if the request can't be found, which allows us to return the 404 properly instead of waiting for the polling thread to reach the hardcoded 25 second timeout. However, the actual commit you want is the one after this (7814376) which also looks to resolve other various possible race conditions between using and releasing threads.

Issue History
Date Modified	Username	Field	Change
2012-06-16 16:01	tomhainescciu	New Issue
2012-06-16 16:01	tomhainescciu	File Added: UrlModule.cs.patch
2012-06-18 21:42	justincc	Note Added: 0021667
2012-06-18 21:42	justincc	Assigned To	=> justincc
2012-06-18 21:42	justincc	Status	new => patch included
2012-06-22 02:03	justincc	Note Added: 0021675
2012-06-22 22:55	justincc	Note Added: 0021681
2012-06-22 22:55	justincc	Status	patch included => resolved
2012-06-22 22:55	justincc	Resolution	open => fixed
2012-06-22 22:55	justincc	Note Edited: 0021681	View Revisions