Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix for the CSRF errors on Tomcat 7 #28

Merged
merged 3 commits into from

3 participants

@Gekkio

DWR was upgraded to 3.0.rc2 and some script tags were reordered as per my forum post.

Thanks for the fork! It makes contributing so much easier :P

Gekkio added some commits
@timoreimann
Collaborator

Gekkio, could you please provide a link to the forum post you mentioned? Thanks!

@porkcharsui porkcharsui referenced this pull request
Closed

Tomcat 7 compatibility #27

@porkcharsui
Owner

Timo: he is referencing the forum post where I found the fixes for Tomcat 7 compatibly - issue #27

Gekkio: Thank you finishing out the Tomcat fix and code contribution / pull request. The ease of collaborative coding with Git have really changed my views on "open source," especially after seeing the hordes of people in the Subsonic forums submitting code and feature requests only to have it languish in a massive post of patch/ZIPs.

@porkcharsui porkcharsui merged commit 342d2b2 into Mach5:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 9, 2012
  1. @Gekkio
  2. @Gekkio

    Fix: Javascript ordering, #27

    Gekkio authored
    + DWR engine must be loaded before all DWR interfaces
  3. @Gekkio

    Oops: Added missing DWR jars

    Gekkio authored
    + Damn you gitignore!
This page is out of date. Refresh to see the latest.
View
BIN  repo/org/directwebremoting/dwr/3.0.rc2/dwr-3.0.rc2-sources.jar
Binary file not shown
View
BIN  repo/org/directwebremoting/dwr/3.0.rc2/dwr-3.0.rc2.jar
Binary file not shown
View
6 repo/org/directwebremoting/dwr/3.0.rc2/dwr-3.0.rc2.pom
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.directwebremoting</groupId>
+ <artifactId>dwr</artifactId>
+ <version>3.0.rc2</version>
+</project>
View
2  subsonic-main/pom.xml
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.directwebremoting</groupId>
<artifactId>dwr</artifactId>
- <version>3.0.rc1</version>
+ <version>3.0.rc2</version>
</dependency>
<!--Needed by dwr-->
View
6 subsonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp
@@ -2,10 +2,10 @@
<html><head>
<%@ include file="head.jsp" %>
- <script type="text/javascript" src="<c:url value="/dwr/interface/coverArtService.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/script/prototype.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
- <script type="text/javascript" src="<c:url value="/script/prototype.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/interface/coverArtService.js"/>"></script>
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" language="javascript">
@@ -203,4 +203,4 @@
</div>
</div>
-</body></html>
+</body></html>
View
4 subsonic-main/src/main/webapp/WEB-INF/jsp/editTags.jsp
@@ -2,9 +2,9 @@
<html><head>
<%@ include file="head.jsp" %>
- <script type="text/javascript" src="<c:url value="/dwr/interface/tagService.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/interface/tagService.js"/>"></script>
</head>
<body class="mainframe bgcolor1">
@@ -161,4 +161,4 @@
<p><input type="submit" id="save" value="<fmt:message key="common.save"/>" onclick="javascript:updateTags()"/></p>
<div class="warning" id="errors"/>
-</body></html>
+</body></html>
View
2  subsonic-main/src/main/webapp/WEB-INF/jsp/lyrics.jsp
@@ -3,9 +3,9 @@
<html><head>
<%@ include file="head.jsp" %>
<title><fmt:message key="lyrics.title"/></title>
- <script type="text/javascript" src="<c:url value="/dwr/interface/lyricsService.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/interface/lyricsService.js"/>"></script>
<script type="text/javascript" language="javascript">
View
4 subsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
@@ -6,9 +6,9 @@
#progressBar {width: 350px; height: 10px; border: 1px solid black; display:none;}
#progressBarContent {width: 0; height: 10px; background: url("<c:url value="/icons/progress.png"/>") repeat;}
</style>
- <script type="text/javascript" src="<c:url value="/dwr/interface/transferService.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/interface/transferService.js"/>"></script>
<script type="text/javascript">
function refreshProgress() {
@@ -156,4 +156,4 @@
</c:if>
-</body></html>
+</body></html>
View
4 subsonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp
@@ -5,9 +5,9 @@
<head>
<%@ include file="head.jsp" %>
<script type="text/javascript" src="<c:url value="/script/prototype.js"/>"></script>
- <script type="text/javascript" src="<c:url value="/dwr/interface/multiService.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
<script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/interface/multiService.js"/>"></script>
<script type="text/javascript" language="javascript">
function init() {
@@ -78,4 +78,4 @@
</form:form>
</body>
-</html>
+</html>
View
10 subsonic-main/src/main/webapp/WEB-INF/jsp/playlist.jsp
@@ -2,16 +2,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html><head>
<%@ include file="head.jsp" %>
- <script type="text/javascript" src="<c:url value="/dwr/interface/nowPlayingService.js"/>"></script>
- <script type="text/javascript" src="<c:url value="/dwr/interface/playlistService.js"/>"></script>
- <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
- <script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/prototype.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/scripts.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/swfobject.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/webfx/range.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/webfx/timer.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/webfx/slider.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/interface/nowPlayingService.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/interface/playlistService.js"/>"></script>
<link type="text/css" rel="stylesheet" href="<c:url value="/script/webfx/luna.css"/>">
</head>
@@ -563,4 +563,4 @@
</tbody>
</table>
-</body></html>
+</body></html>
View
8 subsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp
@@ -3,14 +3,14 @@
<html>
<head>
<%@ include file="head.jsp" %>
- <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
- <script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
- <script type="text/javascript" src="<c:url value="/dwr/interface/chatService.js"/>"></script>
- <script type="text/javascript" src="<c:url value="/dwr/interface/nowPlayingService.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/prototype.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/scripts.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/fancyzoom/FancyZoom.js"/>"></script>
<script type="text/javascript" src="<c:url value="/script/fancyzoom/FancyZoomHTML.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/interface/chatService.js"/>"></script>
+ <script type="text/javascript" src="<c:url value="/dwr/interface/nowPlayingService.js"/>"></script>
<body class="bgcolor1 rightframe" style="padding-top:2em" onload="init()">
Something went wrong with that request. Please try again.