aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs4
-rw-r--r--bin/OpenSim.ini.example6
-rw-r--r--bin/OpenSimDefaults.ini6
3 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index e1971cf..3948667 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -365,6 +365,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
365 m_proxyurl = config.Configs["Startup"].GetString("HttpProxy"); 365 m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
366 m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions"); 366 m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
367 367
368 HttpRequestClass.HttpBodyMaxLenMAX = config.Configs["Network"].GetInt("HttpBodyMaxLenMAX", 16384);
369
368 370
369 m_outboundUrlFilter = new OutboundUrlFilter("Script HTTP request module", config); 371 m_outboundUrlFilter = new OutboundUrlFilter("Script HTTP request module", config);
370 int maxThreads = 15; 372 int maxThreads = 15;
@@ -454,7 +456,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
454 get { return _finished; } 456 get { return _finished; }
455 } 457 }
456 458
457 public const int HttpBodyMaxLenMAX = 16384; 459 public static int HttpBodyMaxLenMAX = 16384;
458 460
459 // Parameter members and default values 461 // Parameter members and default values
460 public int HttpBodyMaxLen = 2048; 462 public int HttpBodyMaxLen = 2048;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f8c0506..840de6b 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -522,6 +522,12 @@
522 ; 522 ;
523 ; See http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation for more information on CIDR notation 523 ; See http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation for more information on CIDR notation
524 524
525 ;# {HttpBodyMaxLenMAX} {} {Maximum bytes allowed for HTTP_BODY_MAXLENGTH} {} 16384
526 ;; By default, llHTTPRequest limits the response body to 2048 bytes.
527 ;; This limit can be extended using HTTP_BODY_MAXLENGTH to a maximum
528 ;; of HttpBodyMaxLenMAX bytes.
529 ; HttpBodyMaxLenMAX=16384
530
525 ;# {ExternalHostNameForLSL} {} {Hostname to use for HTTP-IN URLs. This should be reachable from the internet.} {} 531 ;# {ExternalHostNameForLSL} {} {Hostname to use for HTTP-IN URLs. This should be reachable from the internet.} {}
526 ;; Hostname to use in llRequestURL/llRequestSecureURL 532 ;; Hostname to use in llRequestURL/llRequestSecureURL
527 ;; if not defined - default machine name is being used 533 ;; if not defined - default machine name is being used
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index f09d2a1..3cdd1a7 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -527,6 +527,12 @@
527 ; Password for cert 527 ; Password for cert
528 ; cert_pass = "password" 528 ; cert_pass = "password"
529 529
530 ; Maximum bytes allowed for HTTP_BODY_MAXLENGTH.
531 ; By default, llHTTPRequest limits the response body to 2048 bytes.
532 ; This limit can be extended using HTTP_BODY_MAXLENGTH to a maximum
533 ; of HttpBodyMaxLenMAX bytes.
534 ; HttpBodyMaxLenMAX=16384
535
530 ; Hostname to use in llRequestURL/llRequestSecureURL 536 ; Hostname to use in llRequestURL/llRequestSecureURL
531 ; if not defined - default machine name is being used 537 ; if not defined - default machine name is being used
532 ; (on Windows this mean NETBIOS name - useably only inside local network) 538 ; (on Windows this mean NETBIOS name - useably only inside local network)