1 files changed, 0 insertions, 68 deletions
diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/ProxyController.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/ProxyController.java
deleted file mode 100644
index 9535e059..00000000
--- a/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/ProxyController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2009 (C) Sindre Mehus
- */
-package net.sourceforge.subsonic.controller;
-
-import java.io.InputStream;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.params.HttpConnectionParams;
-import org.springframework.web.bind.ServletRequestUtils;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.Controller;
-
-/**
- * A proxy for external HTTP requests.
- *
- * @author Sindre Mehus
- */
-public class ProxyController implements Controller {
-
-    public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        String url = ServletRequestUtils.getRequiredStringParameter(request, "url");
-
-        HttpClient client = new DefaultHttpClient();
-        HttpConnectionParams.setConnectionTimeout(client.getParams(), 15000);
-        HttpConnectionParams.setSoTimeout(client.getParams(), 15000);
-        HttpGet method = new HttpGet(url);
-
-        InputStream in = null;
-        try {
-            HttpResponse resp = client.execute(method);
-            int statusCode = resp.getStatusLine().getStatusCode();
-            if (statusCode != HttpStatus.SC_OK) {
-                response.sendError(statusCode);
-            } else {
-                in = resp.getEntity().getContent();
-                IOUtils.copy(in, response.getOutputStream());
-            }
-        } finally {
-            IOUtils.closeQuietly(in);
-            client.getConnectionManager().shutdown();
-        }
-        return null;
-    }
-}
-\ No newline at end of file