AriasCreations/LSLEditor
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bug-SF-3072580-HTTPRequest-gzip-encoding' into bug-SF-3489102

Browse source
This commit is contained in:
Ima Mechanique 2012-04-05 18:05:09 +01:00
commit 39bad6b5ff
6 changed files with 56 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
trunk/Helpers/HTTPRequest.cs
View file

@ -42,6 +42,8 @@
// ********
// */
using System;
using System.IO;
using System.IO.Compression;
using System.Net;
using System.Text;
@ -63,7 +65,7 @@ namespace LSLEditor
public static void Request(WebProxy proxy, SecondLife secondlife, string strUrl, SecondLife.list parameters, string postData, SecondLife.key key)
{
string strMethod = "GET";
string strContentType = "text/plain;charset=utf-8";
string strContentType = "text/plain; charset=utf-8";
for (int intI = 0; intI < parameters.Count; intI += 2)
{
@ -94,7 +96,7 @@ namespace LSLEditor
wc.Headers.Add("Content-Type", strContentType);
wc.Headers.Add("Accept", "text/*");
wc.Headers.Add("Accept-Charset", "utf-8;q=1.0, *;q=0.5");
wc.Headers.Add("Accept-Charset", "utf-8; q=1.0, *; q=0.5");
wc.Headers.Add("Accept-Encoding", "deflate, gzip");
wc.Headers.Add("User-Agent", "Second Life LSL/1.19.0(12345) (http://secondlife.com)");
@ -172,7 +174,9 @@ namespace LSLEditor
else
{
if (e.Result != null)
strResult = Encoding.ASCII.GetString(e.Result);
{
strResult = Encoding.UTF8.GetString(e.Result);
}
}
userState.secondlife.host.ExecuteSecondLife("http_response", userState.httpkey, (SecondLife.integer)intStatusCode, new SecondLife.list(), (SecondLife.String)strResult);
}
@ -194,10 +198,22 @@ namespace LSLEditor
else
{
if (e.Result != null)
strResult = Encoding.ASCII.GetString(e.Result);
{
string strEncoding = ((System.Net.WebClient)sender).ResponseHeaders["Content-Encoding"];
if (strEncoding == "gzip")
{
GZipStream tempE = new GZipStream(new System.IO.MemoryStream(e.Result), CompressionMode.Decompress);
var sr = new StreamReader(tempE);
strResult = sr.ReadToEnd();
}
else
{
strResult = Encoding.UTF8.GetString(e.Result);
}
}
}
userState.secondlife.host.ExecuteSecondLife("http_response", userState.httpkey, (SecondLife.integer)intStatusCode, new SecondLife.list(), (SecondLife.String)strResult);
}
}
}

4
trunk/Properties/Settings.Designer.cs generated
View file

@ -1204,7 +1204,7 @@ namespace LSLEditor.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://lsleditor.sourceforge.net/check4update.php")]
[global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/check4update.php")]
public string Update {
get {
return ((string)(this["Update"]));
@ -1213,7 +1213,7 @@ namespace LSLEditor.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://lsleditor.sourceforge.net/update.php")]
[global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/update.php")]
public string UpdateManifest {
get {
return ((string)(this["UpdateManifest"]));

12
trunk/Resource/ReleaseNotes.htm
View file

@ -7,9 +7,19 @@
</head>
<body style="background-color: white; font-family: Verdana, sans-serif;font-size: 13px;line-height: 1.3">
<div>
<div>
<h3><span class="date"><2012-04-00</span> - Release 2.46.0</h3>
<div>
* Fixed:
<ul>
<li>SF ID: 3072580 - HTTP Request response returned gzip compressed string. (Thanks to Akkarin Dryke).</li>
<li>Also fixed HTTP Request response returning UTF-8 (instead of ASCII).</li>
</ul>
</div>
</div>
<div>
<h3><span class="date">2012-03-18</span> - Release 2.45.1</h3>
<div>- Fixed: Problem with updater. Our BZip2 decompression code did not work, which prevented the updater creating the new file.</div>
<div>* Fixed: Problem with updater. Our BZip2 decompression code did not work, which prevented the updater creating the new file.</div>
</div>
<div>
<h3><span class="date">2012-03-14</span> - Release 2.45.0</h3>

4
trunk/Web References/org.lsleditor.www/Reference.cs
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.225
// Runtime Version:4.0.30319.261
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -9,7 +9,7 @@
//------------------------------------------------------------------------------
//
// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.225.
// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.261.
//
#pragma warning disable 1591

37
trunk/app.config
View file

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="LSLEditor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="LSLEditor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="LSLEditor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="LSLEditor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</sectionGroup>
</configSections>
<userSettings>
@ -18,7 +17,7 @@
<value>False</value>
</setting>
<setting name="AvatarKey" serializeAs="String">
<value />
<value/>
</setting>
<setting name="RegionName" serializeAs="String">
<value>LSLEditor Island</value>
@ -30,13 +29,13 @@
<value>youraddress@yourdomain.ext</value>
</setting>
<setting name="ProxyServer" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ProxyUserid" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ProxyPassword" serializeAs="String">
<value />
<value/>
</setting>
<setting name="BrowserLocation" serializeAs="String">
<value>0, 0</value>
@ -123,10 +122,10 @@
<value>True</value>
</setting>
<setting name="SmtpUserid" serializeAs="String">
<value />
<value/>
</setting>
<setting name="SmtpPassword" serializeAs="String">
<value />
<value/>
</setting>
<setting name="SmtpAuth" serializeAs="String">
<value>PLAIN</value>
@ -138,13 +137,13 @@
<value>False</value>
</setting>
<setting name="CVSEXE" serializeAs="String">
<value />
<value/>
</setting>
<setting name="CVSROOT" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ProjectLocation" serializeAs="String">
<value />
<value/>
</setting>
<setting name="DeleteOldFiles" serializeAs="String">
<value>False</value>
@ -177,19 +176,19 @@
<value>False</value>
</setting>
<setting name="SvnExe" serializeAs="String">
<value />
<value/>
</setting>
<setting name="SvnUserid" serializeAs="String">
<value />
<value/>
</setting>
<setting name="SvnPassword" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ShowSolutionExplorer" serializeAs="String">
<value>False</value>
</setting>
<setting name="WorkingDirectory" serializeAs="String">
<value />
<value/>
</setting>
<setting name="XSecondLifeShard" serializeAs="String">
<value>Production</value>
@ -316,8 +315,8 @@
<value>http://metaversegames.net/questions/lsl</value>
</setting>
<setting name="svnloc" serializeAs="String">
<value />
<value/>
</setting>
</LSLEditor.Properties.Settings>
</applicationSettings>
</configuration>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

3
trunk/lsleditor.csproj
View file

@ -43,7 +43,8 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\bin\Debug\</OutputPath>