aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/juick/http/www/TwitterAuth.java2
-rw-r--r--src/main/webapp/WEB-INF/web.xml8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/main/java/com/juick/http/www/TwitterAuth.java b/src/main/java/com/juick/http/www/TwitterAuth.java
index b51cbf5e..d6abaa75 100644
--- a/src/main/java/com/juick/http/www/TwitterAuth.java
+++ b/src/main/java/com/juick/http/www/TwitterAuth.java
@@ -76,7 +76,7 @@ public class TwitterAuth {
response.setStatus(HttpServletResponse.SC_FOUND);
response.setHeader("Location", "http://juick.com/settings");
} else {
- response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ response.sendError(500);
}
}
}
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index a7cb489a..72777b83 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -16,6 +16,14 @@
<servlet-name>default</servlet-name>
<url-pattern>/style.css</url-pattern>
</servlet-mapping>
+ <mime-mapping>
+ <extension>js</extension>
+ <mime-type>application/javascript;charset=UTF-8</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>css</extension>
+ <mime-type>text/css;charset=UTF-8</mime-type>
+ </mime-mapping>
<session-config>
<session-timeout>
30