Author: kkolinko
Date: Sat May 12 23:31:28 2012
New Revision: 1337735
URL: http://svn.apache.org/viewvc?rev=1337735&view=rev
Log:
Merged revision 1337734 from tomcat/trunk:
Simplify code and correct HTML markup in RequestInfoExample servlet.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1337734
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=1337735&r1=1337734&r2=1337735&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
Sat May 12 23:31:28 2012
@@ -90,21 +90,21 @@ public class RequestInfoExample extends
out.println(HTMLFilter.filter(request.getPathInfo()));
out.println("</td></tr><tr><td>");
out.println(RB.getString("requestinfo.label.remoteaddr"));
-
- String cipherSuite=
- (String)request.getAttribute("javax.servlet.request.cipher_suite");
out.println("</td><td>");
out.println(request.getRemoteAddr());
- out.println("</table>");
+ out.println("</td></tr>");
+ String cipherSuite=
+
(String)request.getAttribute("javax.servlet.request.cipher_suite");
if(cipherSuite!=null){
- out.println("</td></tr><tr><td>");
+ out.println("<tr><td>");
out.println("SSLCipherSuite:");
- out.println("</td>");
- out.println("<td>");
-
out.println(request.getAttribute("javax.servlet.request.cipher_suite"));
- out.println("</td>");
+ out.println("</td><td>");
+ out.println(cipherSuite);
+ out.println("</td></tr>");
}
+
+ out.println("</table>");
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
