X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=data%2Fnet_1_1%2FDefaultWsdlHelpGenerator.aspx;h=afeeeb408320d470028362de005341421337364d;hb=5bbfa8860b090e465a3aa45edeb9c94481ef1a22;hp=396bf2cd182c91b064094bdfd780dce081ab2ce0;hpb=5f67448fa5d4ec18ffeb9ca298607f86bab05c5f;p=mono.git

diff --git a/data/net_1_1/DefaultWsdlHelpGenerator.aspx b/data/net_1_1/DefaultWsdlHelpGenerator.aspx
index 396bf2cd182..afeeeb40832 100644
--- a/data/net_1_1/DefaultWsdlHelpGenerator.aspx
+++ b/data/net_1_1/DefaultWsdlHelpGenerator.aspx
@@ -337,7 +337,9 @@ string GetTestResult ()
 	
 	try
 	{
-		WebRequest req = WebRequest.Create (location + "/" + CurrentOperationName + "?" + qs);
+		string url = location + "/" + CurrentOperationName;
+		Uri uri = new Uri (url);
+		WebRequest req = WebRequest.Create (url + "?" + qs);
 		HttpCookieCollection cookies = Request.Cookies;
 		int last = cookies.Count;
 		if (last > 0) {
@@ -345,7 +347,7 @@ string GetTestResult ()
 			for (int i = 0; i < last; i++) {
 				HttpCookie hcookie = cookies [i];
 				Cookie cookie = new Cookie (hcookie.Name, hcookie.Value, hcookie.Path, hcookie.Domain);
-				container.Add (cookie);
+				container.Add (uri, cookie);
 			}
 			((HttpWebRequest) req).CookieContainer = container;
 		}
@@ -940,15 +942,23 @@ public class HtmlSampleGenerator: SampleGenerator
 			}
 
 			// Serialize headers
+			
+			bool writtenHeader = false;
 			foreach (object ob in msgbin.Extensions)
 			{
 				SoapHeaderBinding hb = ob as SoapHeaderBinding;
 				if (hb == null) continue;
 				
-				xtw.WriteStartElement ("soap", "Header", SoapEnvelopeNamespace);
+				if (!writtenHeader) {
+					xtw.WriteStartElement ("soap", "Header", SoapEnvelopeNamespace);
+					writtenHeader = true;
+				}
+				
 				WriteHeader (xtw, hb);
-				xtw.WriteEndElement ();
 			}
+			
+			if (writtenHeader)
+				xtw.WriteEndElement ();
 
 			// Serialize body
 			xtw.WriteStartElement ("soap", "Body", SoapEnvelopeNamespace);
@@ -1576,7 +1586,7 @@ function clearForm ()
 			<span class="bindingLabel"><%#FormatBindingName(DataBinder.Eval(Container.DataItem, "Name").ToString())%></span>
 			<asp:repeater id="OperationsRepeater" runat=server datasource='<%# ((Binding)Container.DataItem).Operations %>'>
 				<itemtemplate>
-					<a class="method" href="<%#PageName%>?<%#GetTabContext("op",null)%>op=<%#GetOpName(Container.DataItem)%>&bnd=<%#DataBinder.Eval(Container.DataItem, "Binding.Name")%>"><%#GetOpName(Container.DataItem)%></a>
+					<a class="method" href="<%=PageName%>?<%=GetTabContext("op",null)%>op=<%#GetOpName(Container.DataItem)%>&bnd=<%#DataBinder.Eval(Container.DataItem, "Binding.Name")%>"><%#GetOpName(Container.DataItem)%></a>
 					<div class="smallSeparator"></div>
 				</itemtemplate>
 			</asp:repeater>
@@ -1594,7 +1604,7 @@ function clearForm ()
 -->
 
 	<p class="label">Web Service Overview</p>
-	<%#WebServiceDescription%>
+	<%=WebServiceDescription%>
 	
 <%} if (DefaultBinding == null) {%>
 This service does not contain any public web method.
@@ -1605,7 +1615,7 @@ This service does not contain any public web method.
 	Operation description
 -->
 
-	<span class="operationTitle"><%#CurrentOperationName%></span>
+	<span class="operationTitle"><%=CurrentOperationName%></span>
 	<br><br>
 	<% WriteTabs (); %>
 	<br><br><br>
@@ -1647,12 +1657,12 @@ This service does not contain any public web method.
 		
 		<span class="label">Remarks</span>
 		<div class="smallSeparator"></div>
-		<%#OperationDocumentation%>
+		<%=OperationDocumentation%>
 		<br><br>
 		<span class="label">Technical information</span>
 		<div class="smallSeparator"></div>
-		Format: <%#CurrentOperationFormat%>
-		<br>Supported protocols: <%#CurrentOperationProtocols%>
+		Format: <%=CurrentOperationFormat%>
+		<br>Supported protocols: <%=CurrentOperationProtocols%>
 	<% } %>
 	
 <!--
@@ -1663,11 +1673,11 @@ This service does not contain any public web method.
 	<% if (CurrentTab == "test") { 
 		if (CurrentOperationSupportsTest) {%>
 			Enter values for the parameters and click the 'Invoke' button to test this method:<br><br>
-			<form action="<%#PageName%>" method="GET">
-			<input type="hidden" name="page" value="<%#CurrentPage%>">
-			<input type="hidden" name="tab" value="<%#CurrentTab%>">
-			<input type="hidden" name="op" value="<%#CurrentOperationName%>">
-			<input type="hidden" name="bnd" value="<%#CurrentOperationBinding%>">
+			<form action="<%=PageName%>" method="GET">
+			<input type="hidden" name="page" value="<%=CurrentPage%>">
+			<input type="hidden" name="tab" value="<%=CurrentTab%>">
+			<input type="hidden" name="op" value="<%=CurrentOperationName%>">
+			<input type="hidden" name="bnd" value="<%=CurrentOperationBinding%>">
 			<input type="hidden" name="ext" value="testform">
 			<table class="paramFormTable" cellspacing="0" cellpadding="3">
 			<asp:repeater id="InputFormParamsRepeater" runat=server>
@@ -1681,9 +1691,9 @@ This service does not contain any public web method.
 			<tr><td></td><td><input class="button" type="submit" value="Invoke">&nbsp;<input class="button" type="button" onclick="clearForm()" value="Clear"></td></tr>
 			</table>
 			</form>
-			<div id="testFormResult" style="display:<%# (HasFormResult?"block":"none") %>">
+			<div id="testFormResult" style="display:<%= (HasFormResult?"block":"none") %>">
 			The web service returned the following result:<br/><br/>
-			<div class="codePanel"><%#GetTestResult()%></div>
+			<div class="codePanel"><%=GetTestResult()%></div>
 			</div>
 		<% } else {%>
 		The test form is not available for this operation because it has parameters with a complex structure.
@@ -1703,25 +1713,25 @@ This service does not contain any public web method.
 		<% if (IsOperationSupported ("Soap")) { %>
 			<span class="label">Soap</span>
 			<br/><br/>
-			<div class="codePanel"><div class="code-xml"><%#GenerateOperationMessages ("Soap", true)%></div></div>
+			<div class="codePanel"><div class="code-xml"><%=GenerateOperationMessages ("Soap", true)%></div></div>
 			<br/>
-			<div class="codePanel"><div class="code-xml"><%#GenerateOperationMessages ("Soap", false)%></div></div>
+			<div class="codePanel"><div class="code-xml"><%=GenerateOperationMessages ("Soap", false)%></div></div>
 			<br/>
 		<% } %>
 		<% if (IsOperationSupported ("HttpGet")) { %>
 			<span class="label">HTTP Get</span>
 			<br/><br/>
-			<div class="codePanel"><div class="code-xml"><%#GenerateOperationMessages ("HttpGet", true)%></div></div>
+			<div class="codePanel"><div class="code-xml"><%=GenerateOperationMessages ("HttpGet", true)%></div></div>
 			<br/>
-			<div class="codePanel"><div class="code-xml"><%#GenerateOperationMessages ("HttpGet", false)%></div></div>
+			<div class="codePanel"><div class="code-xml"><%=GenerateOperationMessages ("HttpGet", false)%></div></div>
 			<br/>
 		<% } %>
 		<% if (IsOperationSupported ("HttpPost")) { %>
 			<span class="label">HTTP Post</span>
 			<br/><br/>
-			<div class="codePanel"><div class="code-xml"><%#GenerateOperationMessages ("HttpPost", true)%></div></div>
+			<div class="codePanel"><div class="code-xml"><%=GenerateOperationMessages ("HttpPost", true)%></div></div>
 			<br/>
-			<div class="codePanel"><div class="code-xml"><%#GenerateOperationMessages ("HttpPost", false)%></div></div>
+			<div class="codePanel"><div class="code-xml"><%=GenerateOperationMessages ("HttpPost", false)%></div></div>
 			<br/>
 		<% } %>
 		
@@ -1731,21 +1741,21 @@ This service does not contain any public web method.
 	**********************************************************
 	Client Proxy
 -->
-	<form action="<%#PageName%>" name="langForm" method="GET">
+	<form action="<%=PageName%>" name="langForm" method="GET">
 		Select the language for which you want to generate a proxy 
-		<input type="hidden" name="page" value="<%#CurrentPage%>">&nbsp;
+		<input type="hidden" name="page" value="<%=CurrentPage%>">&nbsp;
 		<SELECT name="lang" onchange="langForm.submit()">
-			<%#GetOptionSel("cs",CurrentLanguage)%>C#</option>
-			<%#GetOptionSel("vb",CurrentLanguage)%>Visual Basic</option>
+			<%=GetOptionSel("cs",CurrentLanguage)%>C#</option>
+			<%=GetOptionSel("vb",CurrentLanguage)%>Visual Basic</option>
 		</SELECT>
 		&nbsp;&nbsp;
 	</form>
 	<br>
-	<span class="label"><%#CurrentProxytName%></span>&nbsp;&nbsp;&nbsp;
-	<a href="<%#PageName + "?code=" + CurrentLanguage%>">Download</a>
+	<span class="label"><%=CurrentProxytName%></span>&nbsp;&nbsp;&nbsp;
+	<a href="<%=PageName + "?code=" + CurrentLanguage%>">Download</a>
 	<br><br>
 	<div class="codePanel">
-	<div class="code-<%#CurrentLanguage%>"><%#GetProxyCode ()%></div>
+	<div class="code-<%=CurrentLanguage%>"><%=GetProxyCode ()%></div>
 	</div>
 <%} else if (CurrentPage == "wsdl") {%>
 <!--
@@ -1767,18 +1777,18 @@ This service does not contain any public web method.
 	<%} else {%>
 	<%}%>
 	<br>
-	<span class="label"><%#CurrentDocumentName%></span>&nbsp;&nbsp;&nbsp;
+	<span class="label"><%=CurrentDocumentName%></span>&nbsp;&nbsp;&nbsp;
 	<a href="<%=PageName + "?" + CurrentDocType + "=" + CurrentDocInd %>">Download</a>
 	<br><br>
 	<div class="codePanel">
-	<div class="code-xml"><%#GenerateDocument ()%></div>
+	<div class="code-xml"><%=GenerateDocument ()%></div>
 	</div>
 
 <%}%>
 
 <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
 </td>
-<td withd="20px"></td>
+<td width="20px"></td>
 </tr>
 
 </table>