chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r1214465 - in /incubator/chukwa/trunk: ./ src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ src/main/java/org/apache/hadoop/chukwa/hicc/
Date Wed, 14 Dec 2011 20:59:22 GMT
Author: eyang
Date: Wed Dec 14 20:59:22 2011
New Revision: 1214465

URL: http://svn.apache.org/viewvc?rev=1214465&view=rev
Log:
CHUKWA-619. Disabled trace method on Chukwa servlets. (Julio Conca via Eric Yang)

Modified:
    incubator/chukwa/trunk/CHANGES.txt
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java

Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1214465&r1=1214464&r2=1214465&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Wed Dec 14 20:59:22 2011
@@ -108,6 +108,8 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    CHUKWA-619. Disabled trace method on Chukwa servlets. (Julio Conca via Eric Yang)
+
     CHUKWA-617. Fixed test case casting and race conditions. (Eric Yang)
 
     CHUKWA-616. Updated release note and change log generation. (Eric Yang)

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java?rev=1214465&r1=1214464&r2=1214465&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
(original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
Wed Dec 14 20:59:22 2011
@@ -68,6 +68,11 @@ public class CommitCheckServlet extends 
       throw new ServletException(e);
     }
   }
+
+  @Override
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
IOException { 
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
   
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java?rev=1214465&r1=1214464&r2=1214465&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
(original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
Wed Dec 14 20:59:22 2011
@@ -81,6 +81,11 @@ public class LogDisplayServlet extends H
   public void init(ServletConfig servletConf) throws ServletException {
     BUF_SIZE = conf.getLong(BUF_SIZE_OPT, BUF_SIZE);
   }
+
+  @Override
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
IOException { 
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
   
   private String getSID(Chunk c) {
     try { 

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java?rev=1214465&r1=1214464&r2=1214465&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
(original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
Wed Dec 14 20:59:22 2011
@@ -116,6 +116,11 @@ public class ServletCollector extends Ht
     }
   }
 
+  @Override
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
IOException { 
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
+
   protected void accept(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException {
     numberHTTPConnection++;

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java?rev=1214465&r1=1214464&r2=1214465&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java Wed Dec
14 20:59:22 2011
@@ -31,6 +31,11 @@ import org.apache.hadoop.chukwa.util.Xss
 public class Iframe extends HttpServlet {
   public static final long serialVersionUID = 100L;
 
+  @Override
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
IOException { 
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
+
   public void doGet(HttpServletRequest request, HttpServletResponse response)
       throws IOException, ServletException {
     String id;

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java?rev=1214465&r1=1214464&r2=1214465&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java Wed
Dec 14 20:59:22 2011
@@ -35,6 +35,11 @@ public class Workspace extends HttpServl
   private String user = "admin";
   private XssFilter xf = null;
 
+  @Override  
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
IOException {
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
+
   public void doGet(HttpServletRequest request, HttpServletResponse response)
       throws IOException, ServletException {
     xf = new XssFilter(request);



Mime
View raw message